This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 d30fa89de6e Remove DatabaseMetaDataBasedPersistService and
MetaDataBasedPersistService (#31293)
d30fa89de6e is described below
commit d30fa89de6eab327ee949f832659d7176ee6815d
Author: zhaojinchao <[email protected]>
AuthorDate: Mon May 20 10:37:50 2024 +0800
Remove DatabaseMetaDataBasedPersistService and MetaDataBasedPersistService
(#31293)
* Remove DatabaseMetaDataBasedPersistService and MetaDataBasedPersistService
* Fix ci
---
.../DriverDatabaseConnectionManager.java | 4 +-
.../metadata/factory/InternalMetaDataFactory.java | 3 +-
.../persist/MetaDataBasedPersistService.java | 123 --------------------
.../metadata/persist/MetaDataPersistService.java | 19 ++-
.../DatabaseMetaDataBasedPersistService.java | 127 ---------------------
.../database/DatabaseMetaDataPersistService.java | 73 ++++++++++--
.../mode/manager/ContextManager.java | 6 +-
.../context/ConfigurationContextManager.java | 4 +-
.../mode/metadata/MetaDataContexts.java | 6 +-
.../manager/cluster/ClusterModeContextManager.java | 8 +-
.../standalone/StandaloneModeContextManager.java | 6 +-
.../pipeline/core/util/PipelineContextUtils.java | 3 +-
12 files changed, 96 insertions(+), 286 deletions(-)
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManager.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManager.java
index a5090d7dde0..96413559cb4 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManager.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManager.java
@@ -38,7 +38,7 @@ import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUn
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
import
org.apache.shardingsphere.infra.session.connection.transaction.TransactionConnectionContext;
-import org.apache.shardingsphere.metadata.persist.MetaDataBasedPersistService;
+import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.traffic.rule.TrafficRule;
import org.apache.shardingsphere.transaction.ConnectionSavepointManager;
@@ -109,7 +109,7 @@ public final class DriverDatabaseConnectionManager
implements OnlineDatabaseConn
if (rule.getStrategyRules().isEmpty()) {
return Collections.emptyMap();
}
- MetaDataBasedPersistService persistService =
contextManager.getMetaDataContexts().getPersistService();
+ MetaDataPersistService persistService =
contextManager.getMetaDataContexts().getPersistService();
String actualDatabaseName =
contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName();
Map<String, DataSourcePoolProperties> propsMap =
persistService.getDataSourceUnitService().load(actualDatabaseName);
Preconditions.checkState(!propsMap.isEmpty(), "Can not get data source
properties from meta data.");
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/factory/InternalMetaDataFactory.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/factory/InternalMetaDataFactory.java
index ed551fdbe45..b6da2bc8514 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/factory/InternalMetaDataFactory.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/factory/InternalMetaDataFactory.java
@@ -26,7 +26,6 @@ import
org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.rule.builder.database.DatabaseRulesBuilder;
-import org.apache.shardingsphere.metadata.persist.MetaDataBasedPersistService;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import java.util.Map;
@@ -49,7 +48,7 @@ public final class InternalMetaDataFactory {
* @param instanceContext instance context
* @return database meta data
*/
- public static ShardingSphereDatabase create(final String databaseName,
final MetaDataBasedPersistService persistService, final DatabaseConfiguration
databaseConfig,
+ public static ShardingSphereDatabase create(final String databaseName,
final MetaDataPersistService persistService, final DatabaseConfiguration
databaseConfig,
final ConfigurationProperties
props, final InstanceContext instanceContext) {
DatabaseType protocolType =
DatabaseTypeEngine.getProtocolType(databaseName, databaseConfig, props);
return ShardingSphereDatabase.create(databaseName, protocolType,
databaseConfig, DatabaseRulesBuilder.build(databaseName, protocolType,
databaseConfig, instanceContext),
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataBasedPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataBasedPersistService.java
deleted file mode 100644
index 58ea367569f..00000000000
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataBasedPersistService.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.metadata.persist;
-
-import org.apache.shardingsphere.infra.config.database.DatabaseConfiguration;
-import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
-import
org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration;
-import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import
org.apache.shardingsphere.metadata.persist.data.ShardingSphereDataBasedPersistService;
-import
org.apache.shardingsphere.metadata.persist.service.config.database.DatabaseBasedPersistService;
-import
org.apache.shardingsphere.metadata.persist.service.config.global.GlobalPersistService;
-import
org.apache.shardingsphere.metadata.persist.service.database.DatabaseMetaDataBasedPersistService;
-import
org.apache.shardingsphere.metadata.persist.service.version.MetaDataVersionBasedPersistService;
-import org.apache.shardingsphere.mode.spi.PersistRepository;
-
-import javax.sql.DataSource;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Abstract meta data persist service.
- */
-public interface MetaDataBasedPersistService {
-
- /**
- * Get repository.
- *
- * @return repository
- */
- PersistRepository getRepository();
-
- /**
- * Get data source unit service.
- *
- * @return persist service
- */
- DatabaseBasedPersistService<Map<String, DataSourcePoolProperties>>
getDataSourceUnitService();
-
- /**
- * Get database meta data service.
- *
- * @return persist service
- */
- DatabaseMetaDataBasedPersistService getDatabaseMetaDataService();
-
- /**
- * Get database rule persist service.
- *
- * @return persist service
- */
- DatabaseBasedPersistService<Collection<RuleConfiguration>>
getDatabaseRulePersistService();
-
- /**
- * Get global rule service.
- *
- * @return repository
- */
- GlobalPersistService<Collection<RuleConfiguration>> getGlobalRuleService();
-
- /**
- * Get props service.
- *
- * @return persist service
- */
- GlobalPersistService<Properties> getPropsService();
-
- /**
- * Get meta data version persist service.
- *
- * @return persist service
- */
- MetaDataVersionBasedPersistService getMetaDataVersionPersistService();
-
- /**
- * Get ShardingSphere data persist service.
- *
- * @return persist service
- */
- ShardingSphereDataBasedPersistService
getShardingSphereDataPersistService();
-
- /**
- * Persist global rule configurations.
- *
- * @param globalRuleConfigs global rule configurations
- * @param props properties
- */
- void persistGlobalRuleConfiguration(Collection<RuleConfiguration>
globalRuleConfigs, Properties props);
-
- /**
- * Persist configurations.
- *
- * @param databaseName database name
- * @param databaseConfigs database configurations
- * @param dataSources data sources
- * @param rules rules
- */
- void persistConfigurations(String databaseName, DatabaseConfiguration
databaseConfigs, Map<String, DataSource> dataSources,
Collection<ShardingSphereRule> rules);
-
- /**
- * Get effective data sources.
- *
- * @param databaseName database name
- * @return effective data sources
- */
- Map<String, DataSourceConfiguration> loadDataSourceConfigurations(String
databaseName);
-}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java
index 6655c5d924e..bff9f0e43e2 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java
@@ -50,7 +50,7 @@ import java.util.stream.Collectors;
* New meta data persist service.
*/
@Getter
-public final class MetaDataPersistService implements
MetaDataBasedPersistService {
+public final class MetaDataPersistService {
private final PersistRepository repository;
@@ -88,13 +88,19 @@ public final class MetaDataPersistService implements
MetaDataBasedPersistService
* @param globalRuleConfigs global rule configurations
* @param props properties
*/
- @Override
public void persistGlobalRuleConfiguration(final
Collection<RuleConfiguration> globalRuleConfigs, final Properties props) {
globalRuleService.persist(globalRuleConfigs);
propsService.persist(props);
}
- @Override
+ /**
+ * Persist configurations.
+ *
+ * @param databaseName database name
+ * @param databaseConfigs database configuration
+ * @param dataSources data sources
+ * @param rules rules
+ */
public void persistConfigurations(final String databaseName, final
DatabaseConfiguration databaseConfigs, final Map<String, DataSource>
dataSources, final Collection<ShardingSphereRule> rules) {
Map<String, DataSourcePoolProperties> propsMap =
getDataSourcePoolPropertiesMap(databaseConfigs);
if (propsMap.isEmpty() &&
databaseConfigs.getRuleConfigurations().isEmpty()) {
@@ -121,7 +127,12 @@ public final class MetaDataPersistService implements
MetaDataBasedPersistService
.collect(Collectors.toMap(Entry::getKey, entry ->
entry.getValue().getDataSourcePoolProperties(), (oldValue, currentValue) ->
oldValue, LinkedHashMap::new));
}
- @Override
+ /**
+ * Load data source configurations.
+ *
+ * @param databaseName database name
+ * @return data source configurations
+ */
public Map<String, DataSourceConfiguration>
loadDataSourceConfigurations(final String databaseName) {
return
dataSourceUnitService.load(databaseName).entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry ->
DataSourcePoolPropertiesCreator.createConfiguration(entry.getValue()),
(oldValue, currentValue) -> oldValue, LinkedHashMap::new));
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataBasedPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataBasedPersistService.java
deleted file mode 100644
index 3eab43302f2..00000000000
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataBasedPersistService.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.metadata.persist.service.database;
-
-import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
-import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
-import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
-import
org.apache.shardingsphere.metadata.persist.service.schema.SchemaMetaDataPersistService;
-
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Database meta data based registry service.
- */
-public interface DatabaseMetaDataBasedPersistService {
-
- /**
- * Add database name.
- *
- * @param databaseName database name
- */
- void addDatabase(String databaseName);
-
- /**
- * Drop database.
- *
- * @param databaseName database name to be deleted
- */
- void dropDatabase(String databaseName);
-
- /**
- * Load all database names.
- *
- * @return all database names
- */
- Collection<String> loadAllDatabaseNames();
-
- /**
- * Add schema.
- *
- * @param databaseName database name
- * @param schemaName schema name
- */
- void addSchema(String databaseName, String schemaName);
-
- /**
- * Drop schema.
- *
- * @param databaseName database name
- * @param schemaName schema name
- */
- void dropSchema(String databaseName, String schemaName);
-
- /**
- * Compare and persist schema meta data.
- *
- * @param databaseName database name
- * @param schemaName schema name
- * @param schema schema meta data
- */
- void compareAndPersist(String databaseName, String schemaName,
ShardingSphereSchema schema);
-
- /**
- * Persist schema meta data by alter configuration.
- *
- * @param databaseName database name
- * @param schemaName schema name
- * @param schema schema meta data
- */
- void persistByAlterConfiguration(String databaseName, String schemaName,
ShardingSphereSchema schema);
-
- /**
- * Persist schema meta data by drop configuration.
- *
- * @param databaseName database name
- * @param schemaName schema name
- * @param schema schema meta data
- */
- void persistByDropConfiguration(String databaseName, String schemaName,
ShardingSphereSchema schema);
-
- /**
- * Delete schema meta data.
- *
- * @param databaseName database name
- * @param schemaName schema name
- * @param schema schema meta data
- */
- void delete(String databaseName, String schemaName, ShardingSphereSchema
schema);
-
- /**
- * Load schema meta data.
- *
- * @param databaseName database name
- * @return schema meta data
- */
- Map<String, ShardingSphereSchema> loadSchemas(String databaseName);
-
- /**
- * Get table meta data persist service.
- *
- * @return persist service
- */
- SchemaMetaDataPersistService<Map<String, ShardingSphereTable>>
getTableMetaDataPersistService();
-
- /**
- * Get view meta data persist service.
- *
- * @return persist service
- */
- SchemaMetaDataPersistService<Map<String, ShardingSphereView>>
getViewMetaDataPersistService();
-}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
index d3034bea2ee..359a4c8ac90 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
@@ -35,7 +35,7 @@ import java.util.Map;
* Database meta data registry service.
*/
@Getter
-public final class DatabaseMetaDataPersistService implements
DatabaseMetaDataBasedPersistService {
+public final class DatabaseMetaDataPersistService {
private final PersistRepository repository;
@@ -52,32 +52,60 @@ public final class DatabaseMetaDataPersistService
implements DatabaseMetaDataBas
viewMetaDataPersistService = new
ViewMetaDataPersistService(repository, metaDataVersionPersistService);
}
- @Override
+ /**
+ * Add database.
+ *
+ * @param databaseName database name
+ */
public void addDatabase(final String databaseName) {
repository.persist(DatabaseMetaDataNode.getDatabaseNamePath(databaseName), "");
}
- @Override
+ /**
+ * Drop database.
+ *
+ * @param databaseName database name
+ */
public void dropDatabase(final String databaseName) {
repository.delete(DatabaseMetaDataNode.getDatabaseNamePath(databaseName));
}
- @Override
+ /**
+ * Load database names.
+ *
+ * @return database names
+ */
public Collection<String> loadAllDatabaseNames() {
return
repository.getChildrenKeys(DatabaseMetaDataNode.getMetaDataNode());
}
- @Override
+ /**
+ * Add schema.
+ *
+ * @param databaseName database name
+ * @param schemaName schema name
+ */
public void addSchema(final String databaseName, final String schemaName) {
repository.persist(DatabaseMetaDataNode.getMetaDataTablesPath(databaseName,
schemaName), "");
}
- @Override
+ /**
+ * Drop schema.
+ *
+ * @param databaseName database name
+ * @param schemaName schema name
+ */
public void dropSchema(final String databaseName, final String schemaName)
{
repository.delete(DatabaseMetaDataNode.getMetaDataSchemaPath(databaseName,
schemaName));
}
- @Override
+ /**
+ * Compare and persist schema.
+ *
+ * @param databaseName database name
+ * @param schemaName schema name
+ * @param schema schema meta data
+ */
public void compareAndPersist(final String databaseName, final String
schemaName, final ShardingSphereSchema schema) {
if (schema.getTables().isEmpty() && schema.getViews().isEmpty()) {
addSchema(databaseName, schemaName);
@@ -87,7 +115,13 @@ public final class DatabaseMetaDataPersistService
implements DatabaseMetaDataBas
GenericSchemaManager.getToBeDeletedTables(schema.getTables(),
currentTables).forEach((key, value) ->
tableMetaDataPersistService.delete(databaseName, schemaName, key));
}
- @Override
+ /**
+ * Persist by alter configuration.
+ *
+ * @param databaseName database name
+ * @param schemaName schema name
+ * @param schema schema meta data
+ */
public void persistByAlterConfiguration(final String databaseName, final
String schemaName, final ShardingSphereSchema schema) {
if (schema.getTables().isEmpty() && schema.getViews().isEmpty()) {
addSchema(databaseName, schemaName);
@@ -95,17 +129,34 @@ public final class DatabaseMetaDataPersistService
implements DatabaseMetaDataBas
tableMetaDataPersistService.persist(databaseName, schemaName,
schema.getTables());
}
- @Override
+ /**
+ * Persist by drop configuration.
+ *
+ * @param databaseName database name
+ * @param schemaName schema name
+ * @param schema schema meta data
+ */
public void persistByDropConfiguration(final String databaseName, final
String schemaName, final ShardingSphereSchema schema) {
tableMetaDataPersistService.persist(databaseName, schemaName,
schema.getTables());
}
- @Override
+ /**
+ * Delete schema metadata.
+ *
+ * @param databaseName database name
+ * @param schemaName schema name
+ * @param schema schema meta data
+ */
public void delete(final String databaseName, final String schemaName,
final ShardingSphereSchema schema) {
schema.getTables().forEach((key, value) ->
tableMetaDataPersistService.delete(databaseName, schemaName, key));
}
- @Override
+ /**
+ * Load schemas.
+ *
+ * @param databaseName database name
+ * @return schemas
+ */
public Map<String, ShardingSphereSchema> loadSchemas(final String
databaseName) {
Collection<String> schemaNames = loadAllSchemaNames(databaseName);
Map<String, ShardingSphereSchema> result = new
LinkedHashMap<>(schemaNames.size(), 1F);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index d3a1ca538b8..71eda5d047c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -38,7 +38,7 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericS
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder;
import org.apache.shardingsphere.infra.state.cluster.ClusterState;
-import org.apache.shardingsphere.metadata.persist.MetaDataBasedPersistService;
+import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.mode.manager.context.ConfigurationContextManager;
import
org.apache.shardingsphere.mode.manager.context.ResourceMetaDataContextManager;
import
org.apache.shardingsphere.mode.manager.context.ShardingSphereDatabaseContextManager;
@@ -135,7 +135,7 @@ public final class ContextManager implements AutoCloseable {
public void refreshDatabaseMetaData(final ShardingSphereDatabase database,
final boolean force) {
try {
MetaDataContexts reloadedMetaDataContexts =
createMetaDataContexts(database);
- MetaDataBasedPersistService persistService =
metaDataContexts.get().getPersistService();
+ MetaDataPersistService persistService =
metaDataContexts.get().getPersistService();
if (force) {
metaDataContexts.set(reloadedMetaDataContexts);
metaDataContexts.get().getMetaData().getDatabase(database.getName()).getSchemas()
@@ -169,7 +169,7 @@ public final class ContextManager implements AutoCloseable {
}
private MetaDataContexts createMetaDataContexts(final
ShardingSphereDatabase database) throws SQLException {
- MetaDataBasedPersistService metaDataPersistService =
metaDataContexts.get().getPersistService();
+ MetaDataPersistService metaDataPersistService =
metaDataContexts.get().getPersistService();
Map<String, DataSourcePoolProperties> dataSourcePoolPropsFromRegCenter
= metaDataPersistService.getDataSourceUnitService().load(database.getName());
SwitchingResource switchingResource = new
ResourceSwitchManager().alterStorageUnit(database.getResourceMetaData(),
dataSourcePoolPropsFromRegCenter);
metaDataContexts.get().getMetaData().getDatabases().putAll(configurationContextManager.renewDatabase(database,
switchingResource));
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
index f74ead222df..7b6606e2ed9 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
@@ -40,11 +40,11 @@ import
org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import
org.apache.shardingsphere.infra.rule.builder.database.DatabaseRulesBuilder;
import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
+import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.tuple.annotation.RepositoryTupleEntity;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.metadata.factory.ExternalMetaDataFactory;
import org.apache.shardingsphere.metadata.factory.InternalMetaDataFactory;
-import org.apache.shardingsphere.metadata.persist.MetaDataBasedPersistService;
import org.apache.shardingsphere.mode.manager.switcher.ResourceSwitchManager;
import org.apache.shardingsphere.mode.manager.switcher.SwitchingResource;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
@@ -342,7 +342,7 @@ public final class ConfigurationContextManager {
return result;
}
- private ShardingSphereDatabase createChangedDatabase(final String
databaseName, final boolean internalLoadMetaData, final
MetaDataBasedPersistService persistService,
+ private ShardingSphereDatabase createChangedDatabase(final String
databaseName, final boolean internalLoadMetaData, final MetaDataPersistService
persistService,
final
DatabaseConfiguration databaseConfig, final ConfigurationProperties props,
final InstanceContext instanceContext) throws SQLException {
return internalLoadMetaData
? InternalMetaDataFactory.create(databaseName, persistService,
databaseConfig, props, instanceContext)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
index c6cdd7a8c59..b9a52ce3c9e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableDa
import
org.apache.shardingsphere.infra.metadata.statistics.builder.ShardingSphereStatisticsBuilder;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.metadata.persist.MetaDataBasedPersistService;
+import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import java.util.Collection;
import java.util.LinkedList;
@@ -44,13 +44,13 @@ import java.util.Optional;
@Getter
public final class MetaDataContexts implements AutoCloseable {
- private final MetaDataBasedPersistService persistService;
+ private final MetaDataPersistService persistService;
private final ShardingSphereMetaData metaData;
private final ShardingSphereStatistics statistics;
- public MetaDataContexts(final MetaDataBasedPersistService persistService,
final ShardingSphereMetaData metaData) {
+ public MetaDataContexts(final MetaDataPersistService persistService, final
ShardingSphereMetaData metaData) {
this.persistService = persistService;
this.metaData = metaData;
statistics = initStatistics(metaData);
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
index cde60db7dbf..6c4beefb71d 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.pojo.AlterSchema
import
org.apache.shardingsphere.infra.metadata.database.schema.pojo.AlterSchemaPOJO;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import
org.apache.shardingsphere.metadata.persist.service.config.database.DatabaseBasedPersistService;
-import
org.apache.shardingsphere.metadata.persist.service.database.DatabaseMetaDataBasedPersistService;
+import
org.apache.shardingsphere.metadata.persist.service.database.DatabaseMetaDataPersistService;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerAware;
import org.apache.shardingsphere.single.api.config.SingleRuleConfiguration;
@@ -68,7 +68,7 @@ public final class ClusterModeContextManager implements
ModeContextManager, Cont
String databaseName = alterSchemaPOJO.getDatabaseName();
String schemaName = alterSchemaPOJO.getSchemaName();
ShardingSphereSchema schema =
contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getSchema(schemaName);
- DatabaseMetaDataBasedPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
+ DatabaseMetaDataPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
databaseMetaDataService.persistByAlterConfiguration(databaseName,
alterSchemaPOJO.getRenameSchemaName(), schema);
databaseMetaDataService.getViewMetaDataPersistService().persist(databaseName,
alterSchemaPOJO.getRenameSchemaName(), schema.getViews());
databaseMetaDataService.dropSchema(databaseName, schemaName);
@@ -76,7 +76,7 @@ public final class ClusterModeContextManager implements
ModeContextManager, Cont
@Override
public void dropSchema(final String databaseName, final Collection<String>
schemaNames) {
- DatabaseMetaDataBasedPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
+ DatabaseMetaDataPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
schemaNames.forEach(each ->
databaseMetaDataService.dropSchema(databaseName, each));
}
@@ -86,7 +86,7 @@ public final class ClusterModeContextManager implements
ModeContextManager, Cont
String schemaName = alterSchemaMetaDataPOJO.getSchemaName();
Map<String, ShardingSphereTable> tables =
alterSchemaMetaDataPOJO.getAlteredTables().stream().collect(Collectors.toMap(ShardingSphereTable::getName,
table -> table));
Map<String, ShardingSphereView> views =
alterSchemaMetaDataPOJO.getAlteredViews().stream().collect(Collectors.toMap(ShardingSphereView::getName,
view -> view));
- DatabaseMetaDataBasedPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
+ DatabaseMetaDataPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
databaseMetaDataService.getTableMetaDataPersistService().persist(databaseName,
schemaName, tables);
databaseMetaDataService.getViewMetaDataPersistService().persist(databaseName,
schemaName, views);
alterSchemaMetaDataPOJO.getDroppedTables().forEach(each ->
databaseMetaDataService.getTableMetaDataPersistService().delete(databaseName,
schemaName, each));
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
index 93afad14b79..c3c3fb59789 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
import
org.apache.shardingsphere.infra.rule.scope.GlobalRule.GlobalRuleChangedType;
import
org.apache.shardingsphere.infra.spi.type.ordered.cache.OrderedServicesCache;
import
org.apache.shardingsphere.metadata.persist.service.config.database.DatabaseBasedPersistService;
-import
org.apache.shardingsphere.metadata.persist.service.database.DatabaseMetaDataBasedPersistService;
+import
org.apache.shardingsphere.metadata.persist.service.database.DatabaseMetaDataPersistService;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -98,7 +98,7 @@ public final class StandaloneModeContextManager implements
ModeContextManager, C
putSchemaMetaData(database, alterSchemaPOJO.getSchemaName(),
alterSchemaPOJO.getRenameSchemaName(),
alterSchemaPOJO.getLogicDataSourceName());
removeSchemaMetaData(database, alterSchemaPOJO.getSchemaName());
metaData.getGlobalRuleMetaData().getRules().forEach(each ->
((GlobalRule) each).refresh(metaData.getDatabases(),
GlobalRuleChangedType.SCHEMA_CHANGED));
- DatabaseMetaDataBasedPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
+ DatabaseMetaDataPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
databaseMetaDataService.persistByAlterConfiguration(alterSchemaPOJO.getDatabaseName(),
alterSchemaPOJO.getRenameSchemaName(),
database.getSchema(alterSchemaPOJO.getRenameSchemaName()));
databaseMetaDataService.getViewMetaDataPersistService().persist(alterSchemaPOJO.getDatabaseName(),
alterSchemaPOJO.getRenameSchemaName(),
database.getSchema(alterSchemaPOJO.getRenameSchemaName()).getViews());
@@ -203,7 +203,7 @@ public final class StandaloneModeContextManager implements
ModeContextManager, C
addDataNode(database,
alterSchemaMetaDataPOJO.getLogicDataSourceName(), schemaName, tables, views);
removeDataNode(database, schemaName,
alterSchemaMetaDataPOJO.getDroppedTables(),
alterSchemaMetaDataPOJO.getDroppedViews());
metaData.getGlobalRuleMetaData().getRules().forEach(each ->
((GlobalRule) each).refresh(metaData.getDatabases(),
GlobalRuleChangedType.SCHEMA_CHANGED));
- DatabaseMetaDataBasedPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
+ DatabaseMetaDataPersistService databaseMetaDataService =
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService();
databaseMetaDataService.getTableMetaDataPersistService().persist(databaseName,
schemaName, tables);
databaseMetaDataService.getViewMetaDataPersistService().persist(databaseName,
schemaName, views);
alterSchemaMetaDataPOJO.getDroppedTables().forEach(each ->
databaseMetaDataService.getTableMetaDataPersistService().delete(databaseName,
schemaName, each));
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
index a1b26cb3414..acb71e078a7 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
@@ -60,7 +60,6 @@ import
org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.mode.YamlModeConfigurationSwapper;
import
org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
-import org.apache.shardingsphere.metadata.persist.MetaDataBasedPersistService;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
@@ -129,7 +128,7 @@ public final class PipelineContextUtils {
return result;
}
- private static MetaDataContexts renewMetaDataContexts(final
MetaDataContexts old, final MetaDataBasedPersistService persistService) {
+ private static MetaDataContexts renewMetaDataContexts(final
MetaDataContexts old, final MetaDataPersistService persistService) {
Map<String, ShardingSphereTable> tables = new HashMap<>(3, 1F);
tables.put("t_order", new ShardingSphereTable("t_order", Arrays.asList(
new ShardingSphereColumn("order_id", Types.INTEGER, true,
false, false, true, false, false),
