This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 361a4c839c3 Remove dataSourceStates from StateContext (#31590)
361a4c839c3 is described below
commit 361a4c839c3dc73bbc65a7fe5555ffe3b659aa6a
Author: Haoran Meng <[email protected]>
AuthorDate: Wed Jun 5 15:09:49 2024 +0800
Remove dataSourceStates from StateContext (#31590)
---
.../PrometheusPluginLifecycleServiceTest.java | 2 +-
.../mode/manager/ContextManager.java | 5 +-
.../shardingsphere/mode/state/StateContext.java | 79 +---------------------
.../mode/manager/ContextManagerTest.java | 2 +-
.../mode/state/StateContextTest.java | 6 +-
.../cluster/ClusterContextManagerBuilder.java | 2 +-
.../StandaloneContextManagerBuilder.java | 2 +-
.../ProxyDatabaseConnectionManagerTest.java | 2 +-
.../backend/connector/ProxySQLExecutorTest.java | 2 +-
.../proxy/backend/context/ProxyContextTest.java | 2 +-
.../DatabaseAdminQueryBackendHandlerTest.java | 3 +-
.../ral/QueryableRALBackendHandlerTest.java | 2 +-
.../ral/updatable/SetDistVariableExecutorTest.java | 2 +-
.../FrontDatabaseProtocolTypeFactoryTest.java | 2 +-
.../frontend/state/impl/OKProxyStateTest.java | 2 +-
.../PostgreSQLCommandExecuteEngineTest.java | 2 +-
.../pipeline/core/util/PipelineContextUtils.java | 2 +-
17 files changed, 18 insertions(+), 101 deletions(-)
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginLifecycleServiceTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginLifecycleServiceTest.java
index a836f3380d5..be934e12108 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginLifecycleServiceTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginLifecycleServiceTest.java
@@ -74,6 +74,6 @@ class PrometheusPluginLifecycleServiceTest {
ComputeNodeInstanceContext computeNodeInstanceContext = new
ComputeNodeInstanceContext(
new ComputeNodeInstance(mock(InstanceMetaData.class)), new
StandaloneWorkerIdGenerator(), new ModeConfiguration("Standalone", null),
mock(LockContext.class), new EventBusContext());
- return new ContextManager(metaDataContexts,
computeNodeInstanceContext, mock(PersistRepository.class), false);
+ return new ContextManager(metaDataContexts,
computeNodeInstanceContext, mock(PersistRepository.class));
}
}
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 55b3af67c21..a94dc9c2703 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
@@ -76,13 +76,12 @@ public final class ContextManager implements AutoCloseable {
private final PersistRepository repository;
- public ContextManager(final MetaDataContexts metaDataContexts, final
ComputeNodeInstanceContext computeNodeInstanceContext, final PersistRepository
repository, final boolean force) {
+ public ContextManager(final MetaDataContexts metaDataContexts, final
ComputeNodeInstanceContext computeNodeInstanceContext, final PersistRepository
repository) {
this.metaDataContexts = new AtomicReference<>(metaDataContexts);
this.computeNodeInstanceContext = computeNodeInstanceContext;
this.repository = repository;
persistServiceFacade = new PersistServiceFacade(repository,
computeNodeInstanceContext.getModeConfiguration(), this);
- stateContext = new
StateContext(this.metaDataContexts.get().getMetaData(),
persistServiceFacade.getStatePersistService().loadClusterState().orElse(ClusterState.OK),
-
persistServiceFacade.getQualifiedDataSourceStatePersistService().loadStates(),
force);
+ stateContext = new
StateContext(persistServiceFacade.getStatePersistService().loadClusterState().orElse(ClusterState.OK));
metaDataContextManager = new
MetaDataContextManager(this.metaDataContexts, computeNodeInstanceContext,
persistServiceFacade);
executorEngine =
ExecutorEngine.createExecutorEngineWithSize(metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java
index 529da550e5e..acda34f99da 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java
@@ -17,25 +17,9 @@
package org.apache.shardingsphere.mode.state;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
-import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
import org.apache.shardingsphere.infra.state.cluster.ClusterState;
-import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
-import
org.apache.shardingsphere.infra.state.datasource.exception.UnavailableDataSourceException;
-import org.apache.shardingsphere.mode.storage.QualifiedDataSourceState;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
/**
@@ -46,61 +30,10 @@ public final class StateContext {
private final AtomicReference<ClusterState> clusterState = new
AtomicReference<>(ClusterState.OK);
- private final Map<String, DataSourceState> dataSourceStates = new
ConcurrentHashMap<>();
-
- public StateContext(final ShardingSphereMetaData metaData, final
ClusterState repositoryClusterState,
- final Map<String, QualifiedDataSourceState>
qualifiedDataSourceStates, final boolean force) {
+ public StateContext(final ClusterState repositoryClusterState) {
if (clusterState.get() != repositoryClusterState) {
switchClusterState(repositoryClusterState);
}
- initDataSourceState(metaData, convert(qualifiedDataSourceStates),
force);
- }
-
- private void initDataSourceState(final ShardingSphereMetaData metaData,
final Map<String, DataSourceState> storageDataSourceStates, final boolean
force) {
- metaData.getDatabases().forEach((key, value) -> {
- if (value.getResourceMetaData() != null &&
!value.getResourceMetaData().getStorageUnits().isEmpty()) {
- initDataSourceState(key,
value.getResourceMetaData().getStorageUnits(), storageDataSourceStates, force);
- }
- });
- }
-
- private void initDataSourceState(final String databaseName, final
Map<String, StorageUnit> storageUnits, final Map<String, DataSourceState>
storageDataSourceStates, final boolean force) {
- storageUnits.forEach((key, value) -> initDataSourceState(databaseName,
storageDataSourceStates, key, value.getDataSource(), force));
- }
-
- private void initDataSourceState(final String databaseName, final
Map<String, DataSourceState> storageDataSourceStates, final String
actualDataSourceName, final DataSource dataSource,
- final boolean force) {
- DataSourceState storageState =
storageDataSourceStates.get(getCacheKey(databaseName, actualDataSourceName));
- if (DataSourceState.DISABLED == storageState) {
- dataSourceStates.put(getCacheKey(databaseName,
actualDataSourceName), storageState);
- } else {
- checkState(databaseName, actualDataSourceName, dataSource, force);
- }
- }
-
- private Map<String, DataSourceState> convert(final Map<String,
QualifiedDataSourceState> qualifiedDataSourceStates) {
- Map<String, DataSourceState> result = new
HashMap<>(qualifiedDataSourceStates.size(), 1F);
- qualifiedDataSourceStates.forEach((key, value) -> {
- List<String> values = Splitter.on(".").splitToList(key);
- Preconditions.checkArgument(3 == values.size(), "Illegal data
source of storage node.");
- String databaseName = values.get(0);
- String dataSourceName = values.get(2);
- result.put(databaseName + "." + dataSourceName,
DataSourceState.valueOf(value.getStatus().name()));
- });
- return result;
- }
-
- private void checkState(final String databaseName, final String
actualDataSourceName, final DataSource dataSource, final boolean force) {
- try (Connection ignored = dataSource.getConnection()) {
- dataSourceStates.put(getCacheKey(databaseName,
actualDataSourceName), DataSourceState.ENABLED);
- } catch (final SQLException ex) {
- ShardingSpherePreconditions.checkState(force, () -> new
UnavailableDataSourceException(actualDataSourceName, ex));
- log.error("Data source unavailable, ignored with the -f
parameter.", ex);
- }
- }
-
- private String getCacheKey(final String databaseName, final String
dataSourceName) {
- return databaseName + "." + dataSourceName;
}
/**
@@ -120,14 +53,4 @@ public final class StateContext {
public void switchClusterState(final ClusterState state) {
clusterState.set(state);
}
-
- /**
- * Update data source state.
- *
- * @param qualifiedDataSource qualified data source
- * @param dataSourceState data source state
- */
- public void updateDataSourceState(final QualifiedDataSource
qualifiedDataSource, final DataSourceState dataSourceState) {
-
dataSourceStates.put(getCacheKey(qualifiedDataSource.getDatabaseName(),
qualifiedDataSource.getDataSourceName()), dataSourceState);
- }
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index b6803aa5d65..d689b9de3bb 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -89,7 +89,7 @@ class ContextManagerTest {
when(metaDataContexts.getMetaData().getDatabases().values()).thenReturn(Collections.singleton(database));
ComputeNodeInstanceContext computeNodeInstanceContext =
mock(ComputeNodeInstanceContext.class);
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
- contextManager = new ContextManager(metaDataContexts,
computeNodeInstanceContext, mock(PersistRepository.class), false);
+ contextManager = new ContextManager(metaDataContexts,
computeNodeInstanceContext, mock(PersistRepository.class));
}
private ShardingSphereDatabase mockDatabase() {
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StateContextTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StateContextTest.java
index a10efe747da..805889735a8 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StateContextTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StateContextTest.java
@@ -17,19 +17,15 @@
package org.apache.shardingsphere.mode.state;
-import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.state.cluster.ClusterState;
import org.junit.jupiter.api.Test;
-import java.util.HashMap;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
class StateContextTest {
- private final StateContext stateContext = new
StateContext(mock(ShardingSphereMetaData.class), ClusterState.OK, new
HashMap<>(), false);
+ private final StateContext stateContext = new
StateContext(ClusterState.OK);
@Test
void assertGetCurrentClusterState() {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index e8b714464b8..5ce99e6dd3a 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -60,7 +60,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
MetaDataPersistService metaDataPersistService = new
MetaDataPersistService(repository);
MetaDataContexts metaDataContexts =
MetaDataContextsFactory.create(metaDataPersistService, param,
computeNodeInstanceContext,
new
QualifiedDataSourceStatePersistService(repository).loadStates());
- ContextManager result = new ContextManager(metaDataContexts,
computeNodeInstanceContext, repository, param.isForce());
+ ContextManager result = new ContextManager(metaDataContexts,
computeNodeInstanceContext, repository);
createSubscribers(eventBusContext, repository);
registerOnline(eventBusContext, computeNodeInstanceContext,
repository, param, result);
return result;
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index 627bd808294..5c2b3da39b0 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -49,7 +49,7 @@ public final class StandaloneContextManagerBuilder implements
ContextManagerBuil
MetaDataPersistService persistService = new
MetaDataPersistService(repository);
ComputeNodeInstanceContext computeNodeInstanceContext =
buildComputeNodeInstanceContext(param, eventBusContext);
MetaDataContexts metaDataContexts =
MetaDataContextsFactory.create(persistService, param,
computeNodeInstanceContext);
- ContextManager result = new ContextManager(metaDataContexts,
computeNodeInstanceContext, repository, param.isForce());
+ ContextManager result = new ContextManager(metaDataContexts,
computeNodeInstanceContext, repository);
new StandaloneEventSubscriberRegistry(result).register();
return result;
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
index 9843da08bc7..18d70ce4b95 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
@@ -127,7 +127,7 @@ class ProxyDatabaseConnectionManagerTest {
when(metaData.getGlobalRuleMetaData()).thenReturn(new
RuleMetaData(Collections.singletonList(transactionRule)));
ComputeNodeInstanceContext computeNodeInstanceContext =
mock(ComputeNodeInstanceContext.class);
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
- return new
ContextManager(MetaDataContextsFactory.create(mock(MetaDataPersistService.class),
metaData), computeNodeInstanceContext, mock(PersistRepository.class), false);
+ return new
ContextManager(MetaDataContextsFactory.create(mock(MetaDataPersistService.class),
metaData), computeNodeInstanceContext, mock(PersistRepository.class));
}
@AfterEach
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
index 6034968f676..10acbe6fba4 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
@@ -113,7 +113,7 @@ class ProxySQLExecutorTest {
ComputeNodeInstanceContext computeNodeInstanceContext =
mock(ComputeNodeInstanceContext.class);
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
ContextManager contextManager = new
ContextManager(MetaDataContextsFactory.create(mock(MetaDataPersistService.class),
metaData), computeNodeInstanceContext,
- mock(PersistRepository.class), false);
+ mock(PersistRepository.class));
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
index 82a693b8af8..12a60013ef1 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
@@ -70,7 +70,7 @@ class ProxyContextTest {
@Test
void assertInit() {
MetaDataContexts metaDataContexts =
MetaDataContextsFactory.create(mock(MetaDataPersistService.class), new
ShardingSphereMetaData());
- ProxyContext.init(new ContextManager(metaDataContexts,
mock(ComputeNodeInstanceContext.class, RETURNS_DEEP_STUBS),
mock(PersistRepository.class), false));
+ ProxyContext.init(new ContextManager(metaDataContexts,
mock(ComputeNodeInstanceContext.class, RETURNS_DEEP_STUBS),
mock(PersistRepository.class)));
assertThat(ProxyContext.getInstance().getContextManager().getStateContext(),
is(ProxyContext.getInstance().getContextManager().getStateContext()));
assertThat(ProxyContext.getInstance().getContextManager().getStateContext().getClusterState(),
is(ClusterState.OK));
assertThat(ProxyContext.getInstance().getContextManager().getMetaDataContexts(),
is(ProxyContext.getInstance().getContextManager().getMetaDataContexts()));
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
index 6bf2b32e076..a2743076f67 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java
@@ -112,13 +112,12 @@ class DatabaseAdminQueryBackendHandlerTest {
private ContextManager mockContextManager() {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
-
when(database.getResourceMetaData()).thenReturn(mock(ResourceMetaData.class));
when(database.getProtocolType()).thenReturn(databaseType);
when(ProxyContext.getInstance().getContextManager().getDatabase("foo_db")).thenReturn(database);
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singletonMap("foo_db", database),
mock(ResourceMetaData.class),
mock(RuleMetaData.class), new ConfigurationProperties(new
Properties()));
ComputeNodeInstanceContext computeNodeInstanceContext =
mock(ComputeNodeInstanceContext.class);
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
- return new
ContextManager(MetaDataContextsFactory.create(mock(MetaDataPersistService.class),
metaData), computeNodeInstanceContext, mock(PersistRepository.class), false);
+ return new
ContextManager(MetaDataContextsFactory.create(mock(MetaDataPersistService.class),
metaData), computeNodeInstanceContext, mock(PersistRepository.class));
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java
index 3a79734a741..b889c72c713 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java
@@ -76,7 +76,7 @@ class QueryableRALBackendHandlerTest {
when(connectionSession.getDatabaseName()).thenReturn("unknown");
ComputeNodeInstanceContext computeNodeInstanceContext =
mock(ComputeNodeInstanceContext.class);
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
- ContextManager contextManager = new ContextManager(metaDataContexts,
computeNodeInstanceContext, mock(PersistRepository.class), false);
+ ContextManager contextManager = new ContextManager(metaDataContexts,
computeNodeInstanceContext, mock(PersistRepository.class));
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
assertThrows(UnknownDatabaseException.class, () -> new
DistSQLQueryBackendHandler(mock(ExportDatabaseConfigurationStatement.class),
connectionSession).execute());
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
index 256ddc0fd79..37c543c9cd6 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
@@ -111,7 +111,7 @@ class SetDistVariableExecutorTest {
ContextManager result = new
ContextManager(MetaDataContextsFactory.create(metaDataPersistService, new
ShardingSphereMetaData()),
new ComputeNodeInstanceContext(new
ComputeNodeInstance(mock(InstanceMetaData.class)),
mock(WorkerIdGenerator.class),
new ModeConfiguration("Standalone", null),
mock(LockContext.class), new EventBusContext()),
- mock(PersistRepository.class), false);
+ mock(PersistRepository.class));
return result;
}
}
diff --git
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
index f2e43d6e39a..dda70c3a228 100644
---
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
+++
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
@@ -101,6 +101,6 @@ class FrontDatabaseProtocolTypeFactoryTest {
new ShardingSphereMetaData(databases,
mock(ResourceMetaData.class), mock(RuleMetaData.class), new
ConfigurationProperties(props)));
ComputeNodeInstanceContext computeNodeInstanceContext =
mock(ComputeNodeInstanceContext.class);
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
- return new ContextManager(metaDataContexts,
computeNodeInstanceContext, mock(PersistRepository.class), false);
+ return new ContextManager(metaDataContexts,
computeNodeInstanceContext, mock(PersistRepository.class));
}
}
diff --git
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/OKProxyStateTest.java
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/OKProxyStateTest.java
index 59a607b19bd..81f6da4a516 100644
---
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/OKProxyStateTest.java
+++
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/OKProxyStateTest.java
@@ -97,7 +97,7 @@ class OKProxyStateTest {
when(metaData.getGlobalRuleMetaData()).thenReturn(new
RuleMetaData(Collections.singletonList(transactionRule)));
ComputeNodeInstanceContext computeNodeInstanceContext =
mock(ComputeNodeInstanceContext.class);
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
- return new
ContextManager(MetaDataContextsFactory.create(mock(MetaDataPersistService.class),
metaData), computeNodeInstanceContext, mock(PersistRepository.class), false);
+ return new
ContextManager(MetaDataContextsFactory.create(mock(MetaDataPersistService.class),
metaData), computeNodeInstanceContext, mock(PersistRepository.class));
}
@SuppressWarnings({"unchecked", "SameParameterValue"})
diff --git
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java
index d00bed566e6..0d7481105e7 100644
---
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java
+++
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java
@@ -124,7 +124,7 @@ class PostgreSQLCommandExecuteEngineTest {
ComputeNodeInstanceContext computeNodeInstanceContext =
mock(ComputeNodeInstanceContext.class);
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
ContextManager contextManager = new
ContextManager(MetaDataContextsFactory.create(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData()), computeNodeInstanceContext,
mock(PersistRepository.class), false);
+ new ShardingSphereMetaData()), computeNodeInstanceContext,
mock(PersistRepository.class));
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
commandExecuteEngine.writeQueryData(channelHandlerContext,
databaseConnectionManager, queryCommandExecutor, 0);
verify(resourceLock).doAwait(channelHandlerContext);
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 99b8710e1b4..1e34ddcce44 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
@@ -111,7 +111,7 @@ public final class PipelineContextUtils {
ClusterPersistRepository persistRepository =
getClusterPersistRepository((ClusterPersistRepositoryConfiguration)
modeConfig.getRepository());
MetaDataContexts metaDataContexts =
renewMetaDataContexts(contextManager.getMetaDataContexts(), new
MetaDataPersistService(persistRepository));
PipelineContext pipelineContext = new PipelineContext(modeConfig, new
ContextManager(metaDataContexts, contextManager.getComputeNodeInstanceContext(),
- contextManager.getRepository(), false));
+ contextManager.getRepository()));
PipelineContextManager.putContext(contextKey, pipelineContext);
}
