This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e6b41a697f6 Remove useless DialectDatabaseMetaData.isReservedWord()
(#35174)
e6b41a697f6 is described below
commit e6b41a697f6b8233ffada1398f9b217e181926df
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Apr 12 22:57:36 2025 +0800
Remove useless DialectDatabaseMetaData.isReservedWord() (#35174)
---
.../metadata/database/DialectDatabaseMetaData.java | 11 ---------
.../metadata/database/MySQLDatabaseMetaData.java | 27 ----------------------
.../database/OpenGaussDatabaseMetaData.java | 22 ------------------
.../metadata/database/OracleDatabaseMetaData.java | 16 -------------
.../database/PostgreSQLDatabaseMetaData.java | 19 ---------------
5 files changed, 95 deletions(-)
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
index e32dd221d26..feb1badea45 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
@@ -69,17 +69,6 @@ public interface DialectDatabaseMetaData extends
DatabaseTypedSPI {
// TODO Reuse java.sql.DatabaseMetaData.nullsAreSortedHigh and
java.sql.DatabaseMetaData.nullsAreSortedLow
NullsOrderType getDefaultNullsOrderType();
- /**
- * Judge whether identifier is reserved word.
- *
- * @param identifier identifier to be judged
- * @return is reserved word or not
- */
- // TODO Reuse java.sql.DatabaseMetaData.getSQLKeywords
- default boolean isReservedWord(final String identifier) {
- return false;
- }
-
/**
* Is schema feature available.
*
diff --git
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
index da29bd69c19..0aa22b7fb40 100644
---
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
+++
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
@@ -23,37 +23,15 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.Quo
import java.math.BigInteger;
import java.sql.Types;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
/**
* Database meta data of MySQL.
*/
public final class MySQLDatabaseMetaData implements DialectDatabaseMetaData {
- private static final Set<String> RESERVED_WORDS = new
HashSet<>(Arrays.asList(
- "ACCESSIBLE", "ADD", "ALL", "ALTER", "ANALYZE", "AND", "AS",
"ASC", "BEFORE", "BETWEEN", "BIGINT", "BINARY", "BLOB", "BOTH", "BY", "CALL",
- "CASCADE", "CASE", "CHANGE", "CHAR", "CHARACTER", "CHECK",
"COLLATE", "COLUMN", "CONDITION", "CONSTRAINT", "CONTINUE", "CONVERT",
"CREATE", "CROSS", "CUBE", "CUME_DIST", "CURRENT_DATE",
- "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR",
"DATABASE", "DATABASES", "DAY_HOUR", "DAY_MICROSECOND", "DAY_MINUTE",
"DAY_SECOND", "DEC", "DECIMAL", "DECLARE", "DEFAULT",
- "DELAYED", "DELETE", "DENSE_RANK", "DESC", "DESCRIBE",
"DETERMINISTIC", "DISTINCT", "DISTINCTROW", "DIV", "DOUBLE", "DROP", "DUAL",
"ELSE", "ELSEIF", "ENCLOSED", "ESCAPED", "EACH", "ELSE",
- "ELSEIF", "EMPTY", "ENCLOSED", "ESCAPED", "EXCEPT", "EXISTS",
"EXIT", "EXPLAIN", "FALSE", "FETCH", "FIRST_VALUE", "FLOAT4", "FLOAT8", "FOR",
"FORCE", "FOREIGN", "FROM", "FULLTEXT",
- "FUNCTION", "GENERATED", "GET", "GRANT", "GROUP", "GROUPING",
"GROUPS", "HAVING", "HIGH_PRIORITY", "HOUR_MICROSECOND", "HOUR_MINUTE",
"HOUR_SECOND", "IF", "IGNORE", "IN", "INDEX",
- "INFILE", "INNER", "INOUT", "INSENSITIVE", "INSERT", "INT",
"INT1", "INT2", "INT3", "INT4", "INT8", "INTEGER", "INTERSECT", "INTERVAL",
"INTO", "IO_AFTER_GTIDS", "IO_BEFORE_GTIDS", "IS",
- "ITERATE", "JOIN", "JSON_TABLE", "KEY", "KEYS", "KILL", "LAG",
"LAST_VALUE", "LATERAL", "LEAD", "LEADING", "LEAVE", "LEFT", "LIKE", "LIMIT",
"LINES", "LOAD", "LOCALTIME", "LOCALTIMESTAMP",
- "LOCK", "LONG", "LONGBLOB", "LONGTEXT", "LOOP", "LOW_PRIORITY",
"MASTER_BIND", "MASTER_SSL_VERIFY_SERVER_CERT", "MATCH", "MAXVALUE",
"MEDIUMBLOB", "MEDIUMINT", "MEDIUMTEXT", "MIDDLEINT",
- "MINUTE_MICROSECOND", "MINUTE_SECOND", "MOD", "MODIFIES",
"NATURAL", "NOT", "NO_WRITE_TO_BINLOG", "NTH_VALUE", "NTILE", "NULL",
"NUMERIC", "OF", "ON", "OPTIMIZE", "OPTIMIZER_COSTS",
- "OPTION", "OPTIONALLY", "OR", "ORDER", "OUT", "OUTER", "OUTFILE",
"OVER", "PARTITION", "PERCENT_RANK", "PRECISION", "PRIMARY", "PROCEDURE",
"PURGE", "RANGE", "RANK", "READ", "REAL",
- "RECURSIVE", "REFERENCES", "REGEXP", "RELEASE", "RENAME",
"REPEAT", "REPLACE", "REQUIRE", "RESIGNAL", "RESTRICT", "RETURN", "REVOKE",
"RIGHT", "RLIKE", "ROW", "ROWS", "ROW_NUMBER",
- "SCHEMA", "SCHEMAS",
- "SELECT", "SENSITIVE", "SEPARATOR", "SET", "SHOW", "SIGNAL",
"SMALLINT", "SPATIAL", "SPECIFIC", "SQL", "SQLEXCEPTION", "SQLSTATE",
"SQLWARNING", "SQL_BIG_RESULT", "SQL_CALC_FOUND_ROWS",
- "SQL_SMALL_RESULT", "SSL", "STARTING", "STORED", "STRAIGHT_JOIN",
"SYSTEM", "TABLE", "TERMINATED", "THEN", "TINYBLOB", "TINYINT", "TINYTEXT",
"TO", "TRAILING", "TRIGGER", "TRUE", "UNDO",
- "UNION", "UNIQUE", "UNLOCK", "UNSIGNED", "UPDATE", "USAGE", "USE",
"USING", "UTC_DATE", "UTC_TIME", "UTC_TIMESTAMP", "VALUES", "VARBINARY",
"VARCHAR", "VARCHARACTER", "VARYING", "VIRTUAL",
- "WHEN", "WHERE", "WHILE", "WINDOW", "WITH", "WRITE", "XOR",
"YEAR_MONTH", "ZEROFILL"));
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.BACK_QUOTE;
@@ -94,11 +72,6 @@ public final class MySQLDatabaseMetaData implements
DialectDatabaseMetaData {
return NullsOrderType.LOW;
}
- @Override
- public boolean isReservedWord(final String identifier) {
- return RESERVED_WORDS.contains(identifier.toUpperCase());
- }
-
@Override
public boolean isInstanceConnectionAvailable() {
return true;
diff --git
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/metadata/database/OpenGaussDatabaseMetaData.java
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/metadata/database/OpenGaussDatabaseMetaData.java
index 5062aa15965..736caf735b2 100644
---
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/metadata/database/OpenGaussDatabaseMetaData.java
+++
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/metadata/database/OpenGaussDatabaseMetaData.java
@@ -23,31 +23,14 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.Nul
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
import java.sql.Types;
-import java.util.Arrays;
-import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
/**
* Database meta data of openGauss.
*/
public final class OpenGaussDatabaseMetaData implements
DialectDatabaseMetaData {
- private static final Set<String> RESERVED_WORDS = new
HashSet<>(Arrays.asList(
- "ALL", "ANALYSE", "ANALYZE", "AND", "ANY", "ARRAY", "AS", "ASC",
"ASYMMETRIC", "AUTHID", "AUTHORIZATION", "BETWEEN", "BIGINT",
- "BINARY", "BINARY_DOUBLE", "BINARY_INTEGER", "BIT", "BOOLEAN",
"BOTH", "BUCKETCNT", "BUCKETS", "BYTEAWITHOUTORDER",
"BYTEAWITHOUTORDERWITHEQUAL", "CASE", "CAST", "CHAR", "CHARACTER",
- "CHECK", "COALESCE", "COLLATE", "COLLATION", "COLUMN", "COMPACT",
"CONCURRENTLY", "CONSTRAINT", "CREATE", "CROSS", "CSN", "CURRENT_CATALOG",
"CURRENT_DATE", "CURRENT_ROLE",
- "CURRENT_SCHEMA", "CURRENT_TIME", "CURRENT_TIMESTAMP",
"CURRENT_USER", "DATE", "DEC", "DECIMAL", "DECODE", "DEFAULT", "DEFERRABLE",
"DELTAMERGE", "DESC", "DISTINCT", "DO", "ELSE", "END",
- "EXCEPT", "EXCLUDED", "EXISTS", "EXTRACT", "FALSE", "FENCED",
"FETCH", "FLOAT", "FOR", "FOREIGN", "FREEZE", "FROM", "FULL", "GRANT",
"GREATEST", "GROUP", "GROUPING", "GROUPPARENT",
- "HAVING", "HDFSDIRECTORY", "ILIKE", "IN", "INITIALLY", "INNER",
"INOUT", "INT", "INTEGER", "INTERSECT", "INTERVAL", "INTO", "IS", "JOIN",
"LEADING", "LEAST", "LEFT", "LESS", "LIKE",
- "LIMIT", "LOCALTIME", "LOCALTIMESTAMP", "MAXVALUE", "MINUS",
"MODIFY", "NATIONAL", "NATURAL", "NCHAR", "NOCYCLE", "NONE", "NOT", "NOTNULL",
"NULL", "NULLIF", "NUMBER", "NUMERIC",
- "NVARCHAR", "NVARCHAR2", "NVL", "OFFSET", "ON", "ONLY", "OR",
"ORDER", "OUT", "OUTER", "OVERLAPS", "OVERLAY", "PERFORMANCE", "PLACING",
"POSITION", "PRECISION", "PRIMARY", "PRIORER",
- "PROCEDURE", "REAL", "RECYCLEBIN", "REFERENCES", "REJECT",
"RETURNING", "RIGHT", "ROW", "ROWNUM", "SELECT", "SESSION_USER", "SETOF",
"SIMILAR", "SMALLDATETIME", "SMALLINT", "SOME",
- "SUBSTRING", "SYMMETRIC", "SYSDATE", "TABLE", "TABLESAMPLE",
"THEN", "TIME", "TIMECAPSULE", "TIMESTAMP", "TIMESTAMPDIFF", "TINYINT", "TO",
"TRAILING", "TREAT", "TRIM", "TRUE", "UNION",
- "UNIQUE", "USER", "USING", "VALUES", "VARCHAR", "VARCHAR2",
"VARIADIC", "VERBOSE", "VERIFY", "WHEN", "WHERE", "WINDOW", "WITH",
"XMLATTRIBUTES", "XMLCONCAT", "XMLELEMENT", "XMLEXISTS",
- "XMLFOREST", "XMLPARSE", "XMLPI", "XMLROOT", "XMLSERIALIZE"));
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.QUOTE;
@@ -73,11 +56,6 @@ public final class OpenGaussDatabaseMetaData implements
DialectDatabaseMetaData
return NullsOrderType.HIGH;
}
- @Override
- public boolean isReservedWord(final String identifier) {
- return RESERVED_WORDS.contains(identifier.toUpperCase());
- }
-
@Override
public boolean isSchemaAvailable() {
return true;
diff --git
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
index 99feb7191c3..d7763df3d84 100644
---
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
+++
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
@@ -24,26 +24,15 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.Quo
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Types;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
/**
* Database meta data of Oracle.
*/
public final class OracleDatabaseMetaData implements DialectDatabaseMetaData {
- private static final Set<String> RESERVED_KEYWORDS = new
HashSet<>(Arrays.asList("ACCESS", "ADD", "ALL", "ALTER", "AND", "ANY",
"ARRAYLEN", "AS", "ASC", "AUDIT", "BETWEEN", "BY", "CHAR", "CHECK",
- "CLUSTER", "COLUMN", "COMMENT", "COMPRESS", "CONNECT", "CREATE",
"CURRENT", "DATE", "DECIMAL", "DEFAULT", "DELETE", "DESC", "DISTINCT", "DROP",
"ELSE", "EXCLUSIVE", "EXISTS", "FILE",
- "FLOAT", "FOR", "FROM", "GRANT", "GROUP", "HAVING", "IDENTIFIED",
"IMMEDIATE", "IN", "INCREMENT", "INDEX", "INITIAL", "INSERT", "INTEGER",
"INTERSECT", "INTO", "IS", "LEVEL", "LIKE",
- "LOCK", "LONG", "MAXEXTENTS", "MINUS", "MODE", "MODIFY",
"NOAUDIT", "NOCOMPRESS", "NOT", "NOTFOUND", "NOWAIT", "NULL", "NUMBER", "OF",
"OFFLINE", "ON", "ONLINE", "OPTION", "OR", "ORDER",
- "PCTFREE", "PRIOR", "PRIVILEGES", "PUBLIC", "RAW", "RENAME",
"RESOURCE", "REVOKE", "ROW", "ROWID", "ROWLABEL", "ROWNUM", "ROWS", "START",
"SELECT", "SESSION", "SET", "SHARE", "SIZE",
- "SMALLINT", "SQLBUF", "SUCCESSFUL", "SYNONYM", "SYSDATE", "TABLE",
"THEN", "TO", "TRIGGER", "UID", "UNION", "UNIQUE", "UPDATE", "USER",
"VALIDATE", "VALUES", "VARCHAR", "VARCHAR2",
- "VIEW", "WHENEVER", "WHERE", "WITH"));
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.QUOTE;
@@ -54,11 +43,6 @@ public final class OracleDatabaseMetaData implements
DialectDatabaseMetaData {
return NullsOrderType.HIGH;
}
- @Override
- public boolean isReservedWord(final String identifier) {
- return RESERVED_KEYWORDS.contains(identifier.toUpperCase());
- }
-
@Override
public boolean isSchemaAvailable() {
return true;
diff --git
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/metadata/database/PostgreSQLDatabaseMetaData.java
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/metadata/database/PostgreSQLDatabaseMetaData.java
index 85c9c7f5d2f..718c1b5f05b 100644
---
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/metadata/database/PostgreSQLDatabaseMetaData.java
+++
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/metadata/database/PostgreSQLDatabaseMetaData.java
@@ -23,28 +23,14 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.Nul
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
import java.sql.Types;
-import java.util.Arrays;
-import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
/**
* Database meta data of PostgreSQL.
*/
public final class PostgreSQLDatabaseMetaData implements
DialectDatabaseMetaData {
- private static final Set<String> RESERVED_WORDS = new
HashSet<>(Arrays.asList(
- "ALL", "ANALYSE", "ANALYZE", "AND", "ANY", "ARRAY", "AS", "ASC",
"ASYMMETRIC", "AUTHORIZATION", "BETWEEN", "BIGINT", "BINARY",
- "BIT", "BOOLEAN", "BOTH", "CASE", "CAST", "CHAR", "CHARACTER",
"CHECK", "COALESCE", "COLLATE", "COLLATION", "COLUMN", "CONCURRENTLY",
"CONSTRAINT", "CREATE", "CROSS", "CURRENT_CATALOG",
- "CURRENT_DATE", "CURRENT_ROLE", "CURRENT_SCHEMA", "CURRENT_TIME",
"CURRENT_TIMESTAMP", "CURRENT_USER", "DEC", "DECIMAL", "DEFAULT", "DEFERRABLE",
"DESC", "DISTINCT", "DO", "ELSE", "END",
- "EXCEPT", "EXISTS", "EXTRACT", "FALSE", "FETCH", "FLOAT", "FOR",
"FOREIGN", "FREEZE", "FROM", "FULL", "GRANT", "GREATEST", "GROUP", "GROUPING",
"HAVING", "ILIKE", "IN", "INITIALLY",
- "INNER", "INOUT", "INT", "INTEGER", "INTERSECT", "INTERVAL",
"INTO", "IS", "ISNULL", "JOIN", "LATERAL", "LEADING", "LEAST", "LEFT", "LIKE",
"LIMIT", "LOCALTIME", "LOCALTIMESTAMP",
- "NATIONAL", "NATURAL", "NCHAR", "NONE", "NORMALIZE", "NOT",
"NOTNULL", "NULL", "NULLIF", "NUMERIC", "OFFSET", "ON", "ONLY", "OR", "ORDER",
"OUT", "OUTER", "OVERLAPS", "OVERLAY", "PLACING",
- "POSITION", "PRECISION", "PRIMARY", "REAL", "REFERENCES",
"RETURNING", "RIGHT", "ROW", "SELECT", "SESSION_USER", "SETOF", "SIMILAR",
"SMALLINT", "SOME", "SUBSTRING", "SYMMETRIC", "TABLE",
- "TABLESAMPLE", "THEN", "TIME", "TIMESTAMP", "TO", "TRAILING",
"TREAT", "TRIM", "TRUE", "UNION", "UNIQUE", "USER", "USING", "VALUES",
"VARCHAR", "VARIADIC", "VERBOSE", "WHEN", "WHERE",
- "WINDOW", "WITH", "XMLATTRIBUTES", "XMLCONCAT", "XMLELEMENT",
"XMLEXISTS", "XMLFOREST", "XMLNAMESPACES", "XMLPARSE", "XMLPI", "XMLROOT",
"XMLSERIALIZE", "XMLTABLE"));
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.QUOTE;
@@ -78,11 +64,6 @@ public final class PostgreSQLDatabaseMetaData implements
DialectDatabaseMetaData
return NullsOrderType.HIGH;
}
- @Override
- public boolean isReservedWord(final String identifier) {
- return RESERVED_WORDS.contains(identifier.toUpperCase());
- }
-
@Override
public boolean isSchemaAvailable() {
return true;
