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 ede23588fa8 Refactor MetaDataManagerPersistService.createTable()
(#34515)
ede23588fa8 is described below
commit ede23588fa8439df84878748e1f5d58ae793286d
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jan 26 19:46:09 2025 +0800
Refactor MetaDataManagerPersistService.createTable() (#34515)
---
.../pushdown/type/table/CreateTablePushDownMetaDataRefresher.java | 2 +-
.../mode/persist/service/MetaDataManagerPersistService.java | 3 +--
.../cluster/persist/service/ClusterMetaDataManagerPersistService.java | 2 +-
.../persist/service/ClusterMetaDataManagerPersistServiceTest.java | 2 +-
.../persist/service/StandaloneMetaDataManagerPersistService.java | 2 +-
.../persist/service/StandaloneMetaDataManagerPersistServiceTest.java | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
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 9ca75672420..ffd91900cbb 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
@@ -57,7 +57,7 @@ public final class CreateTablePushDownMetaDataRefresher
implements PushDownMetaD
Map<String, ShardingSphereSchema> schemas =
GenericSchemaBuilder.build(Collections.singletonList(tableName),
database.getProtocolType(), material);
Optional<ShardingSphereTable> actualTableMetaData =
Optional.ofNullable(schemas.get(schemaName)).map(optional ->
optional.getTable(tableName));
Preconditions.checkState(actualTableMetaData.isPresent(), "Load actual
table metadata '%s' failed.", tableName);
- metaDataManagerPersistService.createTable(database.getName(),
schemaName, actualTableMetaData.get(), logicDataSourceNames.isEmpty() ? null :
logicDataSourceNames.iterator().next());
+ metaDataManagerPersistService.createTable(database.getName(),
schemaName, actualTableMetaData.get());
if (isSingleTable && TableRefreshUtils.isNeedRefresh(ruleMetaData,
schemaName, tableName)) {
metaDataManagerPersistService.alterSingleRuleConfiguration(database.getName(),
ruleMetaData);
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
index 344a34c9760..f20d0e9b326 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
@@ -93,9 +93,8 @@ public interface MetaDataManagerPersistService {
* @param databaseName database name
* @param schemaName schema name
* @param table table
- * @param logicDataSourceName logic data source name
*/
- void createTable(String databaseName, String schemaName,
ShardingSphereTable table, String logicDataSourceName);
+ void createTable(String databaseName, String schemaName,
ShardingSphereTable table);
/**
* Drop tables.
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 33fc187b04c..78ee72d75a8 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -120,7 +120,7 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
}
@Override
- public void createTable(final String databaseName, final String
schemaName, final ShardingSphereTable table, final String logicDataSourceName) {
+ public void createTable(final String databaseName, final String
schemaName, final ShardingSphereTable table) {
metaDataPersistService.getDatabaseMetaDataFacade().getTable().persist(databaseName,
schemaName, Collections.singleton(table));
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
index c8c78966df3..27ab78a5fc1 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
@@ -184,7 +184,7 @@ class ClusterMetaDataManagerPersistServiceTest {
@Test
void assertCreateTable() {
ShardingSphereTable table = mock(ShardingSphereTable.class);
- metaDataManagerPersistService.createTable("foo_db", "foo_schema",
table, "foo_ds");
+ metaDataManagerPersistService.createTable("foo_db", "foo_schema",
table);
verify(metaDataPersistService.getDatabaseMetaDataFacade().getTable()).persist("foo_db",
"foo_schema", Collections.singleton(table));
}
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index 5cd70dcfcc8..9875dd65ba0 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -215,7 +215,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
}
@Override
- public void createTable(final String databaseName, final String
schemaName, final ShardingSphereTable table, final String logicDataSourceName) {
+ public void createTable(final String databaseName, final String
schemaName, final ShardingSphereTable table) {
metaDataPersistService.getDatabaseMetaDataFacade().getTable().persist(databaseName,
schemaName, Collections.singleton(table));
ShardingSphereMetaData metaData =
metaDataContextManager.getMetaDataContexts().getMetaData();
ShardingSphereDatabase database = metaData.getDatabase(databaseName);
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
index 10a00ceb229..eb2a1e9bfea 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -224,7 +224,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
@Test
void assertCreateTable() {
ShardingSphereTable table = new ShardingSphereTable("foo_tbl",
Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
TableType.TABLE);
- metaDataManagerPersistService.createTable("foo_db", "foo_schema",
table, "foo_ds");
+ metaDataManagerPersistService.createTable("foo_db", "foo_schema",
table);
verify(metaDataPersistService.getDatabaseMetaDataFacade().getTable()).persist("foo_db",
"foo_schema", Collections.singleton(table));
}
