[shardingsphere] branch master updated: Pipeline IT compatible with New_Cluster mode (#26639)

[zhaojinchao]

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao 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 c4a4945b80c Pipeline IT compatible with New_Cluster mode (#26639)
c4a4945b80c is described below

commit c4a4945b80c6eafae38aa925d78572a397ee4662
Author: Hongsheng Zhong <zhonghongsh...@apache.org>
AuthorDate: Tue Jun 27 21:49:16 2023 +0800

    Pipeline IT compatible with New_Cluster mode (#26639)
---
 .../test/it/data/pipeline/core/util/PipelineContextUtils.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 88ececde0e8..ecf69186cc1 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
@@ -44,7 +44,9 @@ import 
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
 import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
 import 
org.apache.shardingsphere.infra.yaml.config.swapper.mode.YamlModeConfigurationSwapper;
+import org.apache.shardingsphere.metadata.persist.MetaDataBasedPersistService;
 import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
+import org.apache.shardingsphere.metadata.persist.NewMetaDataPersistService;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
 import 
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
@@ -86,7 +88,8 @@ public final class PipelineContextUtils {
         ModeConfiguration modeConfig = new 
YamlModeConfigurationSwapper().swapToObject(rootConfig.getMode());
         ShardingSphereDataSource dataSource = (ShardingSphereDataSource) 
PipelineDataSourceFactory.newInstance(pipelineDataSourceConfig).getDataSource();
         ContextManager contextManager = getContextManager(dataSource);
-        MetaDataPersistService persistService = new 
MetaDataPersistService(getClusterPersistRepository((ClusterPersistRepositoryConfiguration)
 modeConfig.getRepository()));
+        ClusterPersistRepository persistRepository = 
getClusterPersistRepository((ClusterPersistRepositoryConfiguration) 
modeConfig.getRepository());
+        MetaDataBasedPersistService persistService = 
"New_Cluster".equals(modeConfig.getType()) ? new 
NewMetaDataPersistService(persistRepository) : new 
MetaDataPersistService(persistRepository);
         MetaDataContexts metaDataContexts = 
renewMetaDataContexts(contextManager.getMetaDataContexts(), persistService);
         PipelineContext pipelineContext = new PipelineContext(modeConfig, new 
ContextManager(metaDataContexts, contextManager.getInstanceContext()));
         PipelineContextManager.putContext(contextKey, pipelineContext);
@@ -103,7 +106,7 @@ public final class PipelineContextUtils {
         return result;
     }
     
-    private static MetaDataContexts renewMetaDataContexts(final 
MetaDataContexts old, final MetaDataPersistService persistService) {
+    private static MetaDataContexts renewMetaDataContexts(final 
MetaDataContexts old, final MetaDataBasedPersistService 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),