You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/11/27 07:26:29 UTC

[shardingsphere] branch master updated: Update openGauss SQL visitor (#22455)

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

jianglongtao 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 f6c27a7a764 Update openGauss SQL visitor (#22455)
f6c27a7a764 is described below

commit f6c27a7a764c29fb19eb36356824f2e3d324afbb
Author: Zichao <57...@users.noreply.github.com>
AuthorDate: Sun Nov 27 20:26:22 2022 +1300

    Update openGauss SQL visitor (#22455)
---
 .../distsql/parser/core/featured/FeaturedDistSQLParseASTNode.java   | 2 +-
 .../parser/core/featured/FeaturedDistSQLStatementParserEngine.java  | 2 +-
 .../core/featured/FeaturedDistSQLStatementParserFacadeFactory.java  | 6 +++---
 .../distsql/parser/core/kernel/KernelDistSQLLexer.java              | 2 +-
 .../distsql/parser/core/kernel/KernelDistSQLParser.java             | 2 +-
 .../parser/core/kernel/KernelDistSQLStatementParserEngine.java      | 2 +-
 .../distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java   | 2 +-
 .../distsql/parser/core/utility/UtilityDistSQLLexer.java            | 2 +-
 .../distsql/parser/core/utility/UtilityDistSQLParser.java           | 2 +-
 .../parser/core/utility/UtilityDistSQLStatementParserEngine.java    | 2 +-
 .../distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java | 2 +-
 .../distsql/parser/engine/api/DistSQLStatementParserEngine.java     | 2 +-
 .../parser/engine/spi/FeaturedDistSQLStatementParserFacade.java     | 2 +-
 .../shardingsphere/distsql/parser/statement/DistSQLStatement.java   | 2 +-
 .../parser/statement/ral/updatable/ApplyDistSQLStatement.java       | 2 +-
 .../parser/statement/ral/updatable/DiscardDistSQLStatement.java     | 2 +-
 .../parser/statement/ral/updatable/PrepareDistSQLStatement.java     | 2 +-
 .../distsql/parser/core/DatabaseDiscoveryDistSQLLexer.java          | 2 +-
 .../distsql/parser/core/DatabaseDiscoveryDistSQLParser.java         | 2 +-
 .../parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java       | 2 +-
 .../facade/DatabaseDiscoveryDistSQLStatementParserFacade.java       | 2 +-
 .../encrypt/distsql/parser/core/EncryptDistSQLLexer.java            | 2 +-
 .../encrypt/distsql/parser/core/EncryptDistSQLParser.java           | 2 +-
 .../encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java | 2 +-
 .../distsql/parser/facade/EncryptDistSQLStatementParserFacade.java  | 2 +-
 .../distsql/parser/core/ReadwriteSplittingDistSQLLexer.java         | 2 +-
 .../distsql/parser/core/ReadwriteSplittingDistSQLParser.java        | 2 +-
 .../parser/core/ReadwriteSplittingDistSQLStatementVisitor.java      | 2 +-
 .../facade/ReadwriteSplittingDistSQLStatementParserFacade.java      | 2 +-
 .../shadow/distsql/parser/core/ShadowDistSQLLexer.java              | 2 +-
 .../shadow/distsql/parser/core/ShadowDistSQLParser.java             | 2 +-
 .../shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java   | 2 +-
 .../distsql/parser/facade/ShadowDistSQLStatementParserFacade.java   | 2 +-
 .../sharding/distsql/parser/core/ShardingDistSQLLexer.java          | 2 +-
 .../sharding/distsql/parser/core/ShardingDistSQLParser.java         | 2 +-
 .../distsql/parser/facade/ShardingDistSQLStatementParserFacade.java | 2 +-
 .../shardingsphere/infra/distsql/exception/DistSQLException.java    | 2 +-
 .../infra/distsql/query/DatabaseDistSQLResultSet.java               | 2 +-
 .../apache/shardingsphere/infra/distsql/query/DistSQLResultSet.java | 2 +-
 .../infra/distsql/query/GlobalRuleDistSQLResultSet.java             | 2 +-
 .../authority/distsql/parser/core/AuthorityDistSQLLexer.java        | 2 +-
 .../authority/distsql/parser/core/AuthorityDistSQLParser.java       | 2 +-
 .../distsql/parser/core/AuthorityDistSQLStatementVisitor.java       | 2 +-
 .../parser/facade/AuthorityDistSQLStatementParserFacade.java        | 2 +-
 .../migration/distsql/parser/core/MigrationDistSQLLexer.java        | 2 +-
 .../distsql/parser/core/MigrationDistSQLStatementVisitor.java       | 2 +-
 .../parser/facade/MigrationDistSQLStatementParserFacade.java        | 2 +-
 .../parser/distsql/parser/core/SQLParserDistSQLLexer.java           | 2 +-
 .../parser/distsql/parser/core/SQLParserDistSQLParser.java          | 2 +-
 .../distsql/parser/core/SQLParserDistSQLStatementVisitor.java       | 2 +-
 .../parser/facade/SQLParserDistSQLStatementParserFacade.java        | 2 +-
 .../distsql/parser/core/SQLTranslatorDistSQLLexer.java              | 2 +-
 .../distsql/parser/core/SQLTranslatorDistSQLParser.java             | 2 +-
 .../distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java   | 2 +-
 .../parser/facade/SQLTranslatorDistSQLStatementParserFacade.java    | 2 +-
 .../traffic/distsql/parser/core/TrafficDistSQLLexer.java            | 2 +-
 .../traffic/distsql/parser/core/TrafficDistSQLParser.java           | 2 +-
 .../traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java | 2 +-
 .../distsql/parser/facade/TrafficDistSQLStatementParserFacade.java  | 2 +-
 .../transaction/distsql/parser/core/TransactionDistSQLLexer.java    | 2 +-
 .../transaction/distsql/parser/core/TransactionDistSQLParser.java   | 2 +-
 .../distsql/parser/core/TransactionDistSQLStatementVisitor.java     | 2 +-
 .../parser/facade/TransactionDistSQLStatementParserFacade.java      | 2 +-
 .../java/org/apache/shardingsphere/mode/manager/ContextManager.java | 2 +-
 .../proxy/backend/handler/ProxyBackendHandlerFactory.java           | 2 +-
 .../proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java | 2 +-
 .../backend/handler/distsql/ral/updatable/ApplyDistSQLHandler.java  | 2 +-
 .../handler/distsql/ral/updatable/DiscardDistSQLHandler.java        | 2 +-
 .../handler/distsql/ral/updatable/PrepareDistSQLHandler.java        | 2 +-
 .../proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java  | 2 +-
 .../proxy/backend/handler/transaction/TransactionXAHandler.java     | 2 +-
 .../parser/jaxb/statement/ral/ApplyDistSQLStatementTestCase.java    | 2 +-
 .../parser/jaxb/statement/ral/DiscardDistSQLStatementTestCase.java  | 2 +-
 .../parser/jaxb/statement/ral/PrepareDistSQLStatementTestCase.java  | 2 +-
 74 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLParseASTNode.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLParseASTNode.java
index 1ed658c5efd..a1b8d81e941 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLParseASTNode.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLParseASTNode.java
@@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * Featured dist SQL parse AST node.
+ * Featured DistSQL parse AST node.
  */
 @RequiredArgsConstructor
 @Getter
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java
index 19dce70a39e..add15f12701 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
 /**
- * Featured dist SQL statement parser engine.
+ * Featured DistSQL statement parser engine.
  */
 public final class FeaturedDistSQLStatementParserEngine {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserFacadeFactory.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserFacadeFactory.java
index bb28ceeb02c..96ac003b5d4 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserFacadeFactory.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserFacadeFactory.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPIRegistry;
 import java.util.Collection;
 
 /**
- * Featured dist SQL statement parser facade factory.
+ * Featured DistSQL statement parser facade factory.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class FeaturedDistSQLStatementParserFacadeFactory {
@@ -36,7 +36,7 @@ public final class FeaturedDistSQLStatementParserFacadeFactory {
     }
     
     /**
-     * Get instance of featured dist SQL statement parser facade.
+     * Get instance of featured DistSQL statement parser facade.
      * 
      * @param type feature type
      * @return got instance
@@ -46,7 +46,7 @@ public final class FeaturedDistSQLStatementParserFacadeFactory {
     }
     
     /**
-     * Get all instances of featured dist SQL statement parser facade.
+     * Get all instances of featured DistSQL statement parser facade.
      * 
      * @return got instances
      */
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLLexer.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLLexer.java
index b9aa74f5d53..750b0b80b18 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLLexer.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementLe
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for kernel dist SQL.
+ * SQL lexer for kernel DistSQL.
  */
 public final class KernelDistSQLLexer extends KernelDistSQLStatementLexer implements SQLLexer {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLParser.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLParser.java
index 45f485b457d..69b1c8c591e 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLParser.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for kernel dist SQL.
+ * SQL parser for kernel DistSQL.
  */
 public final class KernelDistSQLParser extends KernelDistSQLStatementParser implements SQLParser {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementParserEngine.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementParserEngine.java
index 3eedc6f2390..13877a147b6 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementParserEngine.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementParserEngine.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
 /**
- * SQL statement parser engine for kernel dist SQL.
+ * SQL statement parser engine for kernel DistSQL.
  */
 public final class KernelDistSQLStatementParserEngine {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
index 3894219d473..0bd2aeeb029 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
@@ -114,7 +114,7 @@ import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
- * SQL statement visitor for kernel dist SQL.
+ * SQL statement visitor for kernel DistSQL.
  */
 public final class KernelDistSQLStatementVisitor extends KernelDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLLexer.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLLexer.java
index 2e9e1147ac0..fe664ced363 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLLexer.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.UtilityDistSQLStatementL
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for utility dist SQL.
+ * SQL lexer for utility DistSQL.
  */
 public final class UtilityDistSQLLexer extends UtilityDistSQLStatementLexer implements SQLLexer {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLParser.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLParser.java
index 0c5e954a513..e6d132fc0c0 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLParser.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for utility dist SQL.
+ * SQL parser for utility DistSQL.
  */
 public final class UtilityDistSQLParser extends UtilityDistSQLStatementParser implements SQLParser {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementParserEngine.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementParserEngine.java
index b8b7b2c38e9..8208143268f 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementParserEngine.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementParserEngine.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
 /**
- * SQL statement parser engine for utility dist SQL.
+ * SQL statement parser engine for utility DistSQL.
  */
 public final class UtilityDistSQLStatementParserEngine {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
index f37e8fd3700..3e30e5fd50e 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL statement visitor for utility Dist SQL.
+ * SQL statement visitor for utility DistSQL.
  */
 public final class UtilityDistSQLStatementVisitor extends UtilityDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/api/DistSQLStatementParserEngine.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/api/DistSQLStatementParserEngine.java
index 6b9b83f71f3..9c9191d4c2e 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/api/DistSQLStatementParserEngine.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/api/DistSQLStatementParserEngine.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
 /**
- * Dist SQL statement parser engine.
+ * DistSQL statement parser engine.
  */
 public final class DistSQLStatementParserEngine {
     
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java
index fbd87b6a6e9..1cf1f4372c8 100644
--- a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java
+++ b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 import org.apache.shardingsphere.sql.parser.spi.SQLParserFacade;
 
 /**
- * Featured dist SQL statement parser facade.
+ * Featured DistSQL statement parser facade.
  */
 @SingletonSPI
 public interface FeaturedDistSQLStatementParserFacade extends SQLParserFacade {
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java
index d0b132f26c4..919d8dfac75 100644
--- a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java
+++ b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.distsql.parser.statement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStatement;
 
 /**
- * Dist SQL Statement.
+ * DistSQL Statement.
  */
 public abstract class DistSQLStatement extends AbstractSQLStatement {
 }
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ApplyDistSQLStatement.java b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ApplyDistSQLStatement.java
index 2b7143aebe6..0f20d86471e 100644
--- a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ApplyDistSQLStatement.java
+++ b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ApplyDistSQLStatement.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.distsql.parser.statement.ral.updatable;
 import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement;
 
 /**
- * Apply Dist SQL statement.
+ * Apply DistSQL statement.
  */
 public final class ApplyDistSQLStatement extends UpdatableRALStatement {
 }
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/DiscardDistSQLStatement.java b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/DiscardDistSQLStatement.java
index 564df550745..e72d852130c 100644
--- a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/DiscardDistSQLStatement.java
+++ b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/DiscardDistSQLStatement.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.distsql.parser.statement.ral.updatable;
 import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement;
 
 /**
- * Discard Dist SQL statement.
+ * Discard DistSQL statement.
  */
 public final class DiscardDistSQLStatement extends UpdatableRALStatement {
 }
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/PrepareDistSQLStatement.java b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/PrepareDistSQLStatement.java
index 969ca01cd07..eae503b9e9f 100644
--- a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/PrepareDistSQLStatement.java
+++ b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/PrepareDistSQLStatement.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.distsql.parser.statement.ral.updatable;
 import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement;
 
 /**
- * Prepare Dist SQL statement.
+ * Prepare DistSQL statement.
  */
 public final class PrepareDistSQLStatement extends UpdatableRALStatement {
 }
diff --git a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLLexer.java b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLLexer.java
index bc8667b963f..11ffb8e0119 100644
--- a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLLexer.java
+++ b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQL
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for database discovery dist SQL.
+ * SQL lexer for database discovery DistSQL.
  */
 public final class DatabaseDiscoveryDistSQLLexer extends DatabaseDiscoveryDistSQLStatementLexer implements SQLLexer {
     
diff --git a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLParser.java b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLParser.java
index fcda4d86b82..26809d949f9 100644
--- a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLParser.java
+++ b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for database discovery dist SQL.
+ * SQL parser for database discovery DistSQL.
  */
 public final class DatabaseDiscoveryDistSQLParser extends DatabaseDiscoveryDistSQLStatementParser implements SQLParser {
     
diff --git a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
index 64445fc161c..3ec641bc0ef 100644
--- a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
+++ b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
@@ -57,7 +57,7 @@ import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
- * SQL statement visitor for database discovery dist SQL.
+ * SQL statement visitor for database discovery DistSQL.
  */
 public final class DatabaseDiscoveryDistSQLStatementVisitor extends DatabaseDiscoveryDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/facade/DatabaseDiscoveryDistSQLStatementParserFacade.java b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/facade/DatabaseDiscoveryDistSQLStatementParserFacade.java
index ca374f7c02d..73c042a8e35 100644
--- a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/facade/DatabaseDiscoveryDistSQLStatementParserFacade.java
+++ b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/facade/DatabaseDiscoveryDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL parser facade for database discovery dist SQL statement.
+ * SQL parser facade for database discovery DistSQL statement.
  */
 public final class DatabaseDiscoveryDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLLexer.java b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLLexer.java
index 02f97036289..4477e69e20c 100644
--- a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLLexer.java
+++ b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementL
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for encrypt dist SQL.
+ * SQL lexer for encrypt DistSQL.
  */
 public final class EncryptDistSQLLexer extends EncryptDistSQLStatementLexer implements SQLLexer {
     
diff --git a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLParser.java b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLParser.java
index ed73789816d..e31056a3809 100644
--- a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLParser.java
+++ b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for encrypt dist SQL.
+ * SQL parser for encrypt DistSQL.
  */
 public final class EncryptDistSQLParser extends EncryptDistSQLStatementParser implements SQLParser {
     
diff --git a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
index fea69ed5a7a..0d301a8d081 100644
--- a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
+++ b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
@@ -53,7 +53,7 @@ import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
- * SQL statement visitor for encrypt dist SQL.
+ * SQL statement visitor for encrypt DistSQL.
  */
 public final class EncryptDistSQLStatementVisitor extends EncryptDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLStatementParserFacade.java b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLStatementParserFacade.java
index 400ece86fdb..0b432f7ed2a 100644
--- a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLStatementParserFacade.java
+++ b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL parser facade for encrypt dist SQL statement.
+ * SQL parser facade for encrypt DistSQL statement.
  */
 public final class EncryptDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLLexer.java b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLLexer.java
index f49489dcfbc..bf9adbb83e2 100644
--- a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLLexer.java
+++ b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQ
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for readwrite-splitting dist SQL.
+ * SQL lexer for readwrite-splitting DistSQL.
  */
 public final class ReadwriteSplittingDistSQLLexer extends ReadwriteSplittingDistSQLStatementLexer implements SQLLexer {
     
diff --git a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLParser.java b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLParser.java
index df5e32528de..c2299ebf145 100644
--- a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLParser.java
+++ b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for readwrite-splitting dist SQL.
+ * SQL parser for readwrite-splitting DistSQL.
  */
 public final class ReadwriteSplittingDistSQLParser extends ReadwriteSplittingDistSQLStatementParser implements SQLParser {
     
diff --git a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
index 633338d2015..b013904efbb 100644
--- a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
+++ b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
@@ -57,7 +57,7 @@ import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
- * SQL statement visitor for readwrite-splitting dist SQL.
+ * SQL statement visitor for readwrite-splitting DistSQL.
  */
 public final class ReadwriteSplittingDistSQLStatementVisitor extends ReadwriteSplittingDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLStatementParserFacade.java b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLStatementParserFacade.java
index a21162b3e5f..e6ff44d1de7 100644
--- a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLStatementParserFacade.java
+++ b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL parser facade for readwrite-splitting dist SQL statement.
+ * SQL parser facade for readwrite-splitting DistSQL statement.
  */
 public final class ReadwriteSplittingDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLLexer.java b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLLexer.java
index 73a903c1ef5..1e1e1ac912d 100644
--- a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLLexer.java
+++ b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementLe
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for shadow dist SQL.
+ * SQL lexer for shadow DistSQL.
  */
 public final class ShadowDistSQLLexer extends ShadowDistSQLStatementLexer implements SQLLexer {
     
diff --git a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLParser.java b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLParser.java
index 5ae59622f1f..155d5489c0d 100644
--- a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLParser.java
+++ b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for shadow dist SQL.
+ * SQL parser for shadow DistSQL.
  */
 public final class ShadowDistSQLParser extends ShadowDistSQLStatementParser implements SQLParser {
     
diff --git a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
index fd7923bc060..0d09d6e444d 100644
--- a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
+++ b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
@@ -67,7 +67,7 @@ import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
- * SQL statement visitor for shadow dist SQL.
+ * SQL statement visitor for shadow DistSQL.
  */
 public final class ShadowDistSQLStatementVisitor extends ShadowDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLStatementParserFacade.java b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLStatementParserFacade.java
index 2c02b32d64b..55e684dddeb 100644
--- a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLStatementParserFacade.java
+++ b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL parser facade for shadow dist SQL statement.
+ * SQL parser facade for shadow DistSQL statement.
  */
 public final class ShadowDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLLexer.java b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLLexer.java
index 3cd4f2fd8e9..9c31de1aa63 100644
--- a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLLexer.java
+++ b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatement
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for sharding dist SQL.
+ * SQL lexer for sharding DistSQL.
  */
 public final class ShardingDistSQLLexer extends ShardingDistSQLStatementLexer implements SQLLexer {
     
diff --git a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLParser.java b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLParser.java
index 7a45e3bdf12..e734e52cd58 100644
--- a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLParser.java
+++ b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for sharding dist SQL.
+ * SQL parser for sharding DistSQL.
  */
 public final class ShardingDistSQLParser extends ShardingDistSQLStatementParser implements SQLParser {
     
diff --git a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLStatementParserFacade.java b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLStatementParserFacade.java
index afd1b27dd24..43fed9e1441 100644
--- a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLStatementParserFacade.java
+++ b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL parser facade for sharding dist SQL statement.
+ * SQL parser facade for sharding DistSQL statement.
  */
 public final class ShardingDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/DistSQLException.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/DistSQLException.java
index 783e5f1a9aa..9535f395460 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/DistSQLException.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/DistSQLException.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.SQLS
 import org.apache.shardingsphere.infra.util.exception.external.sql.type.kernel.KernelSQLException;
 
 /**
- * Dist SQL exception.
+ * DistSQL exception.
  */
 public abstract class DistSQLException extends KernelSQLException {
     
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/DatabaseDistSQLResultSet.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/DatabaseDistSQLResultSet.java
index c0d162ca03d..4356e8d34dc 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/DatabaseDistSQLResultSet.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/DatabaseDistSQLResultSet.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
 /**
- * Dist SQL result set for database.
+ * DistSQL result set for database.
  */
 public interface DatabaseDistSQLResultSet extends DistSQLResultSet {
     
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/DistSQLResultSet.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/DistSQLResultSet.java
index 2a1e1fca3fd..1af0f6d901d 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/DistSQLResultSet.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/DistSQLResultSet.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
 import java.util.Collection;
 
 /**
- * Dist SQL result set.
+ * DistSQL result set.
  */
 public interface DistSQLResultSet extends TypedSPI {
     
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/GlobalRuleDistSQLResultSet.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/GlobalRuleDistSQLResultSet.java
index 9accabf3cee..009d5353b44 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/GlobalRuleDistSQLResultSet.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/distsql/query/GlobalRuleDistSQLResultSet.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
 /**
- * Dist SQL result set for global rule.
+ * DistSQL result set for global rule.
  */
 public interface GlobalRuleDistSQLResultSet extends DistSQLResultSet {
     
diff --git a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLLexer.java b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLLexer.java
index a982ee01bf4..a8d90f4edb5 100644
--- a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLLexer.java
+++ b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.AuthorityDistSQLStatemen
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for authority dist SQL.
+ * SQL lexer for authority DistSQL.
  */
 public final class AuthorityDistSQLLexer extends AuthorityDistSQLStatementLexer implements SQLLexer {
     
diff --git a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLParser.java b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLParser.java
index d0e1516b939..c1da9d9c8e9 100644
--- a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLParser.java
+++ b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for authority dist SQL.
+ * SQL parser for authority DistSQL.
  */
 public final class AuthorityDistSQLParser extends AuthorityDistSQLStatementParser implements SQLParser {
     
diff --git a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java
index 66fd1d87e75..00afd0fdfc5 100644
--- a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java
+++ b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL statement visitor for authority dist SQL.
+ * SQL statement visitor for authority DistSQL.
  */
 public final class AuthorityDistSQLStatementVisitor extends AuthorityDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLStatementParserFacade.java b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLStatementParserFacade.java
index 8e89d8223c0..62e30c15cc6 100644
--- a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLStatementParserFacade.java
+++ b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL parser facade for authority dist SQL statement.
+ * SQL parser facade for authority DistSQL statement.
  */
 public final class AuthorityDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLLexer.java b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLLexer.java
index 4ec464ec7e3..fa793e5a083 100644
--- a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLLexer.java
+++ b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.MigrationDistSQLStatemen
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for migration dist SQL.
+ * SQL lexer for migration DistSQL.
  */
 public final class MigrationDistSQLLexer extends MigrationDistSQLStatementLexer implements SQLLexer {
     
diff --git a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
index 40c00b666a6..25258241a20 100644
--- a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
+++ b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
@@ -71,7 +71,7 @@ import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
- * SQL statement visitor for migration dist SQL.
+ * SQL statement visitor for migration DistSQL.
  */
 public final class MigrationDistSQLStatementVisitor extends MigrationDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/facade/MigrationDistSQLStatementParserFacade.java b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/facade/MigrationDistSQLStatementParserFacade.java
index 73a6db6a74a..6bf89499990 100644
--- a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/facade/MigrationDistSQLStatementParserFacade.java
+++ b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/facade/MigrationDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL parser facade for migration dist SQL statement.
+ * SQL parser facade for migration DistSQL statement.
  */
 public final class MigrationDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLLexer.java b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLLexer.java
index dbf389ac3d2..924f8f501e6 100644
--- a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLLexer.java
+++ b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.SQLParserDistSQLStatemen
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for SQL parser dist SQL.
+ * SQL lexer for SQL parser DistSQL.
  */
 public final class SQLParserDistSQLLexer extends SQLParserDistSQLStatementLexer implements SQLLexer {
     
diff --git a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLParser.java b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLParser.java
index 63cae890c9c..f98cf4959b6 100644
--- a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLParser.java
+++ b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for SQL parser dist SQL.
+ * SQL parser for SQL parser DistSQL.
  */
 public final class SQLParserDistSQLParser extends SQLParserDistSQLStatementParser implements SQLParser {
     
diff --git a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java
index d0982e6696d..9b11c1a17a5 100644
--- a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java
+++ b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
 
 /**
- * SQL statement visitor for SQL parser dist SQL.
+ * SQL statement visitor for SQL parser DistSQL.
  */
 public final class SQLParserDistSQLStatementVisitor extends SQLParserDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLStatementParserFacade.java b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLStatementParserFacade.java
index 3038028ef13..7c2077175b1 100644
--- a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLStatementParserFacade.java
+++ b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 
 /**
- * SQL parser facade for SQL parser dist SQL statement.
+ * SQL parser facade for SQL parser DistSQL statement.
  */
 public final class SQLParserDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLLexer.java b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLLexer.java
index 3246cd19dc1..b2754f4c1ef 100644
--- a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLLexer.java
+++ b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.SQLTranslatorDistSQLStat
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for SQL translator dist SQL.
+ * SQL lexer for SQL translator DistSQL.
  */
 public final class SQLTranslatorDistSQLLexer extends SQLTranslatorDistSQLStatementLexer implements SQLLexer {
     
diff --git a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLParser.java b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLParser.java
index a75b4d9d4ff..b9fadc905cc 100644
--- a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLParser.java
+++ b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for SQL translator dist SQL.
+ * SQL parser for SQL translator DistSQL.
  */
 public final class SQLTranslatorDistSQLParser extends SQLTranslatorDistSQLStatementParser implements SQLParser {
     
diff --git a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java
index e436dbbac85..72427c8b964 100644
--- a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java
+++ b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
 import org.apache.shardingsphere.sqltranslator.distsql.parser.statement.ShowSQLTranslatorRuleStatement;
 
 /**
- * SQL statement visitor for SQL translator dist SQL.
+ * SQL statement visitor for SQL translator DistSQL.
  */
 public final class SQLTranslatorDistSQLStatementVisitor extends SQLTranslatorDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLStatementParserFacade.java b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLStatementParserFacade.java
index 38c45fbfbe5..21f71f80d89 100644
--- a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLStatementParserFacade.java
+++ b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sqltranslator.distsql.parser.core.SQLTranslator
 import org.apache.shardingsphere.sqltranslator.distsql.parser.core.SQLTranslatorDistSQLStatementVisitor;
 
 /**
- * SQL parser facade for SQL translator dist SQL statement.
+ * SQL parser facade for SQL translator DistSQL statement.
  */
 public final class SQLTranslatorDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLLexer.java b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLLexer.java
index 90f330f88c9..541ed332f20 100644
--- a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLLexer.java
+++ b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.TrafficDistSQLStatementL
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for traffic dist SQL.
+ * SQL lexer for traffic DistSQL.
  */
 public final class TrafficDistSQLLexer extends TrafficDistSQLStatementLexer implements SQLLexer {
     
diff --git a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLParser.java b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLParser.java
index 8b9e83e2766..5090548d1f3 100644
--- a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLParser.java
+++ b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for traffic dist SQL.
+ * SQL parser for traffic DistSQL.
  */
 public final class TrafficDistSQLParser extends TrafficDistSQLStatementParser implements SQLParser {
     
diff --git a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
index 9c5a27ce9a0..f3e63116c66 100644
--- a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
+++ b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
@@ -45,7 +45,7 @@ import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
- * SQL statement visitor for traffic dist SQL.
+ * SQL statement visitor for traffic DistSQL.
  */
 public final class TrafficDistSQLStatementVisitor extends TrafficDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLStatementParserFacade.java b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLStatementParserFacade.java
index 5b7a54dc21b..0d6b03ae0cf 100644
--- a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLStatementParserFacade.java
+++ b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.traffic.distsql.parser.core.TrafficDistSQLParse
 import org.apache.shardingsphere.traffic.distsql.parser.core.TrafficDistSQLStatementVisitor;
 
 /**
- * SQL parser facade for traffic dist SQL statement.
+ * SQL parser facade for traffic DistSQL statement.
  */
 public final class TrafficDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLLexer.java b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLLexer.java
index c760b79912b..09232b868a1 100644
--- a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLLexer.java
+++ b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLLexer.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.TransactionDistSQLStatem
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 
 /**
- * SQL lexer for transaction dist SQL.
+ * SQL lexer for transaction DistSQL.
  */
 public final class TransactionDistSQLLexer extends TransactionDistSQLStatementLexer implements SQLLexer {
     
diff --git a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLParser.java b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLParser.java
index a8f0406f15f..6b3a1c313f4 100644
--- a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLParser.java
+++ b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLParser.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 
 /**
- * SQL parser for transaction dist SQL.
+ * SQL parser for transaction DistSQL.
  */
 public final class TransactionDistSQLParser extends TransactionDistSQLStatementParser implements SQLParser {
     
diff --git a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java
index 733d1f5006c..ba455d5015b 100644
--- a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java
+++ b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.transaction.distsql.parser.statement.queryable.
 import java.util.Properties;
 
 /**
- * SQL statement visitor for transaction dist SQL.
+ * SQL statement visitor for transaction DistSQL.
  */
 public final class TransactionDistSQLStatementVisitor extends TransactionDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
     
diff --git a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLStatementParserFacade.java b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLStatementParserFacade.java
index 1d932eccbf7..e886eed0eed 100644
--- a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLStatementParserFacade.java
+++ b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLStatementParserFacade.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.transaction.distsql.parser.core.TransactionDist
 import org.apache.shardingsphere.transaction.distsql.parser.core.TransactionDistSQLStatementVisitor;
 
 /**
- * SQL parser facade for transaction dist SQL statement.
+ * SQL parser facade for transaction DistSQL statement.
  */
 public final class TransactionDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
     
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index d3c5434eef9..67aa1486bc3 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -292,7 +292,7 @@ public final class ContextManager implements AutoCloseable {
      * @throws SQLException SQL exception
      */
     public synchronized void dropResources(final String databaseName, final Collection<String> toBeDroppedResourceNames) throws SQLException {
-        // TODO should check to be dropped resources are unused here. ContextManager is atomic domain to maintain metadata, not Dist SQL handler
+        // TODO should check to be dropped resources are unused here. ContextManager is atomic domain to maintain metadata, not DistSQL handler
         Map<String, DataSourceProperties> dataSourcePropsMap = metaDataContexts.getPersistService().getDataSourceService().load(metaDataContexts.getMetaData().getActualDatabaseName(databaseName));
         Map<String, DataSourceProperties> toBeDeletedDataSourcePropsMap = getToBeDeletedDataSourcePropsMap(dataSourcePropsMap, toBeDroppedResourceNames);
         SwitchingResource switchingResource =
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
index 227c5fa5981..71cee34a36b 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
@@ -167,7 +167,7 @@ public final class ProxyBackendHandlerFactory {
     
     private static void checkUnsupportedDistSQLStatementInTransaction(final SQLStatement sqlStatement, final ConnectionSession connectionSession) {
         ShardingSpherePreconditions.checkState(!connectionSession.getTransactionStatus().isInTransaction() || isSupportedDistSQLStatementInTransaction(sqlStatement),
-                () -> new UnsupportedSQLOperationException("Non-query dist sql is not supported within a transaction"));
+                () -> new UnsupportedSQLOperationException("Non-query DistSQL is not supported within a transaction"));
     }
     
     private static boolean isSupportedDistSQLStatementInTransaction(final SQLStatement sqlStatement) {
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
index 6012382cb10..9f4bd7c3b47 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
@@ -41,7 +41,7 @@ public final class DistSQLBackendHandlerFactory {
     /**
      * Create new instance of DistSQL backend handler.
      *
-     * @param sqlStatement dist SQL statement
+     * @param sqlStatement DistSQL statement
      * @param connectionSession connection session
      * @return proxy backend handler
      */
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ApplyDistSQLHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ApplyDistSQLHandler.java
index 1ae1ded4fed..32c65ca5ac0 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ApplyDistSQLHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ApplyDistSQLHandler.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
 
 /**
- * Apply dist SQL statement handler.
+ * Apply DistSQL statement handler.
  */
 public final class ApplyDistSQLHandler extends UpdatableRALBackendHandler<ApplyDistSQLStatement> {
     
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/DiscardDistSQLHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/DiscardDistSQLHandler.java
index dc719ca830b..f566d2100b4 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/DiscardDistSQLHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/DiscardDistSQLHandler.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
 
 /**
- * Discard dist SQL statement handler.
+ * Discard DistSQL statement handler.
  */
 public final class DiscardDistSQLHandler extends UpdatableRALBackendHandler<DiscardDistSQLStatement> {
     
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/PrepareDistSQLHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/PrepareDistSQLHandler.java
index b3cde729f15..41dd2d08642 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/PrepareDistSQLHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/PrepareDistSQLHandler.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
 
 /**
- * Prepare dist SQL statement handler.
+ * Prepare DistSQL statement handler.
  */
 public final class PrepareDistSQLHandler extends UpdatableRALBackendHandler<PrepareDistSQLStatement> {
     
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java
index 89ba0ee15a2..9e617ba5457 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java
@@ -30,7 +30,7 @@ import java.util.Collection;
 import java.util.Collections;
 
 /**
- * Parse Dist SQL handler.
+ * Parse DistSQL handler.
  */
 public final class ParseDistSQLHandler extends SQLRULBackendHandler<ParseStatement> {
     
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionXAHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionXAHandler.java
index 741dcc1789e..d38bca135b4 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionXAHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionXAHandler.java
@@ -37,7 +37,7 @@ import java.util.Collections;
 
 /**
  * XA transaction handler.
- * TODO Currently XA transaction started with `XA START` doesn't support for database with multiple datasource, a flag should be added for this both in init progress and add datasource from distSQL.
+ * TODO Currently XA transaction started with `XA START` doesn't support for database with multiple datasource, a flag should be added for this both in init progress and add datasource from DistSQL.
  */
 @RequiredArgsConstructor
 public final class TransactionXAHandler implements ProxyBackendHandler {
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/ApplyDistSQLStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/ApplyDistSQLStatementTestCase.java
index c689daa9914..9ad2e6bf7ac 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/ApplyDistSQLStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/ApplyDistSQLStatementTestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.jaxb.sta
 import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
 
 /**
- * Apply Dist SQL statement test case.
+ * Apply DistSQL statement test case.
  */
 public final class ApplyDistSQLStatementTestCase extends SQLParserTestCase {
 }
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/DiscardDistSQLStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/DiscardDistSQLStatementTestCase.java
index ac3b235dc0c..9e9ce53fb80 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/DiscardDistSQLStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/DiscardDistSQLStatementTestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.jaxb.sta
 import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
 
 /**
- * Discard Dist SQL statement test case.
+ * Discard DistSQL statement test case.
  */
 public final class DiscardDistSQLStatementTestCase extends SQLParserTestCase {
 }
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/PrepareDistSQLStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/PrepareDistSQLStatementTestCase.java
index d46a6085358..819d3b6d68e 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/PrepareDistSQLStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/statement/ral/PrepareDistSQLStatementTestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.sql.parser.internal.cases.parser.jaxb.sta
 import org.apache.shardingsphere.test.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
 
 /**
- * Prepare dist sql statement test case.
+ * Prepare DistSQL statement test case.
  */
 public final class PrepareDistSQLStatementTestCase extends SQLParserTestCase {
 }