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 1f2b3e1f335 Rename PipelineContextUtils.initPipelineContextManager()
(#36288)
1f2b3e1f335 is described below
commit 1f2b3e1f335ac8d9a119717097086c9f9e70d33b
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Aug 13 20:26:45 2025 +0800
Rename PipelineContextUtils.initPipelineContextManager() (#36288)
* Rename PipelineContextUtils.initPipelineContextManager()
* Rename PipelineContextUtils.initPipelineContextManager()
---
.../core/datasource/PipelineDataSourceManagerTest.java | 2 +-
.../PipelineProcessConfigurationPersistServiceTest.java | 4 ++--
.../inventory/splitter/InventoryTaskSplitterTest.java | 8 ++++----
.../repository/PipelineGovernanceFacadeTest.java | 2 +-
.../data/pipeline/core/task/IncrementalTaskTest.java | 2 +-
.../data/pipeline/core/task/InventoryTaskTest.java | 4 ++--
.../pipeline/core/util/PipelineDistributedBarrierTest.java | 2 +-
.../ConsistencyCheckJobExecutorCallbackTest.java | 2 +-
.../consistencycheck/api/ConsistencyCheckJobAPITest.java | 2 +-
.../scenario/migration/api/MigrationJobAPITest.java | 2 +-
.../consistency/MigrationDataConsistencyCheckerTest.java | 2 +-
.../it/data/pipeline/core/util/PipelineContextUtils.java | 13 +++++++------
12 files changed, 23 insertions(+), 22 deletions(-)
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/datasource/PipelineDataSourceManagerTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/datasource/PipelineDataSourceManagerTest.java
index a00ccdbac04..7823070d914 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/datasource/PipelineDataSourceManagerTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/datasource/PipelineDataSourceManagerTest.java
@@ -41,7 +41,7 @@ class PipelineDataSourceManagerTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
}
@BeforeEach
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/PipelineProcessConfigurationPersistServiceTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/PipelineProcessConfigurationPersistServiceTest.java
index 68cfd1eccd4..3a19079d14f 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/PipelineProcessConfigurationPersistServiceTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/PipelineProcessConfigurationPersistServiceTest.java
@@ -22,8 +22,8 @@ import
org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.con
import
org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.config.YamlPipelineReadConfiguration;
import
org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.config.YamlPipelineWriteConfiguration;
import
org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.swapper.YamlPipelineProcessConfigurationSwapper;
-import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.algorithm.core.yaml.YamlAlgorithmConfiguration;
+import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -35,7 +35,7 @@ class PipelineProcessConfigurationPersistServiceTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
}
@Test
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/inventory/splitter/InventoryTaskSplitterTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/inventory/splitter/InventoryTaskSplitterTest.java
index 9322602642c..36def006535 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/inventory/splitter/InventoryTaskSplitterTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/inventory/splitter/InventoryTaskSplitterTest.java
@@ -17,14 +17,14 @@
package
org.apache.shardingsphere.data.pipeline.core.preparer.inventory.splitter;
+import
org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSource;
+import
org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager;
import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.DumperCommonContext;
import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.InventoryDumperContext;
-import
org.apache.shardingsphere.data.pipeline.core.metadata.model.PipelineColumnMetaData;
-import
org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager;
-import
org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSource;
import
org.apache.shardingsphere.data.pipeline.core.ingest.position.type.pk.type.IntegerPrimaryKeyIngestPosition;
import
org.apache.shardingsphere.data.pipeline.core.metadata.loader.PipelineTableMetaDataUtils;
import
org.apache.shardingsphere.data.pipeline.core.metadata.loader.StandardPipelineTableMetaDataLoader;
+import
org.apache.shardingsphere.data.pipeline.core.metadata.model.PipelineColumnMetaData;
import org.apache.shardingsphere.data.pipeline.core.task.InventoryTask;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.context.MigrationJobItemContext;
@@ -59,7 +59,7 @@ class InventoryTaskSplitterTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
}
@BeforeEach
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
index 1321c8fb9be..cda2d95198f 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
@@ -70,7 +70,7 @@ class PipelineGovernanceFacadeTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
governanceFacade =
PipelineAPIFactory.getPipelineGovernanceFacade(PipelineContextUtils.getContextKey());
watch();
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/task/IncrementalTaskTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/task/IncrementalTaskTest.java
index ed009051c2b..d9eba5e8b6f 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/task/IncrementalTaskTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/task/IncrementalTaskTest.java
@@ -46,7 +46,7 @@ class IncrementalTaskTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
}
@BeforeEach
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/task/InventoryTaskTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/task/InventoryTaskTest.java
index 12e9afa625e..8d19a4611c6 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/task/InventoryTaskTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/task/InventoryTaskTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.data.pipeline.core.task;
-import
org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager;
import
org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSource;
+import
org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager;
import org.apache.shardingsphere.data.pipeline.core.importer.Importer;
import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper;
import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.incremental.IncrementalDumperContext;
@@ -56,7 +56,7 @@ class InventoryTaskTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
}
@AfterAll
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineDistributedBarrierTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineDistributedBarrierTest.java
index e70af7f4bc2..c5f3523ec86 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineDistributedBarrierTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineDistributedBarrierTest.java
@@ -38,7 +38,7 @@ class PipelineDistributedBarrierTest {
@BeforeAll
static void setUp() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
}
@Test
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobExecutorCallbackTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobExecutorCallbackTest.java
index 10cc2a72d4f..d34d41400ae 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobExecutorCallbackTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobExecutorCallbackTest.java
@@ -46,7 +46,7 @@ class ConsistencyCheckJobExecutorCallbackTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
}
@Test
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/api/ConsistencyCheckJobAPITest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/api/ConsistencyCheckJobAPITest.java
index c8a180d3f36..69a20299537 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/api/ConsistencyCheckJobAPITest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/api/ConsistencyCheckJobAPITest.java
@@ -60,7 +60,7 @@ class ConsistencyCheckJobAPITest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
}
@Test
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPITest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPITest.java
index 641b504d899..c81c1fa8774 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPITest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPITest.java
@@ -110,7 +110,7 @@ class MigrationJobAPITest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
jobType = new MigrationJobType();
jobAPI = (MigrationJobAPI)
TypedSPILoader.getService(TransmissionJobAPI.class, "MIGRATION");
jobConfigManager = new PipelineJobConfigurationManager(jobType);
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
index 7044c4f81fe..22e05eb57cf 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
@@ -53,7 +53,7 @@ class MigrationDataConsistencyCheckerTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtils.mockModeConfigAndContextManager();
+ PipelineContextUtils.initPipelineContextManager();
}
@Test
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 0561fe0b441..d762ee4c9d2 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
@@ -98,9 +98,9 @@ public final class PipelineContextUtils {
private static final PipelineExecuteEngine EXECUTE_ENGINE =
PipelineExecuteEngine.newCachedThreadInstance(PipelineContextUtils.class.getSimpleName());
/**
- * Mock mode configuration and context manager.
+ * Init pipeline context manager.
*/
- public static void mockModeConfigAndContextManager() {
+ public static void initPipelineContextManager() {
EmbedTestingServer.start();
PipelineContextKey contextKey = getContextKey();
if (null != PipelineContextManager.getContext(contextKey)) {
@@ -109,12 +109,13 @@ public final class PipelineContextUtils {
ShardingSpherePipelineDataSourceConfiguration pipelineDataSourceConfig
= new ShardingSpherePipelineDataSourceConfiguration(
SystemResourceFileUtils.readFile("config_sharding_sphere_jdbc_source.yaml"));
YamlRootConfiguration rootConfig = (YamlRootConfiguration)
pipelineDataSourceConfig.getDataSourceConfiguration();
- ModeConfiguration modeConfig = new
YamlModeConfigurationSwapper().swapToObject(rootConfig.getMode());
ContextManager contextManager = getContextManager(rootConfig);
- ClusterPersistRepository persistRepository =
getClusterPersistRepository((ClusterPersistRepositoryConfiguration)
modeConfig.getRepository());
+ ClusterPersistRepository persistRepository =
getClusterPersistRepository(
+ (ClusterPersistRepositoryConfiguration)
contextManager.getComputeNodeInstanceContext().getModeConfiguration().getRepository());
MetaDataContexts metaDataContexts =
renewMetaDataContexts(contextManager.getMetaDataContexts(), new
MetaDataPersistFacade(persistRepository, true));
- PipelineContext pipelineContext = new PipelineContext(modeConfig, new
ContextManager(metaDataContexts, contextManager.getComputeNodeInstanceContext(),
- contextManager.getLockContext(),
contextManager.getPersistServiceFacade().getRepository()));
+ PipelineContext pipelineContext = new
PipelineContext(contextManager.getComputeNodeInstanceContext().getModeConfiguration(),
+ new ContextManager(metaDataContexts,
contextManager.getComputeNodeInstanceContext(),
+ contextManager.getLockContext(),
contextManager.getPersistServiceFacade().getRepository()));
PipelineContextManager.putContext(contextKey, pipelineContext);
}
