This is an automated email from the ASF dual-hosted git repository.
menghaoranss 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 88b1a643b0a Refactor SchemaRefreshUtils (#39033)
88b1a643b0a is described below
commit 88b1a643b0a5631d000d3189411b21beafd4f393
Author: Haoran Meng <[email protected]>
AuthorDate: Tue Jul 7 18:47:12 2026 +0800
Refactor SchemaRefreshUtils (#39033)
---
.../refresher/pushdown/PushDownMetaDataRefreshEngine.java | 2 +-
.../type/index/AlterIndexPushDownMetaDataRefresher.java | 3 ++-
.../type/index/DropIndexPushDownMetaDataRefresher.java | 3 ++-
.../type/schema/AlterSchemaPushDownMetaDataRefresher.java | 4 ++--
.../type/schema/CreateSchemaPushDownMetaDataRefresher.java | 2 +-
.../type/schema/DropSchemaPushDownMetaDataRefresher.java | 2 +-
.../type/table/DropTablePushDownMetaDataRefresher.java | 2 +-
.../type/table/RenameTablePushDownMetaDataRefresher.java | 2 +-
.../type/view/DropViewPushDownMetaDataRefresher.java | 5 +++--
.../mode/metadata/refresher/util/SchemaRefreshUtils.java | 14 +++++---------
.../mode/metadata/refresher/util/TableRefreshUtils.java | 6 +++---
.../pushdown/PushDownMetaDataRefreshEngineTest.java | 4 ++--
.../metadata/refresher/util/SchemaRefreshUtilsTest.java | 4 ++--
13 files changed, 26 insertions(+), 27 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/PushDownMetaDataRefreshEngine.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/PushDownMetaDataRefreshEngine.java
index 1d0970b54a9..c8439eb1c1d 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/PushDownMetaDataRefreshEngine.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/PushDownMetaDataRefreshEngine.java
@@ -88,7 +88,7 @@ public final class PushDownMetaDataRefreshEngine {
return;
}
Collection<String> logicDataSourceNames = routeUnits.stream().map(each
-> each.getDataSourceMapper().getLogicName()).collect(Collectors.toList());
- String schemaName = SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext, props);
+ String schemaName = SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext);
DatabaseType databaseType = routeUnits.stream().map(each ->
database.getResourceMetaData().getStorageUnits().get(each.getDataSourceMapper().getActualName()))
.filter(Objects::nonNull).findFirst().map(StorageUnit::getStorageType).orElseGet(()
-> sqlStatementContext.getSqlStatement().getDatabaseType());
refresher.get().refresh(metaDataManagerPersistService, database,
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/index/AlterIndexPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/index/AlterIndexPushDownMetaDataRefresher.java
index 6cdca0153ad..a5f8ff17d2c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/index/AlterIndexPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/index/AlterIndexPushDownMetaDataRefresher.java
@@ -32,6 +32,7 @@ import
org.apache.shardingsphere.mode.metadata.refresher.util.SchemaRefreshUtils
import
org.apache.shardingsphere.mode.metadata.refresher.util.TableRefreshUtils;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.index.IndexSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.OwnerSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.index.AlterIndexStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
@@ -53,7 +54,7 @@ public final class AlterIndexPushDownMetaDataRefresher
implements PushDownMetaDa
}
IndexSegment indexSegment = sqlStatement.getIndex().get();
String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database,
- indexSegment.getOwner().map(optional ->
optional.getIdentifier()).orElse(new IdentifierValue(schemaName)), props);
+
indexSegment.getOwner().map(OwnerSegment::getIdentifier).orElse(new
IdentifierValue(schemaName)));
String actualTableName =
TableRefreshUtils.findActualTableNameByIndex(database, actualSchemaName,
indexSegment.getIndexName().getIdentifier(), props)
.orElseThrow(() -> new
IndexNotFoundException(indexSegment.getIndexName().getIdentifier().getValue(),
actualSchemaName));
String indexName = TableRefreshUtils.getActualIndexName(database,
actualSchemaName, actualTableName, indexSegment.getIndexName().getIdentifier(),
props);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/index/DropIndexPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/index/DropIndexPushDownMetaDataRefresher.java
index fb628296182..320ef78883c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/index/DropIndexPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/index/DropIndexPushDownMetaDataRefresher.java
@@ -30,6 +30,7 @@ import
org.apache.shardingsphere.mode.metadata.refresher.util.SchemaRefreshUtils
import
org.apache.shardingsphere.mode.metadata.refresher.util.TableRefreshUtils;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.index.IndexSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.OwnerSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.index.DropIndexStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
@@ -47,7 +48,7 @@ public final class DropIndexPushDownMetaDataRefresher
implements PushDownMetaDat
final String schemaName, final DatabaseType
databaseType, final DropIndexStatement sqlStatement, final
ConfigurationProperties props) {
for (IndexSegment each : sqlStatement.getIndexes()) {
String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database,
- each.getOwner().map(optional ->
optional.getIdentifier()).orElse(new IdentifierValue(schemaName)), props);
+
each.getOwner().map(OwnerSegment::getIdentifier).orElse(new
IdentifierValue(schemaName)));
Optional<String> logicTableName = findActualTableName(database,
actualSchemaName, sqlStatement, each, props);
if (!logicTableName.isPresent()) {
continue;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/AlterSchemaPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/AlterSchemaPushDownMetaDataRefresher.java
index 574e546da88..44c8f5a3138 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/AlterSchemaPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/AlterSchemaPushDownMetaDataRefresher.java
@@ -35,11 +35,11 @@ public final class AlterSchemaPushDownMetaDataRefresher
implements PushDownMetaD
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
String logicDataSourceName,
final String schemaName, final DatabaseType
databaseType, final AlterSchemaStatement sqlStatement, final
ConfigurationProperties props) {
- Optional<String> renameSchemaName =
sqlStatement.getRenameSchema().map(optional ->
SchemaRefreshUtils.getActualSchemaName(database, optional, props));
+ Optional<String> renameSchemaName =
sqlStatement.getRenameSchema().map(optional ->
SchemaRefreshUtils.getActualSchemaName(database, optional));
if (!renameSchemaName.isPresent()) {
return;
}
- metaDataManagerPersistService.renameSchema(database,
SchemaRefreshUtils.getActualSchemaName(database, sqlStatement.getSchemaName(),
props), renameSchemaName.get());
+ metaDataManagerPersistService.renameSchema(database,
SchemaRefreshUtils.getActualSchemaName(database, sqlStatement.getSchemaName()),
renameSchemaName.get());
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/CreateSchemaPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/CreateSchemaPushDownMetaDataRefresher.java
index d0ef2c22a27..e4c9f305423 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/CreateSchemaPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/CreateSchemaPushDownMetaDataRefresher.java
@@ -36,7 +36,7 @@ public final class CreateSchemaPushDownMetaDataRefresher
implements PushDownMeta
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
String logicDataSourceName,
final String schemaName, final DatabaseType
databaseType, final CreateSchemaStatement sqlStatement, final
ConfigurationProperties props) {
- getSchemaName(sqlStatement).ifPresent(optional ->
metaDataManagerPersistService.createSchema(database,
SchemaRefreshUtils.getActualSchemaName(database, optional, props)));
+ getSchemaName(sqlStatement).ifPresent(optional ->
metaDataManagerPersistService.createSchema(database,
SchemaRefreshUtils.getActualSchemaName(database, optional)));
}
private static Optional<IdentifierValue> getSchemaName(final
CreateSchemaStatement sqlStatement) {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/DropSchemaPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/DropSchemaPushDownMetaDataRefresher.java
index 157bea0cd0d..4285fc6885e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/DropSchemaPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/schema/DropSchemaPushDownMetaDataRefresher.java
@@ -33,7 +33,7 @@ public final class DropSchemaPushDownMetaDataRefresher
implements PushDownMetaDa
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
String logicDataSourceName,
final String schemaName, final DatabaseType
databaseType, final DropSchemaStatement sqlStatement, final
ConfigurationProperties props) {
- metaDataManagerPersistService.dropSchema(database,
SchemaRefreshUtils.getActualSchemaNames(database,
sqlStatement.getSchemaNames(), props));
+ metaDataManagerPersistService.dropSchema(database,
SchemaRefreshUtils.getActualSchemaNames(database,
sqlStatement.getSchemaNames()));
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/table/DropTablePushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/table/DropTablePushDownMetaDataRefresher.java
index 023cb085d45..eac23a83ed4 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/table/DropTablePushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/table/DropTablePushDownMetaDataRefresher.java
@@ -38,7 +38,7 @@ public final class DropTablePushDownMetaDataRefresher
implements PushDownMetaDat
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
String logicDataSourceName,
final String schemaName, final DatabaseType
databaseType, final DropTableStatement sqlStatement, final
ConfigurationProperties props) {
- String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName), props);
+ String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName));
Collection<String> tableNames =
TableRefreshUtils.getActualTableNames(database, actualSchemaName,
sqlStatement.getTables().stream().map(each ->
each.getTableName().getIdentifier()).collect(Collectors.toList()), props);
metaDataManagerPersistService.dropTables(database, actualSchemaName,
tableNames);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
index 5cc64307540..8272ae23191 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
@@ -40,7 +40,7 @@ public final class RenameTablePushDownMetaDataRefresher
implements PushDownMetaD
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
String logicDataSourceName,
final String schemaName, final DatabaseType
databaseType, final RenameTableStatement sqlStatement, final
ConfigurationProperties props) {
- String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName), props);
+ String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName));
Collection<ShardingSphereTable> alteredTables = new LinkedList<>();
Collection<String> droppedTables = new LinkedList<>();
for (RenameTableDefinitionSegment each :
sqlStatement.getRenameTables()) {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/view/DropViewPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/view/DropViewPushDownMetaDataRefresher.java
index 559360a54bb..3e58282d4b3 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/view/DropViewPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/view/DropViewPushDownMetaDataRefresher.java
@@ -25,6 +25,7 @@ import
org.apache.shardingsphere.mode.metadata.refresher.util.SchemaRefreshUtils
import
org.apache.shardingsphere.mode.metadata.refresher.util.TableRefreshUtils;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.view.DropViewStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
@@ -39,9 +40,9 @@ public final class DropViewPushDownMetaDataRefresher
implements PushDownMetaData
@Override
public void refresh(final MetaDataManagerPersistService
metaDataManagerPersistService, final ShardingSphereDatabase database, final
String logicDataSourceName,
final String schemaName, final DatabaseType
databaseType, final DropViewStatement sqlStatement, final
ConfigurationProperties props) {
- String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName), props);
+ String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName));
Collection<IdentifierValue> viewIdentifierValues =
sqlStatement.getViews().stream().map(SimpleTableSegment::getTableName)
- .map(each ->
each.getIdentifier()).collect(Collectors.toList());
+
.map(TableNameSegment::getIdentifier).collect(Collectors.toList());
Collection<String> actualViewNames =
TableRefreshUtils.getActualViewNames(database, actualSchemaName,
viewIdentifierValues, props);
metaDataManagerPersistService.dropTables(database, actualSchemaName,
actualViewNames);
metaDataManagerPersistService.dropViews(database, actualSchemaName,
actualViewNames);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtils.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtils.java
index ff55f59c8bc..e9075572ffd 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtils.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtils.java
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.database.connector.core.metadata.identifier.Ide
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.LookupMode;
import
org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
-import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
@@ -56,11 +55,10 @@ public final class SchemaRefreshUtils {
*
* @param database database
* @param sqlStatementContext SQL statement context
- * @param props configuration properties
* @return actual schema name
*/
- public static String getActualSchemaName(final ShardingSphereDatabase
database, final SQLStatementContext sqlStatementContext, final
ConfigurationProperties props) {
- return getActualSchemaName(database, getRawSchemaName(database,
sqlStatementContext), props);
+ public static String getActualSchemaName(final ShardingSphereDatabase
database, final SQLStatementContext sqlStatementContext) {
+ return getActualSchemaName(database, getRawSchemaName(database,
sqlStatementContext));
}
/**
@@ -68,10 +66,9 @@ public final class SchemaRefreshUtils {
*
* @param database database
* @param schemaIdentifier schema identifier
- * @param props configuration properties
* @return actual schema name
*/
- public static String getActualSchemaName(final ShardingSphereDatabase
database, final IdentifierValue schemaIdentifier, final ConfigurationProperties
props) {
+ public static String getActualSchemaName(final ShardingSphereDatabase
database, final IdentifierValue schemaIdentifier) {
IdentifierCasePolicy policy =
database.getIdentifierContext().getPolicy(IdentifierScope.SCHEMA);
Optional<String> matchedSchemaName =
database.getAllSchemas().stream().map(ShardingSphereSchema::getName)
.filter(each -> policy.matches(each,
schemaIdentifier.getValue(), schemaIdentifier.getQuoteCharacter())).findFirst();
@@ -85,13 +82,12 @@ public final class SchemaRefreshUtils {
*
* @param database database
* @param schemaIdentifiers schema identifiers
- * @param props configuration properties
* @return actual schema names
*/
- public static Collection<String> getActualSchemaNames(final
ShardingSphereDatabase database, final Collection<IdentifierValue>
schemaIdentifiers, final ConfigurationProperties props) {
+ public static Collection<String> getActualSchemaNames(final
ShardingSphereDatabase database, final Collection<IdentifierValue>
schemaIdentifiers) {
Collection<String> result = new LinkedList<>();
for (IdentifierValue each : schemaIdentifiers) {
- String actualSchemaName = getActualSchemaName(database, each,
props);
+ String actualSchemaName = getActualSchemaName(database, each);
if (null != actualSchemaName) {
result.add(actualSchemaName);
}
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 70e5fc75082..0914c2a3e7f 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
@@ -214,7 +214,7 @@ public final class TableRefreshUtils {
public static Optional<String> findActualTableNameByIndex(final
ShardingSphereDatabase database, final String schemaName,
final
IdentifierValue indexIdentifierValue, final ConfigurationProperties props) {
IdentifierCasePolicy policy =
database.getIdentifierContext().getPolicy(IdentifierScope.INDEX);
- String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName), props);
+ String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName));
ShardingSphereSchema schema = database.getSchema(actualSchemaName);
if (null == schema) {
return Optional.empty();
@@ -299,7 +299,7 @@ public final class TableRefreshUtils {
final IdentifierValue
objectIdentifierValue, final ConfigurationProperties props,
final IdentifierScope scope,
final Function<ShardingSphereSchema, java.util.stream.Stream<String>>
actualNameStream) {
IdentifierCasePolicy policy =
database.getIdentifierContext().getPolicy(scope);
- String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName), props);
+ String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName));
ShardingSphereSchema schema = database.getSchema(actualSchemaName);
if (null != schema) {
Optional<String> matchedName = actualNameStream.apply(schema)
@@ -317,7 +317,7 @@ public final class TableRefreshUtils {
final IdentifierValue
objectIdentifierValue, final ConfigurationProperties props, final
IdentifierScope scope,
final
Function<ShardingSphereTable, Collection<T>> actualObjects, final Function<T,
String> actualNameMapper) {
IdentifierCasePolicy policy =
database.getIdentifierContext().getPolicy(scope);
- String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName), props);
+ String actualSchemaName =
SchemaRefreshUtils.getActualSchemaName(database, new
IdentifierValue(schemaName));
ShardingSphereSchema schema = database.getSchema(actualSchemaName);
if (null != schema) {
String actualTableName = getActualTableName(database,
actualSchemaName, new IdentifierValue(tableName), props);
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/PushDownMetaDataRefreshEngineTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/PushDownMetaDataRefreshEngineTest.java
index bd758b2dc5d..ee6f164adc4 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/PushDownMetaDataRefreshEngineTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/PushDownMetaDataRefreshEngineTest.java
@@ -92,7 +92,7 @@ class PushDownMetaDataRefreshEngineTest {
when(resourceMetaData.getStorageUnits()).thenReturn(Collections.singletonMap("actual_ds",
storageUnit));
when(database.getResourceMetaData()).thenReturn(resourceMetaData);
ConfigurationProperties props = new ConfigurationProperties(new
Properties());
- when(SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext, props)).thenReturn("foo_schema");
+ when(SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext)).thenReturn("foo_schema");
PushDownMetaDataRefresher<SQLStatement> refresher =
mock(PushDownMetaDataRefresher.class);
when(TypedSPILoader.findService(PushDownMetaDataRefresher.class,
sqlStatement.getClass())).thenReturn(Optional.of(refresher));
new PushDownMetaDataRefreshEngine(sqlStatementContext).refresh(
@@ -106,7 +106,7 @@ class PushDownMetaDataRefreshEngineTest {
SQLStatement sqlStatement =
UpdateStatement.builder().databaseType(databaseType).build();
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
ConfigurationProperties props = new ConfigurationProperties(new
Properties());
- when(SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext, props)).thenReturn("foo_schema");
+ when(SchemaRefreshUtils.getActualSchemaName(database,
sqlStatementContext)).thenReturn("foo_schema");
PushDownMetaDataRefresher<SQLStatement> refresher =
mock(PushDownMetaDataRefresher.class);
when(TypedSPILoader.findService(PushDownMetaDataRefresher.class,
sqlStatement.getClass())).thenReturn(Optional.of(refresher));
new
PushDownMetaDataRefreshEngine(sqlStatementContext).refresh(metaDataManagerPersistService,
database, props, Collections.emptyList());
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtilsTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtilsTest.java
index 4730a770001..a9b50604eb7 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtilsTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/util/SchemaRefreshUtilsTest.java
@@ -61,13 +61,13 @@ class SchemaRefreshUtilsTest {
@Test
void assertGetActualSchemaNameWithInsensitiveProps() {
- assertThat(SchemaRefreshUtils.getActualSchemaName(createDatabase(),
new IdentifierValue("Foo_Schema"), new ConfigurationProperties(new
Properties())), is("foo_schema"));
+ assertThat(SchemaRefreshUtils.getActualSchemaName(createDatabase(),
new IdentifierValue("Foo_Schema")), is("foo_schema"));
}
@Test
void assertGetActualSchemaNames() {
List<IdentifierValue> schemaIdentifiers = Arrays.asList(new
IdentifierValue("Foo_Schema"), new IdentifierValue("bar_schema"), new
IdentifierValue("new_schema"));
-
assertThat(SchemaRefreshUtils.getActualSchemaNames(createDatabaseWithSchema("foo_schema",
"bar_schema"), schemaIdentifiers, new ConfigurationProperties(new
Properties())),
+
assertThat(SchemaRefreshUtils.getActualSchemaNames(createDatabaseWithSchema("foo_schema",
"bar_schema"), schemaIdentifiers),
is(Arrays.asList("foo_schema", "bar_schema", "new_schema")));
}
