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 35401681b04 Refactor TableRefreshUtils.getTableName() (#34461)
35401681b04 is described below
commit 35401681b04b32d1106a1acb2cd5075466d1d5b0
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jan 24 12:07:46 2025 +0800
Refactor TableRefreshUtils.getTableName() (#34461)
---
.../federation/type/AlterViewFederationMetaDataRefresher.java | 2 +-
.../federation/type/CreateViewFederationMetaDataRefresher.java | 2 +-
.../pushdown/type/table/AlterTablePushDownMetaDataRefresher.java | 2 +-
.../type/table/CreateTablePushDownMetaDataRefresher.java | 2 +-
.../type/table/RenameTablePushDownMetaDataRefresher.java | 2 +-
.../pushdown/type/view/AlterViewPushDownMetaDataRefresher.java | 2 +-
.../pushdown/type/view/CreateViewPushDownMetaDataRefresher.java | 2 +-
.../mode/metadata/refresher/metadata/util/TableRefreshUtils.java | 9 +++++----
8 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/AlterViewFederationMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/AlterViewFederationMetaDataRefresher.java
index f8c7b82dd7b..83f750401c9 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/AlterViewFederationMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/AlterViewFederationMetaDataRefresher.java
@@ -35,7 +35,7 @@ public final class AlterViewFederationMetaDataRefresher
implements FederationMet
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
String schemaName, final AlterViewStatement sqlStatement) {
- String viewName =
TableRefreshUtils.getTableName(sqlStatement.getDatabaseType(),
sqlStatement.getView().getTableName().getIdentifier());
+ String viewName =
TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(),
sqlStatement.getDatabaseType());
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), schemaName);
Optional<SimpleTableSegment> renameView = sqlStatement.getRenameView();
if (renameView.isPresent()) {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/CreateViewFederationMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/CreateViewFederationMetaDataRefresher.java
index 4ac24f5df44..ae2e4589164 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/CreateViewFederationMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/CreateViewFederationMetaDataRefresher.java
@@ -32,7 +32,7 @@ public final class CreateViewFederationMetaDataRefresher
implements FederationMe
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
String schemaName, final CreateViewStatement sqlStatement) {
- String viewName =
TableRefreshUtils.getTableName(sqlStatement.getDatabaseType(),
sqlStatement.getView().getTableName().getIdentifier());
+ String viewName =
TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(),
sqlStatement.getDatabaseType());
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), schemaName);
alterSchemaMetaDataPOJO.getAlteredViews().add(new
ShardingSphereView(viewName, sqlStatement.getViewDefinition()));
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/AlterTablePushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/AlterTablePushDownMetaDataRefresher.java
index 113727da68d..21289160419 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/AlterTablePushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/AlterTablePushDownMetaDataRefresher.java
@@ -47,7 +47,7 @@ public final class AlterTablePushDownMetaDataRefresher
implements PushDownMetaDa
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
Collection<String> logicDataSourceNames,
final String schemaName, final DatabaseType
databaseType, final AlterTableStatement sqlStatement, final
ConfigurationProperties props) throws SQLException {
- String tableName = TableRefreshUtils.getTableName(databaseType,
sqlStatement.getTable().getTableName().getIdentifier());
+ String tableName =
TableRefreshUtils.getTableName(sqlStatement.getTable().getTableName().getIdentifier(),
databaseType);
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), schemaName, logicDataSourceNames);
if (sqlStatement.getRenameTable().isPresent()) {
String renameTable =
sqlStatement.getRenameTable().get().getTableName().getIdentifier().getValue();
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/CreateTablePushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/CreateTablePushDownMetaDataRefresher.java
index f11ba0d74e9..137dec87b3f 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/CreateTablePushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/CreateTablePushDownMetaDataRefresher.java
@@ -47,7 +47,7 @@ public final class CreateTablePushDownMetaDataRefresher
implements PushDownMetaD
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
Collection<String> logicDataSourceNames,
final String schemaName, final DatabaseType
databaseType, final CreateTableStatement sqlStatement, final
ConfigurationProperties props) throws SQLException {
- String tableName = TableRefreshUtils.getTableName(databaseType,
sqlStatement.getTable().getTableName().getIdentifier());
+ String tableName =
TableRefreshUtils.getTableName(sqlStatement.getTable().getTableName().getIdentifier(),
databaseType);
RuleMetaData ruleMetaData = new RuleMetaData(new
LinkedList<>(database.getRuleMetaData().getRules()));
boolean isSingleTable = TableRefreshUtils.isSingleTable(tableName,
database);
if (isSingleTable) {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
index 54153230ed5..6951f4c9166 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
@@ -51,7 +51,7 @@ public final class RenameTablePushDownMetaDataRefresher
implements PushDownMetaD
for (RenameTableDefinitionSegment each :
sqlStatement.getRenameTables()) {
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), schemaName, logicDataSourceNames);
alterSchemaMetaDataPOJO.getAlteredTables().add(getTable(database,
logicDataSourceNames, schemaName,
- TableRefreshUtils.getTableName(databaseType,
each.getRenameTable().getTableName().getIdentifier()), props));
+
TableRefreshUtils.getTableName(each.getRenameTable().getTableName().getIdentifier(),
databaseType), props));
alterSchemaMetaDataPOJO.getDroppedTables().add(each.getTable().getTableName().getIdentifier().getValue());
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/AlterViewPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/AlterViewPushDownMetaDataRefresher.java
index 88832be117d..70d6345bc0a 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/AlterViewPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/AlterViewPushDownMetaDataRefresher.java
@@ -49,7 +49,7 @@ public final class AlterViewPushDownMetaDataRefresher
implements PushDownMetaDat
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
Collection<String> logicDataSourceNames,
final String schemaName, final DatabaseType
databaseType, final AlterViewStatement sqlStatement, final
ConfigurationProperties props) throws SQLException {
- String viewName = TableRefreshUtils.getTableName(databaseType,
sqlStatement.getView().getTableName().getIdentifier());
+ String viewName =
TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(),
databaseType);
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), schemaName, logicDataSourceNames);
Optional<SimpleTableSegment> renameView = sqlStatement.getRenameView();
if (renameView.isPresent()) {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/CreateViewPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/CreateViewPushDownMetaDataRefresher.java
index cb11d24a297..5ccf25fde59 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/CreateViewPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/CreateViewPushDownMetaDataRefresher.java
@@ -49,7 +49,7 @@ public final class CreateViewPushDownMetaDataRefresher
implements PushDownMetaDa
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
Collection<String> logicDataSourceNames,
final String schemaName, final DatabaseType
databaseType, final CreateViewStatement sqlStatement, final
ConfigurationProperties props) throws SQLException {
- String viewName = TableRefreshUtils.getTableName(databaseType,
sqlStatement.getView().getTableName().getIdentifier());
+ String viewName =
TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(),
databaseType);
RuleMetaData ruleMetaData = new RuleMetaData(new
LinkedList<>(database.getRuleMetaData().getRules()));
if (TableRefreshUtils.isSingleTable(viewName, database)) {
ruleMetaData.getAttributes(MutableDataNodeRuleAttribute.class).forEach(each ->
each.put(logicDataSourceNames.iterator().next(), schemaName, viewName));
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/util/TableRefreshUtils.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/util/TableRefreshUtils.java
index bbdf63dbe54..105c6ab56a2 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/util/TableRefreshUtils.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/util/TableRefreshUtils.java
@@ -48,13 +48,14 @@ public final class TableRefreshUtils {
/**
* Get table name.
*
+ * @param tableIdentifierValue table identifier value
* @param databaseType database type
- * @param identifierValue identifier value
* @return table name
*/
- public static String getTableName(final DatabaseType databaseType, final
IdentifierValue identifierValue) {
- return QuoteCharacter.NONE == identifierValue.getQuoteCharacter() ?
new
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().formatTableNamePattern(identifierValue.getValue())
- : identifierValue.getValue();
+ public static String getTableName(final IdentifierValue
tableIdentifierValue, final DatabaseType databaseType) {
+ return QuoteCharacter.NONE == tableIdentifierValue.getQuoteCharacter()
+ ? new
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().formatTableNamePattern(tableIdentifierValue.getValue())
+ : tableIdentifierValue.getValue();
}
/**
