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 37d0a59bf6d Move lock to cluster module (#35059)
37d0a59bf6d is described below
commit 37d0a59bf6d9f9a4fc02b003b3be4fa542bc0a27
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Mar 23 11:02:33 2025 +0800
Move lock to cluster module (#35059)
---
.../pipeline/scenario/migration/preparer/MigrationJobPreparer.java | 2 +-
.../pipeline/scenario/migration/preparer/MigrationPrepareLock.java | 2 +-
.../shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java | 2 +-
.../mode/manager/cluster/lock/GlobalLockPersistService.java | 2 +-
.../mode/manager/cluster}/lock/exception/LockedClusterException.java | 2 +-
.../manager/cluster}/lock/exception/NotLockedClusterException.java | 2 +-
.../shardingsphere/mode/manager/cluster}/lock/global/GlobalLock.java | 2 +-
.../mode/manager/cluster}/lock/global/GlobalLockDefinition.java | 2 +-
.../mode/manager/cluster/statistics/StatisticsLock.java | 2 +-
.../mode/manager/cluster/statistics/StatisticsRefreshEngine.java | 2 +-
.../shardingsphere/mode/lock/global/GlobalLockDefinitionTest.java | 2 ++
.../mode/manager/cluster/lock/ClusterLockContextTest.java | 4 ++--
.../mode/manager/cluster/lock/GlobalLockPersistServiceTest.java | 4 ++--
.../backend/connector/jdbc/transaction/BackendTransactionManager.java | 2 +-
.../backend/connector/jdbc/transaction/TransactionCommitLock.java | 2 +-
.../proxy/backend/handler/distsql/ral/updatable/lock/ClusterLock.java | 2 +-
.../handler/distsql/ral/updatable/lock/LockClusterExecutor.java | 4 ++--
.../handler/distsql/ral/updatable/lock/UnlockClusterExecutor.java | 4 ++--
.../handler/distsql/ral/updatable/lock/LockClusterExecutorTest.java | 2 +-
.../handler/distsql/ral/updatable/lock/UnlockClusterExecutorTest.java | 2 +-
20 files changed, 25 insertions(+), 23 deletions(-)
diff --git
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
index 422ca6dfef8..7363d407bad 100644
---
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
+++
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
@@ -69,7 +69,7 @@ import org.apache.shardingsphere.mode.lock.LockContext;
import org.apache.shardingsphere.mode.lock.LockDefinition;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.parser.SQLParserEngine;
-import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
diff --git
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationPrepareLock.java
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationPrepareLock.java
index 958045d301f..3913776721f 100644
---
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationPrepareLock.java
+++
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationPrepareLock.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.data.pipeline.scenario.migration.preparer;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.lock.global.GlobalLock;
+import org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLock;
/**
* Migration prepare lock.
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
index c35e5c81dd5..35eb228ab18 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.manager.cluster.lock;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.lock.LockContext;
import org.apache.shardingsphere.mode.lock.LockDefinition;
-import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
/**
* Cluster lock context.
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistService.java
index 00a5159d0b5..71dcd746257 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.manager.cluster.lock;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/exception/LockedClusterException.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/exception/LockedClusterException.java
similarity index 94%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/lock/exception/LockedClusterException.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/exception/LockedClusterException.java
index f41cb0ad837..a4a36c0dd64 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/exception/LockedClusterException.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/exception/LockedClusterException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.lock.exception;
+package org.apache.shardingsphere.mode.manager.cluster.lock.exception;
import
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState;
import
org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.LockSQLException;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/exception/NotLockedClusterException.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/exception/NotLockedClusterException.java
similarity index 94%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/lock/exception/NotLockedClusterException.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/exception/NotLockedClusterException.java
index af2186df694..31bbb96cd05 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/exception/NotLockedClusterException.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/exception/NotLockedClusterException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.lock.exception;
+package org.apache.shardingsphere.mode.manager.cluster.lock.exception;
import
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState;
import
org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.LockSQLException;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/global/GlobalLock.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLock.java
similarity index 93%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/lock/global/GlobalLock.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLock.java
index c4c54b55c36..5afa8f5eeb2 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/global/GlobalLock.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLock.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.lock.global;
+package org.apache.shardingsphere.mode.manager.cluster.lock.global;
/**
* Global lock.
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/global/GlobalLockDefinition.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockDefinition.java
similarity index 95%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/lock/global/GlobalLockDefinition.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockDefinition.java
index 2f94856b173..2d8d0acd75a 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/global/GlobalLockDefinition.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockDefinition.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.lock.global;
+package org.apache.shardingsphere.mode.manager.cluster.lock.global;
import org.apache.shardingsphere.mode.lock.LockDefinition;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/statistics/StatisticsLock.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/statistics/StatisticsLock.java
index 5d308235f0c..2d1eaa159d5 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/statistics/StatisticsLock.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/statistics/StatisticsLock.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mode.manager.cluster.statistics;
-import org.apache.shardingsphere.mode.lock.global.GlobalLock;
+import org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLock;
/**
* Statistics lock.
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/statistics/StatisticsRefreshEngine.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/statistics/StatisticsRefreshEngine.java
index 8c953c024c4..66d7fee194d 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/statistics/StatisticsRefreshEngine.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/statistics/StatisticsRefreshEngine.java
@@ -32,7 +32,7 @@ import
org.apache.shardingsphere.infra.metadata.statistics.DatabaseStatistics;
import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import
org.apache.shardingsphere.infra.metadata.statistics.collector.DialectDatabaseStatisticsCollector;
import
org.apache.shardingsphere.infra.metadata.statistics.collector.shardingsphere.ShardingSphereStatisticsCollector;
-import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import org.apache.shardingsphere.mode.manager.ContextManager;
import java.util.Collection;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/lock/global/GlobalLockDefinitionTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/lock/global/GlobalLockDefinitionTest.java
similarity index 89%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/lock/global/GlobalLockDefinitionTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/lock/global/GlobalLockDefinitionTest.java
index ee6bb5b62f6..fb6c6fe13e7 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/lock/global/GlobalLockDefinitionTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/lock/global/GlobalLockDefinitionTest.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.mode.lock.global;
+import org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLock;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContextTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContextTest.java
index 7c8790b640a..f9bc9ee7301 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContextTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContextTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.mode.manager.cluster.lock;
-import org.apache.shardingsphere.mode.lock.global.GlobalLock;
-import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
+import org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLock;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistServiceTest.java
index 31e562a2c3a..734c9151b0e 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistServiceTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.mode.manager.cluster.lock;
-import org.apache.shardingsphere.mode.lock.global.GlobalLock;
-import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
+import org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLock;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
index f69792c63e2..08269795da8 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.mode.lock.LockDefinition;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import
org.apache.shardingsphere.infra.session.connection.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader;
-import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import
org.apache.shardingsphere.proxy.backend.connector.ProxyDatabaseConnectionManager;
import org.apache.shardingsphere.proxy.backend.connector.TransactionManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/TransactionCommitLock.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/TransactionCommitLock.java
index a88aff14f8e..1ccbba5f395 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/TransactionCommitLock.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/TransactionCommitLock.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.connector.jdbc.transaction;
-import org.apache.shardingsphere.mode.lock.global.GlobalLock;
+import org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLock;
/**
* Transaction commit lock.
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/ClusterLock.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/ClusterLock.java
index a75d35773e1..8a578e748f7 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/ClusterLock.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/ClusterLock.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lock;
-import org.apache.shardingsphere.mode.lock.global.GlobalLock;
+import org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLock;
/**
* Cluster lock.
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterExecutor.java
index 804d37cf044..7726a5aff4a 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterExecutor.java
@@ -26,8 +26,8 @@ import
org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQ
import org.apache.shardingsphere.mode.lock.LockContext;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.state.ShardingSphereState;
-import org.apache.shardingsphere.mode.lock.exception.LockedClusterException;
-import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.exception.LockedClusterException;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.lock.spi.ClusterLockStrategy;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutor.java
index 1e4ed2f8214..9f2c69471ea 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutor.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterSt
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.mode.lock.LockContext;
import org.apache.shardingsphere.mode.state.ShardingSphereState;
-import org.apache.shardingsphere.mode.lock.exception.NotLockedClusterException;
-import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.exception.NotLockedClusterException;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import org.apache.shardingsphere.mode.manager.ContextManager;
/**
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterExecutorTest.java
index ff2942ac257..787b5200781 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterExecutorTest.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import
org.apache.shardingsphere.distsql.statement.ral.updatable.LockClusterStatement;
import
org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException;
import org.apache.shardingsphere.mode.state.ShardingSphereState;
-import org.apache.shardingsphere.mode.lock.exception.LockedClusterException;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.exception.LockedClusterException;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutorTest.java
index cb3510ffea5..9f39f4872fe 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutorTest.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lo
import
org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement;
import org.apache.shardingsphere.mode.state.ShardingSphereState;
-import org.apache.shardingsphere.mode.lock.exception.NotLockedClusterException;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.exception.NotLockedClusterException;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
