Skip to content

Commit 3540168

Browse files
authored
Refactor TableRefreshUtils.getTableName() (#34461)
1 parent 7cac9cc commit 3540168

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/AlterViewFederationMetaDataRefresher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public final class AlterViewFederationMetaDataRefresher implements FederationMet
3535

3636
@Override
3737
public void refresh(final MetaDataManagerPersistService metaDataManagerPersistService, final ShardingSphereDatabase database, final String schemaName, final AlterViewStatement sqlStatement) {
38-
String viewName = TableRefreshUtils.getTableName(sqlStatement.getDatabaseType(), sqlStatement.getView().getTableName().getIdentifier());
38+
String viewName = TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(), sqlStatement.getDatabaseType());
3939
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new AlterSchemaMetaDataPOJO(database.getName(), schemaName);
4040
Optional<SimpleTableSegment> renameView = sqlStatement.getRenameView();
4141
if (renameView.isPresent()) {

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/CreateViewFederationMetaDataRefresher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public final class CreateViewFederationMetaDataRefresher implements FederationMe
3232

3333
@Override
3434
public void refresh(final MetaDataManagerPersistService metaDataManagerPersistService, final ShardingSphereDatabase database, final String schemaName, final CreateViewStatement sqlStatement) {
35-
String viewName = TableRefreshUtils.getTableName(sqlStatement.getDatabaseType(), sqlStatement.getView().getTableName().getIdentifier());
35+
String viewName = TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(), sqlStatement.getDatabaseType());
3636
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new AlterSchemaMetaDataPOJO(database.getName(), schemaName);
3737
alterSchemaMetaDataPOJO.getAlteredViews().add(new ShardingSphereView(viewName, sqlStatement.getViewDefinition()));
3838
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/AlterTablePushDownMetaDataRefresher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public final class AlterTablePushDownMetaDataRefresher implements PushDownMetaDa
4747
@Override
4848
public void refresh(final MetaDataManagerPersistService metaDataManagerPersistService, final ShardingSphereDatabase database, final Collection<String> logicDataSourceNames,
4949
final String schemaName, final DatabaseType databaseType, final AlterTableStatement sqlStatement, final ConfigurationProperties props) throws SQLException {
50-
String tableName = TableRefreshUtils.getTableName(databaseType, sqlStatement.getTable().getTableName().getIdentifier());
50+
String tableName = TableRefreshUtils.getTableName(sqlStatement.getTable().getTableName().getIdentifier(), databaseType);
5151
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new AlterSchemaMetaDataPOJO(database.getName(), schemaName, logicDataSourceNames);
5252
if (sqlStatement.getRenameTable().isPresent()) {
5353
String renameTable = sqlStatement.getRenameTable().get().getTableName().getIdentifier().getValue();

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/CreateTablePushDownMetaDataRefresher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public final class CreateTablePushDownMetaDataRefresher implements PushDownMetaD
4747
@Override
4848
public void refresh(final MetaDataManagerPersistService metaDataManagerPersistService, final ShardingSphereDatabase database, final Collection<String> logicDataSourceNames,
4949
final String schemaName, final DatabaseType databaseType, final CreateTableStatement sqlStatement, final ConfigurationProperties props) throws SQLException {
50-
String tableName = TableRefreshUtils.getTableName(databaseType, sqlStatement.getTable().getTableName().getIdentifier());
50+
String tableName = TableRefreshUtils.getTableName(sqlStatement.getTable().getTableName().getIdentifier(), databaseType);
5151
RuleMetaData ruleMetaData = new RuleMetaData(new LinkedList<>(database.getRuleMetaData().getRules()));
5252
boolean isSingleTable = TableRefreshUtils.isSingleTable(tableName, database);
5353
if (isSingleTable) {

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void refresh(final MetaDataManagerPersistService metaDataManagerPersistSe
5151
for (RenameTableDefinitionSegment each : sqlStatement.getRenameTables()) {
5252
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new AlterSchemaMetaDataPOJO(database.getName(), schemaName, logicDataSourceNames);
5353
alterSchemaMetaDataPOJO.getAlteredTables().add(getTable(database, logicDataSourceNames, schemaName,
54-
TableRefreshUtils.getTableName(databaseType, each.getRenameTable().getTableName().getIdentifier()), props));
54+
TableRefreshUtils.getTableName(each.getRenameTable().getTableName().getIdentifier(), databaseType), props));
5555
alterSchemaMetaDataPOJO.getDroppedTables().add(each.getTable().getTableName().getIdentifier().getValue());
5656
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
5757
}

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/AlterViewPushDownMetaDataRefresher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public final class AlterViewPushDownMetaDataRefresher implements PushDownMetaDat
4949
@Override
5050
public void refresh(final MetaDataManagerPersistService metaDataManagerPersistService, final ShardingSphereDatabase database, final Collection<String> logicDataSourceNames,
5151
final String schemaName, final DatabaseType databaseType, final AlterViewStatement sqlStatement, final ConfigurationProperties props) throws SQLException {
52-
String viewName = TableRefreshUtils.getTableName(databaseType, sqlStatement.getView().getTableName().getIdentifier());
52+
String viewName = TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(), databaseType);
5353
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new AlterSchemaMetaDataPOJO(database.getName(), schemaName, logicDataSourceNames);
5454
Optional<SimpleTableSegment> renameView = sqlStatement.getRenameView();
5555
if (renameView.isPresent()) {

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/CreateViewPushDownMetaDataRefresher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public final class CreateViewPushDownMetaDataRefresher implements PushDownMetaDa
4949
@Override
5050
public void refresh(final MetaDataManagerPersistService metaDataManagerPersistService, final ShardingSphereDatabase database, final Collection<String> logicDataSourceNames,
5151
final String schemaName, final DatabaseType databaseType, final CreateViewStatement sqlStatement, final ConfigurationProperties props) throws SQLException {
52-
String viewName = TableRefreshUtils.getTableName(databaseType, sqlStatement.getView().getTableName().getIdentifier());
52+
String viewName = TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(), databaseType);
5353
RuleMetaData ruleMetaData = new RuleMetaData(new LinkedList<>(database.getRuleMetaData().getRules()));
5454
if (TableRefreshUtils.isSingleTable(viewName, database)) {
5555
ruleMetaData.getAttributes(MutableDataNodeRuleAttribute.class).forEach(each -> each.put(logicDataSourceNames.iterator().next(), schemaName, viewName));

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/util/TableRefreshUtils.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,14 @@ public final class TableRefreshUtils {
4848
/**
4949
* Get table name.
5050
*
51+
* @param tableIdentifierValue table identifier value
5152
* @param databaseType database type
52-
* @param identifierValue identifier value
5353
* @return table name
5454
*/
55-
public static String getTableName(final DatabaseType databaseType, final IdentifierValue identifierValue) {
56-
return QuoteCharacter.NONE == identifierValue.getQuoteCharacter() ? new DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().formatTableNamePattern(identifierValue.getValue())
57-
: identifierValue.getValue();
55+
public static String getTableName(final IdentifierValue tableIdentifierValue, final DatabaseType databaseType) {
56+
return QuoteCharacter.NONE == tableIdentifierValue.getQuoteCharacter()
57+
? new DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().formatTableNamePattern(tableIdentifierValue.getValue())
58+
: tableIdentifierValue.getValue();
5859
}
5960

6061
/**

0 commit comments

Comments
 (0)