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 f0d201ceb5e Rename table name pattern to identifier pattern (#35315)
f0d201ceb5e is described below
commit f0d201ceb5e3c551b45bd9ab847a185fe8ad979c
Author: Liang Zhang <[email protected]>
AuthorDate: Sun May 4 15:38:34 2025 +0800
Rename table name pattern to identifier pattern (#35315)
- Rename TableNamePatternType to IdentifierNamePatternType
- Update related methods and classes to use the new
IdentifierNamePatternType
- Modify the formatTableNamePattern method to formatIdentifierPattern
---
.../encrypt/enums/EncryptDerivedColumnSuffix.java | 2 +-
.../metadata/data/loader/type/TableMetaDataLoader.java | 2 +-
.../database/metadata/DialectDatabaseMetaData.java | 10 +++++-----
...mePatternType.java => IdentifierNamePatternType.java} | 6 +++---
.../infra/database/core/type/DatabaseTypeRegistry.java | 16 ++++++++--------
.../metadata/database/FirebirdDatabaseMetaData.java | 6 +++---
.../metadata/database/OpenGaussDatabaseMetaData.java | 6 +++---
.../oracle/metadata/database/OracleDatabaseMetaData.java | 6 +++---
.../metadata/database/PostgreSQLDatabaseMetaData.java | 6 +++---
.../mode/metadata/refresher/util/TableRefreshUtils.java | 2 +-
.../test/e2e/env/DataSetEnvironmentManager.java | 2 +-
11 files changed, 32 insertions(+), 32 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/enums/EncryptDerivedColumnSuffix.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/enums/EncryptDerivedColumnSuffix.java
index 7f6b4f1c3c3..7b9bd88ecff 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/enums/EncryptDerivedColumnSuffix.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/enums/EncryptDerivedColumnSuffix.java
@@ -42,6 +42,6 @@ public enum EncryptDerivedColumnSuffix {
* @return derived column name
*/
public String getDerivedColumnName(final String columnName, final
DatabaseType databaseType) {
- return String.format("%s%s", columnName, new
DatabaseTypeRegistry(databaseType).formatTableNamePattern(suffix));
+ return String.format("%s%s", columnName, new
DatabaseTypeRegistry(databaseType).formatIdentifierPattern(suffix));
}
}
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoader.java
index f4774129076..b690afbae44 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoader.java
@@ -48,7 +48,7 @@ public final class TableMetaDataLoader {
*/
public static Optional<TableMetaData> load(final DataSource dataSource,
final String tableNamePattern, final DatabaseType databaseType) throws
SQLException {
try (MetaDataLoaderConnection connection = new
MetaDataLoaderConnection(databaseType, dataSource.getConnection())) {
- String formattedTableNamePattern = new
DatabaseTypeRegistry(databaseType).formatTableNamePattern(tableNamePattern);
+ String formattedTableNamePattern = new
DatabaseTypeRegistry(databaseType).formatIdentifierPattern(tableNamePattern);
return isTableExist(connection, formattedTableNamePattern)
? Optional.of(new TableMetaData(tableNamePattern,
ColumnMetaDataLoader.load(
connection, formattedTableNamePattern,
databaseType), IndexMetaDataLoader.load(connection, formattedTableNamePattern),
Collections.emptyList()))
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
index 69da162f027..61a71c9c9b6 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DefaultSchemaOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.DialectDriverQuerySystemCatalogOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.TableNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierNamePatternType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
@@ -103,12 +103,12 @@ public interface DialectDatabaseMetaData extends
DatabaseTypedSPI {
}
/**
- * Get table name pattern type.
+ * Get identifier pattern type.
*
- * @return table name pattern type
+ * @return identifier pattern type
*/
- default TableNamePatternType getTableNamePatternType() {
- return TableNamePatternType.KEEP_ORIGIN;
+ default IdentifierNamePatternType getIdentifierPatternType() {
+ return IdentifierNamePatternType.KEEP_ORIGIN;
}
/**
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/table/TableNamePatternType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/IdentifierNamePatternType.java
similarity index 90%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/table/TableNamePatternType.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/IdentifierNamePatternType.java
index b504e3851d0..b110c0b5ea0 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/table/TableNamePatternType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/IdentifierNamePatternType.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table;
+package
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option;
/**
- * Table name pattern type.
+ * Identifier name pattern type.
*/
-public enum TableNamePatternType {
+public enum IdentifierNamePatternType {
UPPER_CASE, LOWER_CASE, KEEP_ORIGIN
}
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeRegistry.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeRegistry.java
index af79f0077e2..1537c35210f 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeRegistry.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeRegistry.java
@@ -61,21 +61,21 @@ public final class DatabaseTypeRegistry {
}
/**
- * Format table name pattern.
+ * Format identifier pattern.
*
- * @param tableNamePattern table name pattern
- * @return formatted table name pattern
+ * @param identifierPattern identifier pattern
+ * @return formatted identifier pattern
*/
- public String formatTableNamePattern(final String tableNamePattern) {
+ public String formatIdentifierPattern(final String identifierPattern) {
DatabaseType databaseType =
this.databaseType.getTrunkDatabaseType().orElse(this.databaseType);
- switch
(DatabaseTypedSPILoader.getService(DialectDatabaseMetaData.class,
databaseType).getTableNamePatternType()) {
+ switch
(DatabaseTypedSPILoader.getService(DialectDatabaseMetaData.class,
databaseType).getIdentifierPatternType()) {
case UPPER_CASE:
- return tableNamePattern.toUpperCase();
+ return identifierPattern.toUpperCase();
case LOWER_CASE:
- return tableNamePattern.toLowerCase();
+ return identifierPattern.toLowerCase();
case KEEP_ORIGIN:
default:
- return tableNamePattern;
+ return identifierPattern;
}
}
}
diff --git
a/infra/database/type/firebird/src/main/java/org/apache/shardingsphere/infra/database/firebird/metadata/database/FirebirdDatabaseMetaData.java
b/infra/database/type/firebird/src/main/java/org/apache/shardingsphere/infra/database/firebird/metadata/database/FirebirdDatabaseMetaData.java
index 1a38d0c17be..ed8113d7f1a 100644
---
a/infra/database/type/firebird/src/main/java/org/apache/shardingsphere/infra/database/firebird/metadata/database/FirebirdDatabaseMetaData.java
+++
b/infra/database/type/firebird/src/main/java/org/apache/shardingsphere/infra/database/firebird/metadata/database/FirebirdDatabaseMetaData.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.infra.database.firebird.metadata.database;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.DialectDatabaseMetaData;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.TableNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierNamePatternType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
/**
@@ -39,8 +39,8 @@ public final class FirebirdDatabaseMetaData implements
DialectDatabaseMetaData {
}
@Override
- public TableNamePatternType getTableNamePatternType() {
- return TableNamePatternType.UPPER_CASE;
+ public IdentifierNamePatternType getIdentifierPatternType() {
+ return IdentifierNamePatternType.UPPER_CASE;
}
@Override
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 b2923141415..56fec461445 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
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.index.DialectIndexOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.DialectDriverQuerySystemCatalogOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.TableNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierNamePatternType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
import
org.apache.shardingsphere.infra.database.opengauss.metadata.database.option.OpenGaussDataTypeOption;
import
org.apache.shardingsphere.infra.database.opengauss.metadata.database.option.OpenGaussSchemaOption;
@@ -73,8 +73,8 @@ public final class OpenGaussDatabaseMetaData implements
DialectDatabaseMetaData
}
@Override
- public TableNamePatternType getTableNamePatternType() {
- return TableNamePatternType.LOWER_CASE;
+ public IdentifierNamePatternType getIdentifierPatternType() {
+ return IdentifierNamePatternType.LOWER_CASE;
}
@Override
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 15e039e19e7..e81e2fdc82c 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
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DialectDataTypeOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.index.DialectIndexOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.TableNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierNamePatternType;
import
org.apache.shardingsphere.infra.database.oracle.metadata.database.option.OracleDataTypeOption;
import
org.apache.shardingsphere.infra.database.oracle.metadata.database.option.OracleSchemaOption;
@@ -62,8 +62,8 @@ public final class OracleDatabaseMetaData implements
DialectDatabaseMetaData {
}
@Override
- public TableNamePatternType getTableNamePatternType() {
- return TableNamePatternType.UPPER_CASE;
+ public IdentifierNamePatternType getIdentifierPatternType() {
+ return IdentifierNamePatternType.UPPER_CASE;
}
@Override
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 17cb175a769..517b9c54eec 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,7 +23,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DialectDataTypeOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.index.DialectIndexOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.TableNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierNamePatternType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
import
org.apache.shardingsphere.infra.database.postgresql.metadata.database.option.PostgreSQLDataTypeOption;
import
org.apache.shardingsphere.infra.database.postgresql.metadata.database.option.PostgreSQLSchemaOption;
@@ -59,8 +59,8 @@ public final class PostgreSQLDatabaseMetaData implements
DialectDatabaseMetaData
}
@Override
- public TableNamePatternType getTableNamePatternType() {
- return TableNamePatternType.LOWER_CASE;
+ public IdentifierNamePatternType getIdentifierPatternType() {
+ return IdentifierNamePatternType.LOWER_CASE;
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/TableRefreshUtils.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/TableRefreshUtils.java
index 6bce690f359..02cf66e1aa7 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/TableRefreshUtils.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/TableRefreshUtils.java
@@ -53,7 +53,7 @@ public final class TableRefreshUtils {
*/
public static String getTableName(final IdentifierValue
tableIdentifierValue, final DatabaseType databaseType) {
return QuoteCharacter.NONE == tableIdentifierValue.getQuoteCharacter()
- ? new
DatabaseTypeRegistry(databaseType).formatTableNamePattern(tableIdentifierValue.getValue())
+ ? new
DatabaseTypeRegistry(databaseType).formatIdentifierPattern(tableIdentifierValue.getValue())
: tableIdentifierValue.getValue();
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
index cf9f37d884e..8fef3648d99 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
@@ -236,7 +236,7 @@ public final class DataSetEnvironmentManager {
private String getQuotedTableName(final String tableName, final
DatabaseType databaseType) {
DatabaseTypeRegistry databaseTypeRegistry = new
DatabaseTypeRegistry(databaseType);
- return
databaseTypeRegistry.getDialectDatabaseMetaData().getQuoteCharacter().wrap(databaseTypeRegistry.formatTableNamePattern(tableName));
+ return
databaseTypeRegistry.getDialectDatabaseMetaData().getQuoteCharacter().wrap(databaseTypeRegistry.formatIdentifierPattern(tableName));
}
}
}
