[shardingsphere] branch master updated: Rename schema lock to database lock (#17011)

[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 34a49209fe3 Rename schema lock to database lock (#17011)
34a49209fe3 is described below

commit 34a49209fe3302e449953d82c8552a351b744009
Author: gin <jacky7...@163.com>
AuthorDate: Fri Apr 22 19:14:10 2022 +0800

    Rename schema lock to database lock (#17011)
---
 .../db/protocol/error/CommonErrorCode.java         |  2 +-
 .../shardingsphere/infra/lock/LockContext.java     | 24 ++++----
 .../core/api/impl/RuleAlteredJobAPIImpl.java       |  6 +-
 .../rulealtered/RuleAlteredJobPreparer.java        |  2 +-
 .../scenario/rulealtered/RuleAlteredJobWorker.java |  2 +-
 .../coordinator/lock/DistributeLockContext.java    | 56 +++++++++----------
 .../lock/ShardingSphereDistributeGlobalLock.java   | 10 ++--
 .../lock/event/AckLockReleasedEvent.java           |  8 +--
 .../coordinator/lock/event/AckLockedEvent.java     |  8 +--
 ...edEvent.java => DatabaseLockReleasedEvent.java} |  4 +-
 ...maLockedEvent.java => DatabaseLockedEvent.java} |  4 +-
 .../cluster/coordinator/lock/service/LockNode.java | 64 +++++++++++-----------
 .../lock/service/LockRegistryService.java          |  8 +--
 .../coordinator/lock/util/LockNodeUtil.java        | 16 +++---
 .../lock/watcher/GlobalAckChangedWatcher.java      |  4 +-
 .../lock/watcher/GlobalLocksChangedWatcher.java    | 12 ++--
 .../lock/DistributeLockContextTest.java            | 36 ++++++------
 .../coordinator/lock/service/LockNodeTest.java     | 40 +++++++-------
 .../lock/service/LockRegistryServiceTest.java      | 28 +++++-----
 .../coordinator/lock/util/LockNodeUtilTest.java    |  6 +-
 .../lock/watcher/GlobalAckChangedWatcherTest.java  |  8 +--
 .../watcher/GlobalLocksChangedWatcherTest.java     | 16 +++---
 .../registry/workerid/node/WorkerIdNodeTest.java   |  2 +-
 .../manager/memory/lock/MemoryLockContext.java     | 24 ++++----
 .../standalone/lock/StandaloneLockContext.java     | 24 ++++----
 .../communication/DatabaseCommunicationEngine.java | 12 ++--
 .../jdbc/JDBCDatabaseCommunicationEngine.java      |  2 +-
 .../vertx/VertxDatabaseCommunicationEngine.java    |  2 +-
 ...Exception.java => DatabaseLockedException.java} |  6 +-
 .../text/distsql/DistSQLBackendHandlerFactory.java |  6 +-
 .../frontend/mysql/err/MySQLErrPacketFactory.java  |  8 +--
 31 files changed, 225 insertions(+), 225 deletions(-)

diff --git 
a/shardingsphere-db-protocol/shardingsphere-db-protocol-core/src/main/java/org/apache/shardingsphere/db/protocol/error/CommonErrorCode.java
 
b/shardingsphere-db-protocol/shardingsphere-db-protocol-core/src/main/java/org/apache/shardingsphere/db/protocol/error/CommonErrorCode.java
index f7a145d62c1..3c52d16586b 100644
--- 
a/shardingsphere-db-protocol/shardingsphere-db-protocol-core/src/main/java/org/apache/shardingsphere/db/protocol/error/CommonErrorCode.java
+++ 
b/shardingsphere-db-protocol/shardingsphere-db-protocol-core/src/main/java/org/apache/shardingsphere/db/protocol/error/CommonErrorCode.java
@@ -33,7 +33,7 @@ public enum CommonErrorCode implements SQLErrorCode {
     
     SCALING_OPERATE_FAILED(1209, "C1209", "Scaling Operate Failed: [%s]"),
     
-    SCHEMA_WRITE_LOCKED(1300, "C1300", "The schema %s is read-only"),
+    DATABASE_WRITE_LOCKED(1300, "C1300", "The database %s is read-only"),
     
     TABLE_LOCK_WAIT_TIMEOUT(1301, "C1301", "The table %s of schema %s lock 
wait timeout of %s ms exceeded"),
     
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
index 5e6c9ed44c8..8a91d87a7b5 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
@@ -32,26 +32,26 @@ public interface LockContext {
     void initLockState(InstanceContext instanceContext);
     
     /**
-     * Get or create schema lock.
+     * Get or create database lock.
      *
-     * @param schemaName schema name
-     * @return schema lock
+     * @param databaseName database name
+     * @return database lock
      */
-    ShardingSphereLock getOrCreateSchemaLock(String schemaName);
+    ShardingSphereLock getOrCreateDatabaseLock(String databaseName);
     
     /**
-     * Get schema lock.
+     * Get database lock.
      *
-     * @param schemaName schema name
-     * @return schema lock
+     * @param databaseName database name
+     * @return database name
      */
-    ShardingSphereLock getSchemaLock(String schemaName);
+    ShardingSphereLock getDatabaseLock(String databaseName);
     
     /**
-     *  Is locked schema.
+     *  Is locked database.
      *
-     * @param schemaName schema name
-     * @return is locked schema or not
+     * @param databaseName database name
+     * @return is locked database or not
      */
-    boolean isLockedSchema(String schemaName);
+    boolean isLockedDatabase(String databaseName);
 }
diff --git 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
index bb4de577c56..3f9f2edd905 100644
--- 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
+++ 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
@@ -165,7 +165,7 @@ public final class RuleAlteredJobAPIImpl extends 
AbstractPipelineJobAPIImpl impl
     private void verifySourceWritingStopped(final JobConfiguration jobConfig) {
         LockContext lockContext = 
PipelineContext.getContextManager().getInstanceContext().getLockContext();
         String schemaName = jobConfig.getWorkflowConfig().getSchemaName();
-        ShardingSphereLock lock = lockContext.getSchemaLock(schemaName);
+        ShardingSphereLock lock = lockContext.getDatabaseLock(schemaName);
         if (null == lock || !lock.isLocked(schemaName)) {
             throw new PipelineVerifyFailedException("Source writing is not 
stopped. You could run `STOP SCALING SOURCE WRITING {jobId}` to stop it.");
         }
@@ -187,7 +187,7 @@ public final class RuleAlteredJobAPIImpl extends 
AbstractPipelineJobAPIImpl impl
     @Override
     public void stopClusterWriteDB(final String schemaName, final String 
jobId) {
         LockContext lockContext = 
PipelineContext.getContextManager().getInstanceContext().getLockContext();
-        ShardingSphereLock lock = 
lockContext.getOrCreateSchemaLock(schemaName);
+        ShardingSphereLock lock = 
lockContext.getOrCreateDatabaseLock(schemaName);
         if (lock.isLocked(schemaName)) {
             log.info("stopClusterWriteDB, already stopped");
             return;
@@ -213,7 +213,7 @@ public final class RuleAlteredJobAPIImpl extends 
AbstractPipelineJobAPIImpl impl
     @Override
     public void restoreClusterWriteDB(final String schemaName, final String 
jobId) {
         LockContext lockContext = 
PipelineContext.getContextManager().getInstanceContext().getLockContext();
-        ShardingSphereLock lock = lockContext.getSchemaLock(schemaName);
+        ShardingSphereLock lock = lockContext.getDatabaseLock(schemaName);
         if (null == lock) {
             log.info("restoreClusterWriteDB, lock is null");
             return;
diff --git 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
index d7bd8db64a4..dd27e45b393 100644
--- 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
+++ 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
@@ -97,7 +97,7 @@ public final class RuleAlteredJobPreparer {
         JobConfiguration jobConfig = jobContext.getJobConfig();
         // TODO the lock will be replaced
         String lockName = "prepare-" + jobConfig.getHandleConfig().getJobId();
-        ShardingSphereLock lock = 
PipelineContext.getContextManager().getInstanceContext().getLockContext().getOrCreateSchemaLock(lockName);
+        ShardingSphereLock lock = 
PipelineContext.getContextManager().getInstanceContext().getLockContext().getOrCreateDatabaseLock(lockName);
         if (lock.tryLock(lockName, 1)) {
             try {
                 prepareAndCheckTarget(jobContext);
diff --git 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
index 6e22fce6e64..4b99c33b52d 100644
--- 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
+++ 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
@@ -337,7 +337,7 @@ public final class RuleAlteredJobWorker {
     private void restoreSourceWriting(final String schemaName) {
         log.info("restoreSourceWriting, schemaName={}", schemaName);
         LockContext lockContext = 
PipelineContext.getContextManager().getInstanceContext().getLockContext();
-        ShardingSphereLock lock = lockContext.getSchemaLock(schemaName);
+        ShardingSphereLock lock = lockContext.getDatabaseLock(schemaName);
         if (null != lock && lock.isLocked(schemaName)) {
             log.info("Source writing is still stopped on schema '{}', restore 
it now", schemaName);
             lock.releaseLock(schemaName);
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContext.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContext.java
index b1504977d62..a8493191945 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContext.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContext.java
@@ -28,8 +28,8 @@ import 
org.apache.shardingsphere.infra.lock.ShardingSphereGlobalLock;
 import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.AckLockedEvent;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.AckLockReleasedEvent;
-import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.SchemaLockedEvent;
-import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.SchemaLockReleasedEvent;
+import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.DatabaseLockedEvent;
+import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.DatabaseLockReleasedEvent;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.LockNode;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.LockRegistryService;
 
@@ -65,26 +65,26 @@ public final class DistributeLockContext implements 
LockContext {
     }
     
     private void synchronizeGlobalLock() {
-        Collection<String> allGlobalLock = 
lockRegistryService.getAllGlobalSchemaLocks();
+        Collection<String> allGlobalLock = 
lockRegistryService.getAllGlobalDatabaseLocks();
         if (allGlobalLock.isEmpty()) {
             lockRegistryService.initGlobalLockRoot();
             return;
         }
         for (String each : allGlobalLock) {
-            Optional<String> schemaLock = 
LockNode.parseGlobalSchemaLocksNodePath(each);
-            schemaLock.ifPresent(schema -> globalLocks.put(schema, 
crateGlobalLock()));
+            Optional<String> databaseLock = 
LockNode.parseGlobalDatabaseLocksNodePath(each);
+            databaseLock.ifPresent(database -> globalLocks.put(database, 
crateGlobalLock()));
         }
     }
     
     @Override
-    public synchronized ShardingSphereLock getOrCreateSchemaLock(final String 
schemaName) {
-        Preconditions.checkNotNull(schemaName, "Get or create schema lock args 
schema name can not be null.");
-        ShardingSphereGlobalLock result = globalLocks.get(schemaName);
+    public synchronized ShardingSphereLock getOrCreateDatabaseLock(final 
String databaseName) {
+        Preconditions.checkNotNull(databaseName, "Get or create database lock 
args database name can not be null.");
+        ShardingSphereGlobalLock result = globalLocks.get(databaseName);
         if (null != result) {
             return result;
         }
         result = crateGlobalLock();
-        globalLocks.put(schemaName, result);
+        globalLocks.put(databaseName, result);
         return result;
     }
     
@@ -97,26 +97,26 @@ public final class DistributeLockContext implements 
LockContext {
     }
     
     @Override
-    public ShardingSphereLock getSchemaLock(final String schemaName) {
-        Preconditions.checkNotNull(schemaName, "Get schema lock args schema 
name can not be null.");
-        return globalLocks.get(schemaName);
+    public ShardingSphereLock getDatabaseLock(final String databaseName) {
+        Preconditions.checkNotNull(databaseName, "Get database lock args 
database name can not be null.");
+        return globalLocks.get(databaseName);
     }
     
     @Override
-    public boolean isLockedSchema(final String schemaName) {
-        Preconditions.checkNotNull(schemaName, "Is locked schema args schema 
name can not be null.");
+    public boolean isLockedDatabase(final String databaseName) {
+        Preconditions.checkNotNull(databaseName, "Is locked database args 
database name can not be null.");
         if (globalLocks.isEmpty()) {
             return false;
         }
-        ShardingSphereGlobalLock shardingSphereGlobalLock = 
globalLocks.get(schemaName);
+        ShardingSphereGlobalLock shardingSphereGlobalLock = 
globalLocks.get(databaseName);
         if (null != shardingSphereGlobalLock) {
-            return shardingSphereGlobalLock.isLocked(schemaName);
+            return shardingSphereGlobalLock.isLocked(databaseName);
         }
         return false;
     }
     
-    private Optional<ShardingSphereGlobalLock> getGlobalLock(final String 
schemaName) {
-        return Optional.ofNullable(globalLocks.get(schemaName));
+    private Optional<ShardingSphereGlobalLock> getGlobalLock(final String 
databaseName) {
+        return Optional.ofNullable(globalLocks.get(databaseName));
     }
     
     /**
@@ -125,14 +125,14 @@ public final class DistributeLockContext implements 
LockContext {
      * @param event locked event
      */
     @Subscribe
-    public synchronized void renew(final SchemaLockedEvent event) {
-        String schema = event.getSchema();
-        ShardingSphereGlobalLock globalLock = globalLocks.get(schema);
+    public synchronized void renew(final DatabaseLockedEvent event) {
+        String database = event.getDatabase();
+        ShardingSphereGlobalLock globalLock = globalLocks.get(database);
         if (null == globalLock) {
             globalLock = crateGlobalLock();
-            globalLocks.put(schema, globalLock);
+            globalLocks.put(database, globalLock);
         }
-        globalLock.ackLock(schema, getCurrentInstanceId());
+        globalLock.ackLock(database, getCurrentInstanceId());
     }
     
     /**
@@ -141,9 +141,9 @@ public final class DistributeLockContext implements 
LockContext {
      * @param event lock released event
      */
     @Subscribe
-    public synchronized void renew(final SchemaLockReleasedEvent event) {
-        String schema = event.getSchema();
-        getGlobalLock(schema).ifPresent(lock -> lock.releaseAckLock(schema, 
getCurrentInstanceId()));
+    public synchronized void renew(final DatabaseLockReleasedEvent event) {
+        String database = event.getDatabase();
+        getGlobalLock(database).ifPresent(lock -> 
lock.releaseAckLock(database, getCurrentInstanceId()));
     }
     
     /**
@@ -153,7 +153,7 @@ public final class DistributeLockContext implements 
LockContext {
      */
     @Subscribe
     public synchronized void renew(final AckLockedEvent event) {
-        getGlobalLock(event.getSchema()).ifPresent(shardingSphereGlobalLock -> 
shardingSphereGlobalLock.addLockedInstance(event.getLockedInstance()));
+        getGlobalLock(event.getDatabase()).ifPresent(shardingSphereGlobalLock 
-> shardingSphereGlobalLock.addLockedInstance(event.getLockedInstance()));
     }
     
     /**
@@ -163,6 +163,6 @@ public final class DistributeLockContext implements 
LockContext {
      */
     @Subscribe
     public synchronized void renew(final AckLockReleasedEvent event) {
-        getGlobalLock(event.getSchema()).ifPresent(shardingSphereGlobalLock -> 
shardingSphereGlobalLock.removeLockedInstance(event.getLockedInstance()));
+        getGlobalLock(event.getDatabase()).ifPresent(shardingSphereGlobalLock 
-> shardingSphereGlobalLock.removeLockedInstance(event.getLockedInstance()));
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/ShardingSphereDistributeGlobalLock.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/ShardingSphereDistributeGlobalLock.java
index 138e99afea4..a20dbb4e30a 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/ShardingSphereDistributeGlobalLock.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/ShardingSphereDistributeGlobalLock.java
@@ -99,7 +99,7 @@ public final class ShardingSphereDistributeGlobalLock 
implements ShardingSphereG
         long consumeTime = 0;
         String currentInstanceId = getCurrentInstanceId();
         do {
-            boolean isLocked = 
lockService.tryGlobalLock(LockNode.generateGlobalSchemaLocksName(lockName), 
DEFAULT_REGISTRY_TIMEOUT_MILLISECONDS);
+            boolean isLocked = 
lockService.tryGlobalLock(LockNode.generateGlobalDatabaseLocksName(lockName), 
DEFAULT_REGISTRY_TIMEOUT_MILLISECONDS);
             consumeTime += DEFAULT_REGISTRY_TIMEOUT_MILLISECONDS;
             if (isLocked) {
                 lockedInstances.add(currentInstanceId);
@@ -145,13 +145,13 @@ public final class ShardingSphereDistributeGlobalLock 
implements ShardingSphereG
             log.debug("release lock, lockName={}", lockName);
             String currentInstanceId = getCurrentInstanceId();
             if (isOwner.get()) {
-                
lockService.releaseGlobalLock(LockNode.generateGlobalSchemaLocksName(lockName), 
true);
+                
lockService.releaseGlobalLock(LockNode.generateGlobalDatabaseLocksName(lockName),
 true);
                 isOwner.compareAndSet(true, false);
                 lockedInstances.remove(currentInstanceId);
                 synchronizedLockState.compareAndSet(LockState.LOCKED, 
LockState.UNLOCKED);
                 return;
             }
-            
lockService.releaseGlobalLock(LockNode.generateGlobalSchemaLockReleasedNodePath(lockName),
 false);
+            
lockService.releaseGlobalLock(LockNode.generateGlobalDatabaseLockReleasedNodePath(lockName),
 false);
             releaseAckLock(lockName, currentInstanceId);
         }
         log.debug("release lock, state is not locked, ignore, lockName={}", 
lockName);
@@ -177,7 +177,7 @@ public final class ShardingSphereDistributeGlobalLock 
implements ShardingSphereG
     @Override
     public void ackLock(final String lockName, final String lockedInstanceId) {
         if (!isOwner.get() && LockState.UNLOCKED == 
synchronizedLockState.get()) {
-            
lockService.ackLock(LockNode.generateGlobalSchemaAckLockName(lockName, 
lockedInstanceId), lockedInstanceId);
+            
lockService.ackLock(LockNode.generateGlobalDatabaseAckLockName(lockName, 
lockedInstanceId), lockedInstanceId);
             lockedInstances.add(lockedInstanceId);
             synchronizedLockState.compareAndSet(LockState.UNLOCKED, 
LockState.LOCKED);
         }
@@ -186,7 +186,7 @@ public final class ShardingSphereDistributeGlobalLock 
implements ShardingSphereG
     @Override
     public void releaseAckLock(final String lockName, final String 
lockedInstanceId) {
         if (!isOwner.get()) {
-            
lockService.releaseAckLock(LockNode.generateGlobalSchemaAckLockName(lockName, 
lockedInstanceId));
+            
lockService.releaseAckLock(LockNode.generateGlobalDatabaseAckLockName(lockName, 
lockedInstanceId));
         } else {
             isOwner.compareAndSet(true, false);
         }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/AckLockReleasedEvent.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/AckLockReleasedEvent.java
index 7d23d8bf7d3..eee3060ea02 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/AckLockReleasedEvent.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/AckLockReleasedEvent.java
@@ -27,13 +27,13 @@ import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
 @Getter
 public final class AckLockReleasedEvent implements GovernanceEvent {
     
-    private final String schema;
+    private final String database;
     
     private final String lockedInstance;
     
     public AckLockReleasedEvent(final String lockName) {
-        String[] schemaInstance = LockNodeUtil.parseSchemaLockName(lockName);
-        this.schema = schemaInstance[0];
-        this.lockedInstance = schemaInstance[1];
+        String[] databaseInstance = 
LockNodeUtil.parseDatabaseLockName(lockName);
+        this.database = databaseInstance[0];
+        this.lockedInstance = databaseInstance[1];
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/AckLockedEvent.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/AckLockedEvent.java
index 1a0adab470c..2fb665278e0 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/AckLockedEvent.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/AckLockedEvent.java
@@ -27,13 +27,13 @@ import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
 @Getter
 public final class AckLockedEvent implements GovernanceEvent {
     
-    private final String schema;
+    private final String database;
     
     private final String lockedInstance;
     
     public AckLockedEvent(final String lockName) {
-        String[] schemaInstance = LockNodeUtil.parseSchemaLockName(lockName);
-        this.schema = schemaInstance[0];
-        this.lockedInstance = schemaInstance[1];
+        String[] databaseInstance = 
LockNodeUtil.parseDatabaseLockName(lockName);
+        this.database = databaseInstance[0];
+        this.lockedInstance = databaseInstance[1];
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/SchemaLockReleasedEvent.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/DatabaseLockReleasedEvent.java
similarity index 91%
rename from 
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/SchemaLockReleasedEvent.java
rename to 
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/DatabaseLockReleasedEvent.java
index 3c038b3a750..e7dc9dc96d8 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/SchemaLockReleasedEvent.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/DatabaseLockReleasedEvent.java
@@ -26,7 +26,7 @@ import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
  */
 @RequiredArgsConstructor
 @Getter
-public final class SchemaLockReleasedEvent implements GovernanceEvent {
+public final class DatabaseLockReleasedEvent implements GovernanceEvent {
     
-    private final String schema;
+    private final String database;
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/SchemaLockedEvent.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/DatabaseLockedEvent.java
similarity index 91%
rename from 
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/SchemaLockedEvent.java
rename to 
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/DatabaseLockedEvent.java
index b7fc2bac7c0..014ef43f438 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/SchemaLockedEvent.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/event/DatabaseLockedEvent.java
@@ -26,7 +26,7 @@ import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
  */
 @RequiredArgsConstructor
 @Getter
-public final class SchemaLockedEvent implements GovernanceEvent {
+public final class DatabaseLockedEvent implements GovernanceEvent {
     
-    private final String schema;
+    private final String database;
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockNode.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockNode.java
index cf0d9908669..c10f17a4667 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockNode.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockNode.java
@@ -40,7 +40,7 @@ public final class LockNode {
     
     private static final String LOCK_TOKEN = "token";
     
-    private static final String LOCK_LEVEL_SCHEMA = "schema";
+    private static final String LOCK_LEVEL_DATABASE = "database";
     
     private static final String LOCKS_NODE = "locks";
     
@@ -56,21 +56,21 @@ public final class LockNode {
     }
     
     /**
-     * Get global schema locks node path.
+     * Get global database locks node path.
      *
-     * @return global schema lock node path
+     * @return global database lock node path
      */
-    public static String getGlobalSchemaLocksNodePath() {
-        return Joiner.on("/").join("", LOCK_ROOT, LOCK_SCOPE_GLOBAL, 
LOCK_LEVEL_SCHEMA, LOCKS_NODE);
+    public static String getGlobalDatabaseLocksNodePath() {
+        return Joiner.on("/").join("", LOCK_ROOT, LOCK_SCOPE_GLOBAL, 
LOCK_LEVEL_DATABASE, LOCKS_NODE);
     }
     
     /**
-     * Get global schema locked ack node path.
+     * Get global database locked ack node path.
      *
-     * @return global schema locked ack node path
+     * @return global database locked ack node path
      */
-    public static String getGlobalSchemaLockedAckNodePath() {
-        return Joiner.on("/").join("", LOCK_ROOT, LOCK_SCOPE_GLOBAL, 
LOCK_LEVEL_SCHEMA, LOCKED_ACK_NODE);
+    public static String getGlobalDatabaseLockedAckNodePath() {
+        return Joiner.on("/").join("", LOCK_ROOT, LOCK_SCOPE_GLOBAL, 
LOCK_LEVEL_DATABASE, LOCKED_ACK_NODE);
     }
     
     /**
@@ -84,34 +84,34 @@ public final class LockNode {
     }
     
     /**
-     * Generate global schema locks name.
+     * Generate global database locks name.
      *
-     * @param schema schema
-     * @return global schema locks name
+     * @param database database
+     * @return global database locks name
      */
-    public static String generateGlobalSchemaLocksName(final String schema) {
-        return getGlobalSchemaLocksNodePath() + "/" + schema;
+    public static String generateGlobalDatabaseLocksName(final String 
database) {
+        return getGlobalDatabaseLocksNodePath() + "/" + database;
     }
     
     /**
-     * Generate global schema ack lock name.
+     * Generate global database ack lock name.
      *
-     * @param schema schema
+     * @param database database
      * @param lockedInstanceId locked instance id
-     * @return global schema ack lock name
+     * @return global database ack lock name
      */
-    public static String generateGlobalSchemaAckLockName(final String schema, 
final String lockedInstanceId) {
-        return getGlobalSchemaLockedAckNodePath() + "/" + 
LockNodeUtil.generateSchemaLockName(schema, lockedInstanceId);
+    public static String generateGlobalDatabaseAckLockName(final String 
database, final String lockedInstanceId) {
+        return getGlobalDatabaseLockedAckNodePath() + "/" + 
LockNodeUtil.generateDatabaseLockName(database, lockedInstanceId);
     }
     
     /**
-     * Generate global schema Lock released node path.
+     * Generate global database Lock released node path.
      *
-     * @param schema schema
-     * @return global schema Lock released name
+     * @param database database
+     * @return global database Lock released name
      */
-    public static String generateGlobalSchemaLockReleasedNodePath(final String 
schema) {
-        return getGlobalSchemaLocksNodePath() + "/" + schema + "/leases";
+    public static String generateGlobalDatabaseLockReleasedNodePath(final 
String database) {
+        return getGlobalDatabaseLocksNodePath() + "/" + database + "/leases";
     }
     
     /**
@@ -124,25 +124,25 @@ public final class LockNode {
     }
     
     /**
-     * Parse global schema Locks node path.
+     * Parse global database Locks node path.
      *
      * @param nodePath locks node path
-     * @return global schema locked node path
+     * @return global database locked node path
      */
-    public static Optional<String> parseGlobalSchemaLocksNodePath(final String 
nodePath) {
-        Pattern pattern = Pattern.compile(getGlobalSchemaLocksNodePath() + "/" 
+ "(.+)/leases/(.+)$", Pattern.CASE_INSENSITIVE);
+    public static Optional<String> parseGlobalDatabaseLocksNodePath(final 
String nodePath) {
+        Pattern pattern = Pattern.compile(getGlobalDatabaseLocksNodePath() + 
"/" + "(.+)/leases/(.+)$", Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(nodePath);
         return matcher.find() ? Optional.of(matcher.group(1)) : 
Optional.empty();
     }
     
     /**
-     * Parse global schema locked ack node path.
+     * Parse global database locked ack node path.
      *
      * @param nodePath locked ack node path
-     * @return global schema locked ack node path
+     * @return global database locked ack node path
      */
-    public static Optional<String> parseGlobalSchemaLockedAckNodePath(final 
String nodePath) {
-        Pattern pattern = Pattern.compile(getGlobalSchemaLockedAckNodePath() + 
"/(.+)$", Pattern.CASE_INSENSITIVE);
+    public static Optional<String> parseGlobalDatabaseLockedAckNodePath(final 
String nodePath) {
+        Pattern pattern = Pattern.compile(getGlobalDatabaseLockedAckNodePath() 
+ "/(.+)$", Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(nodePath);
         return matcher.find() ? Optional.of(matcher.group(1)) : 
Optional.empty();
     }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockRegistryService.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockRegistryService.java
index 1696f791179..6815d3fb5fa 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockRegistryService.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockRegistryService.java
@@ -38,8 +38,8 @@ public final class LockRegistryService {
      */
     public void initGlobalLockRoot() {
         repository.persist(LockNode.getStandardLocksNodePath(), "");
-        repository.persist(LockNode.getGlobalSchemaLocksNodePath(), "");
-        repository.persist(LockNode.getGlobalSchemaLockedAckNodePath(), "");
+        repository.persist(LockNode.getGlobalDatabaseLocksNodePath(), "");
+        repository.persist(LockNode.getGlobalDatabaseLockedAckNodePath(), "");
     }
     
     /**
@@ -47,8 +47,8 @@ public final class LockRegistryService {
      *
      * @return all global locks
      */
-    public Collection<String> getAllGlobalSchemaLocks() {
-        return 
repository.getChildrenKeys(LockNode.getGlobalSchemaLocksNodePath());
+    public Collection<String> getAllGlobalDatabaseLocks() {
+        return 
repository.getChildrenKeys(LockNode.getGlobalDatabaseLocksNodePath());
     }
     
     /**
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtil.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtil.java
index 03a4f66eb0e..8aea107f872 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtil.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtil.java
@@ -29,23 +29,23 @@ public final class LockNodeUtil {
     private static final String LOCK_DELIMITER = "-";
     
     /**
-     * Generate schema lock name.
+     * Generate database ack lock name.
      *
-     * @param schema schema name
+     * @param database database name
      * @param instanceId instance id
-     * @return lock name
+     * @return ack lock name
      */
-    public static String generateSchemaLockName(final String schema, final 
String instanceId) {
-        return schema + LOCK_DELIMITER + instanceId;
+    public static String generateDatabaseLockName(final String database, final 
String instanceId) {
+        return database + LOCK_DELIMITER + instanceId;
     }
     
     /**
-     * Parse schema lock name.
+     * Parse database lock name.
      *
      * @param lockedName locked name
-     * @return string array of schema name and instance id
+     * @return string array of database name and instance id
      */
-    public static String[] parseSchemaLockName(final String lockedName) {
+    public static String[] parseDatabaseLockName(final String lockedName) {
         return lockedName.trim().split(LOCK_DELIMITER);
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalAckChangedWatcher.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalAckChangedWatcher.java
index 04699cf1470..8f1ccae9be0 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalAckChangedWatcher.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalAckChangedWatcher.java
@@ -37,7 +37,7 @@ public final class GlobalAckChangedWatcher implements 
GovernanceWatcher<Governan
     
     @Override
     public Collection<String> getWatchingKeys() {
-        return 
Collections.singleton(LockNode.getGlobalSchemaLockedAckNodePath());
+        return 
Collections.singleton(LockNode.getGlobalDatabaseLockedAckNodePath());
     }
     
     @Override
@@ -47,7 +47,7 @@ public final class GlobalAckChangedWatcher implements 
GovernanceWatcher<Governan
     
     @Override
     public Optional<GovernanceEvent> createGovernanceEvent(final 
DataChangedEvent event) {
-        Optional<String> ackLockedName = 
LockNode.parseGlobalSchemaLockedAckNodePath(event.getKey());
+        Optional<String> ackLockedName = 
LockNode.parseGlobalDatabaseLockedAckNodePath(event.getKey());
         if (ackLockedName.isPresent()) {
             return handleGlobalAckEvent(event.getType(), ackLockedName.get());
         }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalLocksChangedWatcher.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalLocksChangedWatcher.java
index cf18ec2e9d3..e7b71861902 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalLocksChangedWatcher.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalLocksChangedWatcher.java
@@ -17,8 +17,8 @@
 
 package 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.watcher;
 
-import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.SchemaLockReleasedEvent;
-import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.SchemaLockedEvent;
+import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.DatabaseLockReleasedEvent;
+import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.DatabaseLockedEvent;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.LockNode;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcher;
@@ -37,7 +37,7 @@ public final class GlobalLocksChangedWatcher implements 
GovernanceWatcher<Govern
     
     @Override
     public Collection<String> getWatchingKeys() {
-        return Collections.singleton(LockNode.getGlobalSchemaLocksNodePath());
+        return 
Collections.singleton(LockNode.getGlobalDatabaseLocksNodePath());
     }
     
     @Override
@@ -47,7 +47,7 @@ public final class GlobalLocksChangedWatcher implements 
GovernanceWatcher<Govern
     
     @Override
     public Optional<GovernanceEvent> createGovernanceEvent(final 
DataChangedEvent event) {
-        Optional<String> lockedName = 
LockNode.parseGlobalSchemaLocksNodePath(event.getKey());
+        Optional<String> lockedName = 
LockNode.parseGlobalDatabaseLocksNodePath(event.getKey());
         if (lockedName.isPresent()) {
             return handleGlobalSchemaLocksEvent(event.getType(), 
lockedName.get());
         }
@@ -56,9 +56,9 @@ public final class GlobalLocksChangedWatcher implements 
GovernanceWatcher<Govern
     
     private Optional<GovernanceEvent> handleGlobalSchemaLocksEvent(final Type 
eventType, final String lockedName) {
         if (Type.ADDED == eventType) {
-            return Optional.of(new SchemaLockedEvent(lockedName));
+            return Optional.of(new DatabaseLockedEvent(lockedName));
         } else if (Type.DELETED == eventType) {
-            return Optional.of(new SchemaLockReleasedEvent(lockedName));
+            return Optional.of(new DatabaseLockReleasedEvent(lockedName));
         }
         return Optional.empty();
     }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContextTest.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContextTest.java
index f8b660123fa..5173586ffcd 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContextTest.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContextTest.java
@@ -27,7 +27,7 @@ import 
org.apache.shardingsphere.infra.lock.ShardingSphereGlobalLock;
 import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.AckLockReleasedEvent;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.AckLockedEvent;
-import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.SchemaLockedEvent;
+import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.DatabaseLockedEvent;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.LockRegistryService;
 import org.junit.Test;
 
@@ -44,34 +44,34 @@ import static org.mockito.Mockito.mock;
 public final class DistributeLockContextTest {
     
     @Test
-    public void assertGetOrCreateSchemaLock() {
+    public void assertGetOrCreateDatabaseLock() {
         DistributeLockContext distributeLockContext = new 
DistributeLockContext(mock(LockRegistryService.class));
         ComputeNodeInstance currentInstance = new ComputeNodeInstance(new 
InstanceDefinition(InstanceType.PROXY, "127.0.0.1@3307"));
         InstanceContext instanceContext = new InstanceContext(currentInstance, 
mock(WorkerIdGenerator.class), mock(ModeConfiguration.class), 
distributeLockContext);
         instanceContext.initLockContext();
-        ShardingSphereLock schemaLock = 
distributeLockContext.getOrCreateSchemaLock("schema");
-        assertNotNull(schemaLock);
+        ShardingSphereLock databaseLock = 
distributeLockContext.getOrCreateDatabaseLock("database");
+        assertNotNull(databaseLock);
     }
     
     @Test
-    public void assertGetSchemaLock() {
+    public void assertGetDatabaseLock() {
         DistributeLockContext distributeLockContext = new 
DistributeLockContext(mock(LockRegistryService.class));
         ComputeNodeInstance currentInstance = new ComputeNodeInstance(new 
InstanceDefinition(InstanceType.PROXY, "127.0.0.1@3307"));
         InstanceContext instanceContext = new InstanceContext(currentInstance, 
mock(WorkerIdGenerator.class), mock(ModeConfiguration.class), 
distributeLockContext);
         instanceContext.initLockContext();
-        distributeLockContext.getOrCreateSchemaLock("schema");
-        ShardingSphereLock schemaLock = 
distributeLockContext.getSchemaLock("schema");
-        assertTrue(schemaLock instanceof ShardingSphereDistributeGlobalLock);
+        distributeLockContext.getOrCreateDatabaseLock("database");
+        ShardingSphereLock databaseLock = 
distributeLockContext.getDatabaseLock("database");
+        assertTrue(databaseLock instanceof ShardingSphereDistributeGlobalLock);
     }
     
     @Test
-    public void assertIsLockedSchema() {
+    public void assertIsLockedDatabase() {
         DistributeLockContext distributeLockContext = new 
DistributeLockContext(mock(LockRegistryService.class));
         ComputeNodeInstance currentInstance = new ComputeNodeInstance(new 
InstanceDefinition(InstanceType.PROXY, "127.0.0.1@3307"));
         InstanceContext instanceContext = new InstanceContext(currentInstance, 
mock(WorkerIdGenerator.class), mock(ModeConfiguration.class), 
distributeLockContext);
         instanceContext.initLockContext();
-        distributeLockContext.getOrCreateSchemaLock("schema");
-        assertFalse(distributeLockContext.isLockedSchema("schema"));
+        distributeLockContext.getOrCreateDatabaseLock("database");
+        assertFalse(distributeLockContext.isLockedDatabase("database"));
     }
     
     @Test
@@ -83,7 +83,7 @@ public final class DistributeLockContextTest {
         Field computeNodeInstancesDeclaredField = 
DistributeLockContext.class.getDeclaredField("computeNodeInstances");
         computeNodeInstancesDeclaredField.setAccessible(true);
         computeNodeInstancesDeclaredField.set(distributeLockContext, 
Arrays.asList(new ComputeNodeInstance(new 
InstanceDefinition(InstanceType.PROXY, "127.0.0.1@3307"))));
-        distributeLockContext.renew(new 
SchemaLockedEvent("schema1-127.0.0.1@3308"));
+        distributeLockContext.renew(new 
DatabaseLockedEvent("database1-127.0.0.1@3308"));
     }
     
     @Test
@@ -93,24 +93,24 @@ public final class DistributeLockContextTest {
         declaredField.setAccessible(true);
         declaredField.set(distributeLockContext, new ComputeNodeInstance(new 
InstanceDefinition(InstanceType.PROXY, "127.0.0.1@3307")));
         Map<String, ShardingSphereGlobalLock> globalLocks = new 
ConcurrentHashMap<>();
-        globalLocks.put("schema", mock(ShardingSphereGlobalLock.class));
+        globalLocks.put("database", mock(ShardingSphereGlobalLock.class));
         Field globalLocksDeclaredField = 
DistributeLockContext.class.getDeclaredField("globalLocks");
         globalLocksDeclaredField.setAccessible(true);
         globalLocksDeclaredField.set(distributeLockContext, globalLocks);
-        assertNotNull(distributeLockContext.getSchemaLock("schema"));
-        distributeLockContext.renew(new 
AckLockReleasedEvent("schema-127.0.0.1@3307"));
-        assertNotNull(distributeLockContext.getSchemaLock("schema"));
+        assertNotNull(distributeLockContext.getDatabaseLock("database"));
+        distributeLockContext.renew(new 
AckLockReleasedEvent("database-127.0.0.1@3307"));
+        assertNotNull(distributeLockContext.getDatabaseLock("database"));
     }
     
     @Test
     public void assertRenew() throws IllegalAccessException, 
NoSuchFieldException {
         DistributeLockContext distributeLockContext = new 
DistributeLockContext(mock(LockRegistryService.class));
         Map<String, ShardingSphereGlobalLock> globalLocks = new 
ConcurrentHashMap<>();
-        globalLocks.put("schema", mock(ShardingSphereGlobalLock.class));
+        globalLocks.put("database", mock(ShardingSphereGlobalLock.class));
         Field declaredField = 
DistributeLockContext.class.getDeclaredField("globalLocks");
         declaredField.setAccessible(true);
         declaredField.set(distributeLockContext, globalLocks);
-        AckLockedEvent event = new AckLockedEvent("schema-127.0.0.1@3307");
+        AckLockedEvent event = new AckLockedEvent("database-127.0.0.1@3307");
         distributeLockContext.renew(event);
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockNodeTest.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockNodeTest.java
index e5682433de6..be3a0f039b4 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockNodeTest.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockNodeTest.java
@@ -33,13 +33,13 @@ public final class LockNodeTest {
     }
     
     @Test
-    public void assertGetGlobalSchemaLocksNodePath() {
-        assertThat(LockNode.getGlobalSchemaLocksNodePath(), 
is("/lock/global/schema/locks"));
+    public void assertGetGlobalDatabaseLocksNodePath() {
+        assertThat(LockNode.getGlobalDatabaseLocksNodePath(), 
is("/lock/global/database/locks"));
     }
     
     @Test
-    public void assertGetGlobalSchemaLockedAckNodePath() {
-        assertThat(LockNode.getGlobalSchemaLockedAckNodePath(), 
is("/lock/global/schema/ack"));
+    public void assertGetGlobalDatabaseLockedAckNodePath() {
+        assertThat(LockNode.getGlobalDatabaseLockedAckNodePath(), 
is("/lock/global/database/ack"));
     }
     
     @Test
@@ -48,18 +48,18 @@ public final class LockNodeTest {
     }
     
     @Test
-    public void assertGenerateGlobalSchemaLocksName() {
-        assertThat(LockNode.generateGlobalSchemaLocksName("schema"), 
is("/lock/global/schema/locks/schema"));
+    public void assertGenerateGlobalDatabaseLocksName() {
+        assertThat(LockNode.generateGlobalDatabaseLocksName("database"), 
is("/lock/global/database/locks/database"));
     }
     
     @Test
-    public void assertGenerateGlobalSchemaAckLockName() {
-        assertThat(LockNode.generateGlobalSchemaAckLockName("schema", 
"127.0.0.1@3307"), is("/lock/global/schema/ack/schema-127.0.0.1@3307"));
+    public void assertGenerateGlobalDatabaseAckLockName() {
+        assertThat(LockNode.generateGlobalDatabaseAckLockName("database", 
"127.0.0.1@3307"), is("/lock/global/database/ack/database-127.0.0.1@3307"));
     }
     
     @Test
-    public void assertGenerateGlobalSchemaLockReleasedNodePath() {
-        
assertThat(LockNode.generateGlobalSchemaLockReleasedNodePath("schema"), 
is("/lock/global/schema/locks/schema/leases"));
+    public void assertGenerateGlobalDatabaseLockReleasedNodePath() {
+        
assertThat(LockNode.generateGlobalDatabaseLockReleasedNodePath("database"), 
is("/lock/global/database/locks/database/leases"));
     }
     
     @Test
@@ -68,18 +68,18 @@ public final class LockNodeTest {
     }
     
     @Test
-    public void assertParseGlobalSchemaLocksNodePath() {
-        String nodePath = 
"/lock/global/schema/locks/schema-127.0.0.1@3307/leases/c_l_00000000";
-        Optional<String> globalSchemaLocksNodePath = 
LockNode.parseGlobalSchemaLocksNodePath(nodePath);
-        assertTrue(globalSchemaLocksNodePath.isPresent());
-        assertThat(globalSchemaLocksNodePath.get(), 
is("schema-127.0.0.1@3307"));
+    public void assertParseGlobalDatabaseLocksNodePath() {
+        String nodePath = 
"/lock/global/database/locks/database-127.0.0.1@3307/leases/c_l_00000000";
+        Optional<String> globalDatabaseLockedAckNodePath = 
LockNode.parseGlobalDatabaseLocksNodePath(nodePath);
+        assertTrue(globalDatabaseLockedAckNodePath.isPresent());
+        assertThat(globalDatabaseLockedAckNodePath.get(), 
is("database-127.0.0.1@3307"));
     }
     
     @Test
-    public void assertParseGlobalSchemaLockedAckNodePath() {
-        String nodePath = "/lock/global/schema/ack/schema-127.0.0.1@3307";
-        Optional<String> globalSchemaLockedAckNodePath = 
LockNode.parseGlobalSchemaLockedAckNodePath(nodePath);
-        assertTrue(globalSchemaLockedAckNodePath.isPresent());
-        assertThat(globalSchemaLockedAckNodePath.get(), 
is("schema-127.0.0.1@3307"));
+    public void assertParseGlobalDatabaseLockedAckNodePath() {
+        String nodePath = "/lock/global/database/ack/database-127.0.0.1@3307";
+        Optional<String> globalDatabaseLockedAckNodePath = 
LockNode.parseGlobalDatabaseLockedAckNodePath(nodePath);
+        assertTrue(globalDatabaseLockedAckNodePath.isPresent());
+        assertThat(globalDatabaseLockedAckNodePath.get(), 
is("database-127.0.0.1@3307"));
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockRegistryServiceTest.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockRegistryServiceTest.java
index 5dc91b6ce3f..f837e8ad63b 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockRegistryServiceTest.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockRegistryServiceTest.java
@@ -59,35 +59,35 @@ public final class LockRegistryServiceTest {
     
     @Test
     public void assertGetAllGlobalLock() {
-        lockRegistryService.getAllGlobalSchemaLocks();
-        
verify(clusterPersistRepository).getChildrenKeys(LockNode.getGlobalSchemaLocksNodePath());
+        lockRegistryService.getAllGlobalDatabaseLocks();
+        
verify(clusterPersistRepository).getChildrenKeys(LockNode.getGlobalDatabaseLocksNodePath());
     }
     
     @Test
     public void assertTryGlobalLock() {
-        String schemaLockName = 
LockNode.generateGlobalSchemaLocksName("schema");
-        lockRegistryService.tryGlobalLock(schemaLockName, 300);
-        verify(clusterPersistRepository).tryLock(schemaLockName, 300, 
TimeUnit.MILLISECONDS);
+        String databaseLockName = 
LockNode.generateGlobalDatabaseLocksName("database");
+        lockRegistryService.tryGlobalLock(databaseLockName, 300);
+        verify(clusterPersistRepository).tryLock(databaseLockName, 300, 
TimeUnit.MILLISECONDS);
     }
     
     @Test
     public void assertReleaseGlobalLock() {
-        String schemaLockName = 
LockNode.generateGlobalSchemaLocksName("schema");
-        lockRegistryService.releaseGlobalLock(schemaLockName, true);
-        verify(clusterPersistRepository).releaseLock(schemaLockName);
+        String databaseLockName = 
LockNode.generateGlobalDatabaseLocksName("database");
+        lockRegistryService.releaseGlobalLock(databaseLockName, true);
+        verify(clusterPersistRepository).releaseLock(databaseLockName);
     }
     
     @Test
     public void assertAckLock() {
-        String schemaAckLock = 
LockNode.generateGlobalSchemaAckLockName("schema", "127.0.0.1@3307");
-        lockRegistryService.ackLock(schemaAckLock, "127.0.0.1@3307");
-        verify(clusterPersistRepository).persistEphemeral(schemaAckLock, 
"127.0.0.1@3307");
+        String databaseAckLock = 
LockNode.generateGlobalDatabaseAckLockName("database", "127.0.0.1@3307");
+        lockRegistryService.ackLock(databaseAckLock, "127.0.0.1@3307");
+        verify(clusterPersistRepository).persistEphemeral(databaseAckLock, 
"127.0.0.1@3307");
     }
     
     @Test
     public void assertReleaseAckLock() {
-        String schemaAckLock = 
LockNode.generateGlobalSchemaAckLockName("schema", "127.0.0.1@3307");
-        lockRegistryService.releaseAckLock(schemaAckLock);
-        verify(clusterPersistRepository).delete(schemaAckLock);
+        String databaseAckLock = 
LockNode.generateGlobalDatabaseAckLockName("database", "127.0.0.1@3307");
+        lockRegistryService.releaseAckLock(databaseAckLock);
+        verify(clusterPersistRepository).delete(databaseAckLock);
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtilTest.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtilTest.java
index 24cc01a4cac..4c9b00c4fc7 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtilTest.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtilTest.java
@@ -26,14 +26,14 @@ public final class LockNodeUtilTest {
     
     @Test
     public void assertGenerateLockName() {
-        assertThat(LockNodeUtil.generateSchemaLockName("schema", 
"127.0.0.1@3307"), is("schema-127.0.0.1@3307"));
+        assertThat(LockNodeUtil.generateDatabaseLockName("database", 
"127.0.0.1@3307"), is("database-127.0.0.1@3307"));
     }
     
     @Test
     public void assertParseLockName() {
-        String[] lockName = 
LockNodeUtil.parseSchemaLockName("schema-127.0.0.1@3307");
+        String[] lockName = 
LockNodeUtil.parseDatabaseLockName("database-127.0.0.1@3307");
         assertThat(lockName.length, is(2));
-        assertThat(lockName[0], is("schema"));
+        assertThat(lockName[0], is("database"));
         assertThat(lockName[1], is("127.0.0.1@3307"));
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalAckChangedWatcherTest.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalAckChangedWatcherTest.java
index ba63bb56011..5c45db14292 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalAckChangedWatcherTest.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalAckChangedWatcherTest.java
@@ -33,19 +33,19 @@ public final class GlobalAckChangedWatcherTest {
     
     @Test
     public void assertCreateGovernanceEvent() {
-        DataChangedEvent addDataChangedEvent = new 
DataChangedEvent("/lock/global/schema/ack/schema-127.0.0.1@3307", 
"127.0.0.1@3307", DataChangedEvent.Type.ADDED);
+        DataChangedEvent addDataChangedEvent = new 
DataChangedEvent("/lock/global/database/ack/database-127.0.0.1@3307", 
"127.0.0.1@3307", DataChangedEvent.Type.ADDED);
         Optional<GovernanceEvent> add = new 
GlobalAckChangedWatcher().createGovernanceEvent(addDataChangedEvent);
         assertTrue(add.isPresent());
         GovernanceEvent addEvent = add.get();
         assertTrue(addEvent instanceof AckLockedEvent);
-        assertThat(((AckLockedEvent) addEvent).getSchema(), is("schema"));
+        assertThat(((AckLockedEvent) addEvent).getDatabase(), is("database"));
         assertThat(((AckLockedEvent) addEvent).getLockedInstance(), 
is("127.0.0.1@3307"));
-        DataChangedEvent deleteDataChangedEvent = new 
DataChangedEvent("/lock/global/schema/ack/schema-127.0.0.1@3307", 
"127.0.0.1@3307", DataChangedEvent.Type.DELETED);
+        DataChangedEvent deleteDataChangedEvent = new 
DataChangedEvent("/lock/global/database/ack/database-127.0.0.1@3307", 
"127.0.0.1@3307", DataChangedEvent.Type.DELETED);
         Optional<GovernanceEvent> delete = new 
GlobalAckChangedWatcher().createGovernanceEvent(deleteDataChangedEvent);
         assertTrue(delete.isPresent());
         GovernanceEvent deleteEvent = delete.get();
         assertTrue(deleteEvent instanceof AckLockReleasedEvent);
-        assertThat(((AckLockReleasedEvent) deleteEvent).getSchema(), 
is("schema"));
+        assertThat(((AckLockReleasedEvent) deleteEvent).getDatabase(), 
is("database"));
         assertThat(((AckLockReleasedEvent) deleteEvent).getLockedInstance(), 
is("127.0.0.1@3307"));
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalLocksChangedWatcherTest.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalLocksChangedWatcherTest.java
index 87f9efd817d..8f8e285676a 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalLocksChangedWatcherTest.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/watcher/GlobalLocksChangedWatcherTest.java
@@ -17,8 +17,8 @@
 
 package 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.watcher;
 
-import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.SchemaLockReleasedEvent;
-import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.SchemaLockedEvent;
+import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.DatabaseLockReleasedEvent;
+import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.event.DatabaseLockedEvent;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
 import 
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
 import org.junit.Test;
@@ -33,17 +33,17 @@ public final class GlobalLocksChangedWatcherTest {
     
     @Test
     public void assertCreateGovernanceEvent() {
-        DataChangedEvent addDataChangedEvent = new 
DataChangedEvent("/lock/global/schema/locks/schema/leases/c_l_0000000", 
"127.0.0.1@3307", DataChangedEvent.Type.ADDED);
+        DataChangedEvent addDataChangedEvent = new 
DataChangedEvent("/lock/global/database/locks/database/leases/c_l_0000000", 
"127.0.0.1@3307", DataChangedEvent.Type.ADDED);
         Optional<GovernanceEvent> add = new 
GlobalLocksChangedWatcher().createGovernanceEvent(addDataChangedEvent);
         assertTrue(add.isPresent());
         GovernanceEvent addEvent = add.get();
-        assertTrue(addEvent instanceof SchemaLockedEvent);
-        assertThat(((SchemaLockedEvent) addEvent).getSchema(), is("schema"));
-        DataChangedEvent deleteDataChangedEvent = new 
DataChangedEvent("/lock/global/schema/locks/schema/leases/c_l_0000000", 
"127.0.0.1@3307", DataChangedEvent.Type.DELETED);
+        assertTrue(addEvent instanceof DatabaseLockedEvent);
+        assertThat(((DatabaseLockedEvent) addEvent).getDatabase(), 
is("database"));
+        DataChangedEvent deleteDataChangedEvent = new 
DataChangedEvent("/lock/global/database/locks/database/leases/c_l_0000000", 
"127.0.0.1@3307", DataChangedEvent.Type.DELETED);
         Optional<GovernanceEvent> delete = new 
GlobalLocksChangedWatcher().createGovernanceEvent(deleteDataChangedEvent);
         assertTrue(delete.isPresent());
         GovernanceEvent deleteEvent = delete.get();
-        assertTrue(deleteEvent instanceof SchemaLockReleasedEvent);
-        assertThat(((SchemaLockReleasedEvent) deleteEvent).getSchema(), 
is("schema"));
+        assertTrue(deleteEvent instanceof DatabaseLockReleasedEvent);
+        assertThat(((DatabaseLockReleasedEvent) deleteEvent).getDatabase(), 
is("database"));
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/node/WorkerIdNodeTest.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/node/WorkerIdNodeTest.java
index b0fcb29d0a2..1bfbd779b90 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/node/WorkerIdNodeTest.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/node/WorkerIdNodeTest.java
@@ -23,7 +23,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 public final class WorkerIdNodeTest {
-
+    
     @Test
     public void assertGetWorkerIdGeneratorPath() {
         assertThat(WorkerIdNode.getWorkerIdGeneratorPath("instanceId"), 
is("/worker_id/instanceId"));
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/MemoryLockContext.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/MemoryLockContext.java
index e2f94bcc194..047f17c9235 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/MemoryLockContext.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/MemoryLockContext.java
@@ -39,33 +39,33 @@ public final class MemoryLockContext implements LockContext 
{
     }
     
     @Override
-    public ShardingSphereLock getOrCreateSchemaLock(final String schemaName) {
-        Preconditions.checkNotNull(schemaName, "Get or create schema lock args 
schema name can not be null.");
-        ShardingSphereLock result = locks.get(schemaName);
+    public ShardingSphereLock getOrCreateDatabaseLock(final String 
databaseName) {
+        Preconditions.checkNotNull(databaseName, "Get or create databaseName 
lock args databaseName name can not be null.");
+        ShardingSphereLock result = locks.get(databaseName);
         if (null != result) {
             return result;
         }
         synchronized (locks) {
-            result = locks.get(schemaName);
+            result = locks.get(databaseName);
             if (null != result) {
                 return result;
             }
             result = new ShardingSphereNonReentrantLock(new ReentrantLock());
-            locks.put(schemaName, result);
+            locks.put(databaseName, result);
             return result;
         }
     }
     
     @Override
-    public ShardingSphereLock getSchemaLock(final String schemaName) {
-        Preconditions.checkNotNull(schemaName, "Get schema lock args schema 
name can not be null.");
-        return locks.get(schemaName);
+    public ShardingSphereLock getDatabaseLock(final String databaseName) {
+        Preconditions.checkNotNull(databaseName, "Get database lock args 
database name can not be null.");
+        return locks.get(databaseName);
     }
     
     @Override
-    public boolean isLockedSchema(final String schemaName) {
-        Preconditions.checkNotNull(schemaName, "Is locked schema args schema 
name can not be null.");
-        ShardingSphereLock shardingSphereLock = locks.get(schemaName);
-        return null != shardingSphereLock && 
shardingSphereLock.isLocked(schemaName);
+    public boolean isLockedDatabase(final String databaseName) {
+        Preconditions.checkNotNull(databaseName, "Is locked database args 
database name can not be null.");
+        ShardingSphereLock shardingSphereLock = locks.get(databaseName);
+        return null != shardingSphereLock && 
shardingSphereLock.isLocked(databaseName);
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
index 1a1aacd32f7..f33b3c32ed6 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
@@ -39,33 +39,33 @@ public final class StandaloneLockContext implements 
LockContext {
     }
     
     @Override
-    public ShardingSphereLock getOrCreateSchemaLock(final String schemaName) {
-        Preconditions.checkNotNull(schemaName, "Get or create schema lock args 
schema name can not be null.");
-        ShardingSphereLock result = locks.get(schemaName);
+    public ShardingSphereLock getOrCreateDatabaseLock(final String 
databaseName) {
+        Preconditions.checkNotNull(databaseName, "Get or create database lock 
args database name can not be null.");
+        ShardingSphereLock result = locks.get(databaseName);
         if (null != result) {
             return result;
         }
         synchronized (locks) {
-            result = locks.get(schemaName);
+            result = locks.get(databaseName);
             if (null != result) {
                 return result;
             }
             result = new ShardingSphereNonReentrantLock(new ReentrantLock());
-            locks.put(schemaName, result);
+            locks.put(databaseName, result);
             return result;
         }
     }
     
     @Override
-    public ShardingSphereLock getSchemaLock(final String schemaName) {
-        Preconditions.checkNotNull(schemaName, "Get schema lock args schema 
name can not be null.");
-        return locks.get(schemaName);
+    public ShardingSphereLock getDatabaseLock(final String databaseName) {
+        Preconditions.checkNotNull(databaseName, "Get database lock args 
database name can not be null.");
+        return locks.get(databaseName);
     }
     
     @Override
-    public boolean isLockedSchema(final String schemaName) {
-        Preconditions.checkNotNull(schemaName, "Is locked schema args schema 
name can not be null.");
-        ShardingSphereLock shardingSphereLock = locks.get(schemaName);
-        return null != shardingSphereLock && 
shardingSphereLock.isLocked(schemaName);
+    public boolean isLockedDatabase(final String databaseName) {
+        Preconditions.checkNotNull(databaseName, "Is locked database args 
database name can not be null.");
+        ShardingSphereLock shardingSphereLock = locks.get(databaseName);
+        return null != shardingSphereLock && 
shardingSphereLock.isLocked(databaseName);
     }
 }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
index 5f3beb4b8d1..972491692c3 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
@@ -38,7 +38,7 @@ import 
org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
 import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
 import 
org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
 import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.exception.SchemaLockedException;
+import 
org.apache.shardingsphere.proxy.backend.exception.DatabaseLockedException;
 import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseCell;
 import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
 import 
org.apache.shardingsphere.proxy.backend.response.data.impl.BinaryQueryResponseCell;
@@ -219,20 +219,20 @@ public abstract class DatabaseCommunicationEngine<T> {
         return !JDBCDriverType.STATEMENT.equals(driverType);
     }
     
-    protected void checkLockedSchema(final ExecutionContext executionContext) {
-        if 
(isLockedSchema(backendConnection.getConnectionSession().getDatabaseName())) {
+    protected void checkDatabaseSchema(final ExecutionContext 
executionContext) {
+        if 
(isLockedDatabase(backendConnection.getConnectionSession().getDatabaseName())) {
             
lockedWrite(executionContext.getSqlStatementContext().getSqlStatement());
         }
     }
     
-    private boolean isLockedSchema(final String schemaName) {
-        return 
ProxyContext.getInstance().getContextManager().getInstanceContext().getLockContext().isLockedSchema(schemaName);
+    private boolean isLockedDatabase(final String databaseName) {
+        return 
ProxyContext.getInstance().getContextManager().getInstanceContext().getLockContext().isLockedDatabase(databaseName);
     }
     
     private void lockedWrite(final SQLStatement sqlStatement) {
         if (sqlStatement instanceof SelectStatement) {
             return;
         }
-        throw new 
SchemaLockedException(backendConnection.getConnectionSession().getDatabaseName());
+        throw new 
DatabaseLockedException(backendConnection.getConnectionSession().getDatabaseName());
     }
 }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
index 1ec4a95fc3e..e754e6e73f8 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
@@ -140,7 +140,7 @@ public final class JDBCDatabaseCommunicationEngine extends 
DatabaseCommunication
             return new 
UpdateResponseHeader(executionContext.getSqlStatementContext().getSqlStatement());
         }
         proxySQLExecutor.checkExecutePrerequisites(executionContext);
-        checkLockedSchema(executionContext);
+        checkDatabaseSchema(executionContext);
         List result = proxySQLExecutor.execute(executionContext);
         refreshMetaData(executionContext);
         Object executeResultSample = result.iterator().next();
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxDatabaseCommunicationEngine.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxDatabaseCommunicationEngine.java
index c03c5f4f673..12947640d2b 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxDatabaseCommunicationEngine.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxDatabaseCommunicationEngine.java
@@ -62,7 +62,7 @@ public final class VertxDatabaseCommunicationEngine extends 
DatabaseCommunicatio
                 return Future.succeededFuture(new 
UpdateResponseHeader(executionContext.getSqlStatementContext().getSqlStatement()));
             }
             
reactiveProxySQLExecutor.checkExecutePrerequisites(executionContext);
-            checkLockedSchema(executionContext);
+            checkDatabaseSchema(executionContext);
             return 
reactiveProxySQLExecutor.execute(executionContext).compose(result -> {
                 try {
                     refreshMetaData(executionContext);
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/SchemaLockedException.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/DatabaseLockedException.java
similarity index 88%
rename from 
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/SchemaLockedException.java
rename to 
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/DatabaseLockedException.java
index 7ea909e7eb1..c61996eca31 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/SchemaLockedException.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/exception/DatabaseLockedException.java
@@ -21,13 +21,13 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 /**
- * Schema locked exception.
+ * database locked exception.
  */
 @RequiredArgsConstructor
 @Getter
-public final class SchemaLockedException extends BackendException {
+public final class DatabaseLockedException extends BackendException {
     
     private static final long serialVersionUID = -5409739222950362541L;
     
-    private final String schemaName;
+    private final String databaseName;
 }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
index e30ceb276c1..49499b19374 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
@@ -29,7 +29,7 @@ import 
org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement;
 import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement;
 import org.apache.shardingsphere.infra.database.type.DatabaseType;
 import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.exception.SchemaLockedException;
+import 
org.apache.shardingsphere.proxy.backend.exception.DatabaseLockedException;
 import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
 import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
 import 
org.apache.shardingsphere.proxy.backend.text.distsql.ral.RALBackendHandlerFactory;
@@ -77,8 +77,8 @@ public final class DistSQLBackendHandlerFactory {
         if (null == databaseName) {
             return;
         }
-        if 
(ProxyContext.getInstance().getContextManager().getInstanceContext().getLockContext().isLockedSchema(databaseName))
 {
-            throw new SchemaLockedException(databaseName);
+        if 
(ProxyContext.getInstance().getContextManager().getInstanceContext().getLockContext().isLockedDatabase(databaseName))
 {
+            throw new DatabaseLockedException(databaseName);
         }
     }
 }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/err/MySQLErrPacketFactory.java
 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/err/MySQLErrPacketFactory.java
index 778ff284748..66755230b7b 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/err/MySQLErrPacketFactory.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/err/MySQLErrPacketFactory.java
@@ -32,7 +32,7 @@ import 
org.apache.shardingsphere.proxy.backend.exception.DBDropNotExistsExceptio
 import 
org.apache.shardingsphere.proxy.backend.exception.DatabaseNotExistedException;
 import 
org.apache.shardingsphere.proxy.backend.exception.NoDatabaseSelectedException;
 import 
org.apache.shardingsphere.proxy.backend.exception.RuleNotExistedException;
-import org.apache.shardingsphere.proxy.backend.exception.SchemaLockedException;
+import 
org.apache.shardingsphere.proxy.backend.exception.DatabaseLockedException;
 import 
org.apache.shardingsphere.proxy.backend.exception.TableLockWaitTimeoutException;
 import org.apache.shardingsphere.proxy.backend.exception.TableLockedException;
 import 
org.apache.shardingsphere.proxy.backend.exception.TableModifyInTransactionException;
@@ -112,9 +112,9 @@ public final class MySQLErrPacketFactory {
         if (cause instanceof RuleNotExistedException || cause instanceof 
DatabaseNotExistedException) {
             return new MySQLErrPacket(1, 
MySQLServerErrorCode.ER_SP_DOES_NOT_EXIST);
         }
-        if (cause instanceof SchemaLockedException) {
-            SchemaLockedException exception = (SchemaLockedException) cause;
-            return new MySQLErrPacket(1, CommonErrorCode.SCHEMA_WRITE_LOCKED, 
exception.getSchemaName());
+        if (cause instanceof DatabaseLockedException) {
+            DatabaseLockedException exception = (DatabaseLockedException) 
cause;
+            return new MySQLErrPacket(1, 
CommonErrorCode.DATABASE_WRITE_LOCKED, exception.getDatabaseName());
         }
         if (cause instanceof TableLockWaitTimeoutException) {
             TableLockWaitTimeoutException exception = 
(TableLockWaitTimeoutException) cause;