You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/05/11 06:31:46 UTC

[shardingsphere] branch master updated: Move shardingsphere-dist-parser into sharding-parse (#25573)

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

panjuan 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 d5dce21c750 Move shardingsphere-dist-parser into sharding-parse (#25573)
d5dce21c750 is described below

commit d5dce21c750414e8d55072a239d478e987ff72ee
Author: Raigor <ra...@gmail.com>
AuthorDate: Thu May 11 14:31:32 2023 +0800

    Move shardingsphere-dist-parser into sharding-parse (#25573)
    
    * Move shardingsphere-dist-parser into sharding-parse
    
    * Remove unnecessary dependency declarations
---
 agent/plugins/metrics/core/pom.xml                           |  2 +-
 .../packet/command/PostgreSQLCommandPacketFactoryTest.java   |  4 ++--
 distsql/pom.xml                                              |  2 --
 features/encrypt/distsql/parser/pom.xml                      |  2 +-
 features/encrypt/distsql/statement/pom.xml                   |  2 +-
 features/mask/distsql/parser/pom.xml                         |  2 +-
 features/mask/distsql/statement/pom.xml                      |  2 +-
 features/readwrite-splitting/distsql/parser/pom.xml          |  2 +-
 features/readwrite-splitting/distsql/statement/pom.xml       |  2 +-
 features/shadow/distsql/parser/pom.xml                       |  2 +-
 features/shadow/distsql/statement/pom.xml                    |  2 +-
 features/sharding/distsql/parser/pom.xml                     |  2 +-
 features/sharding/distsql/statement/pom.xml                  |  2 +-
 infra/context/pom.xml                                        |  2 +-
 infra/parser/pom.xml                                         |  2 +-
 kernel/authority/distsql/parser/pom.xml                      |  2 +-
 kernel/authority/distsql/statement/pom.xml                   |  2 +-
 kernel/data-pipeline/distsql/parser/pom.xml                  |  2 +-
 kernel/data-pipeline/distsql/statement/pom.xml               |  2 +-
 kernel/global-clock/distsql/parser/pom.xml                   |  2 +-
 kernel/global-clock/distsql/statement/pom.xml                |  2 +-
 kernel/sql-parser/distsql/parser/pom.xml                     |  2 +-
 kernel/sql-parser/distsql/statement/pom.xml                  |  2 +-
 kernel/sql-translator/distsql/parser/pom.xml                 |  2 +-
 kernel/sql-translator/distsql/statement/pom.xml              |  2 +-
 kernel/traffic/distsql/parser/pom.xml                        |  2 +-
 kernel/traffic/distsql/statement/pom.xml                     |  2 +-
 kernel/transaction/distsql/parser/pom.xml                    |  2 +-
 kernel/transaction/distsql/statement/pom.xml                 |  2 +-
 {distsql/parser => parser/distsql/engine}/pom.xml            |  6 +++---
 .../distsql/engine}/src/main/antlr4/imports/Alphabet.g4      |  0
 .../distsql/engine}/src/main/antlr4/imports/BaseRule.g4      |  0
 .../distsql/engine}/src/main/antlr4/imports/Keyword.g4       |  0
 .../distsql/engine}/src/main/antlr4/imports/Literals.g4      |  0
 .../distsql/engine}/src/main/antlr4/imports/RALStatement.g4  |  0
 .../distsql/engine}/src/main/antlr4/imports/RDLStatement.g4  |  0
 .../distsql/engine}/src/main/antlr4/imports/RQLStatement.g4  |  0
 .../distsql/engine}/src/main/antlr4/imports/RULKeyword.g4    |  0
 .../distsql/engine}/src/main/antlr4/imports/RULStatement.g4  |  0
 .../distsql/engine}/src/main/antlr4/imports/Symbol.g4        |  0
 .../distsql/parser/autogen/KernelDistSQLStatement.g4         |  0
 .../distsql/parser/autogen/UtilityDistSQLStatement.g4        |  0
 .../parser/core/featured/FeaturedDistSQLParseASTNode.java    |  0
 .../core/featured/FeaturedDistSQLStatementParserEngine.java  |  0
 .../distsql/parser/core/kernel/KernelDistSQLLexer.java       |  0
 .../distsql/parser/core/kernel/KernelDistSQLParser.java      |  0
 .../core/kernel/KernelDistSQLStatementParserEngine.java      |  0
 .../parser/core/kernel/KernelDistSQLStatementVisitor.java    |  0
 .../distsql/parser/core/utility/UtilityDistSQLLexer.java     |  0
 .../distsql/parser/core/utility/UtilityDistSQLParser.java    |  0
 .../core/utility/UtilityDistSQLStatementParserEngine.java    |  0
 .../parser/core/utility/UtilityDistSQLStatementVisitor.java  |  0
 .../parser/engine/api/DistSQLStatementParserEngine.java      |  0
 .../engine/spi/FeaturedDistSQLStatementParserFacade.java     |  0
 .../distsql/parser/rdl/RegisterStorageUnitTest.java          |  0
 {distsql => parser/distsql}/pom.xml                          |  7 +++----
 {distsql => parser/distsql}/statement/pom.xml                |  4 ++--
 .../distsql/parser/segment/AlgorithmSegment.java             |  0
 .../distsql/parser/segment/DataSourceSegment.java            |  0
 .../segment/HostnameAndPortBasedDataSourceSegment.java       |  0
 .../parser/segment/InventoryIncrementalRuleSegment.java      |  0
 .../distsql/parser/segment/ReadOrWriteSegment.java           |  0
 .../distsql/parser/segment/URLBasedDataSourceSegment.java    |  0
 .../segment/converter/DataSourceSegmentsConverter.java       |  0
 .../distsql/parser/statement/DistSQLStatement.java           |  0
 .../distsql/parser/statement/ral/FeaturedRALStatement.java   |  0
 .../distsql/parser/statement/ral/QueryableRALStatement.java  |  0
 .../distsql/parser/statement/ral/RALStatement.java           |  0
 .../statement/ral/UpdatableGlobalRuleRALStatement.java       |  0
 .../distsql/parser/statement/ral/UpdatableRALStatement.java  |  0
 .../parser/statement/ral/pipeline/PipelineRALStatement.java  |  0
 .../ral/pipeline/QueryablePipelineRALStatement.java          |  0
 .../ral/pipeline/UpdatablePipelineRALStatement.java          |  0
 .../parser/statement/ral/pipeline/cdc/CDCRALStatement.java   |  0
 .../statement/ral/pipeline/cdc/QueryableCDCRALStatement.java |  0
 .../statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java |  0
 .../ral/pipeline/migration/MigrationRALStatement.java        |  0
 .../pipeline/migration/QueryableMigrationRALStatement.java   |  0
 .../pipeline/migration/UpdatableMigrationRALStatement.java   |  0
 .../ral/queryable/ConvertYamlConfigurationStatement.java     |  0
 .../ral/queryable/ExportDatabaseConfigurationStatement.java  |  0
 .../statement/ral/queryable/ExportMetaDataStatement.java     |  0
 .../statement/ral/queryable/ExportStorageNodesStatement.java |  0
 .../ral/queryable/ShowComputeNodeInfoStatement.java          |  0
 .../ral/queryable/ShowComputeNodeModeStatement.java          |  0
 .../statement/ral/queryable/ShowComputeNodesStatement.java   |  0
 .../statement/ral/queryable/ShowDistVariableStatement.java   |  0
 .../statement/ral/queryable/ShowDistVariablesStatement.java  |  0
 .../statement/ral/queryable/ShowMigrationRuleStatement.java  |  0
 .../statement/ral/queryable/ShowTableMetaDataStatement.java  |  0
 .../statement/ral/updatable/AlterComputeNodeStatement.java   |  0
 .../updatable/AlterInventoryIncrementalRuleStatement.java    |  0
 .../ral/updatable/ImportDatabaseConfigurationStatement.java  |  0
 .../statement/ral/updatable/ImportMetaDataStatement.java     |  0
 .../statement/ral/updatable/LabelComputeNodeStatement.java   |  0
 .../parser/statement/ral/updatable/LockClusterStatement.java |  0
 .../ral/updatable/RefreshDatabaseMetaDataStatement.java      |  0
 .../ral/updatable/RefreshTableMetaDataStatement.java         |  0
 .../statement/ral/updatable/SetDistVariableStatement.java    |  0
 .../statement/ral/updatable/SetInstanceStatusStatement.java  |  0
 .../statement/ral/updatable/UnlabelComputeNodeStatement.java |  0
 .../statement/ral/updatable/UnlockClusterStatement.java      |  0
 .../distsql/parser/statement/rdl/RDLStatement.java           |  0
 .../parser/statement/rdl/RuleDefinitionStatement.java        |  0
 .../parser/statement/rdl/StorageUnitDefinitionStatement.java |  0
 .../parser/statement/rdl/alter/AlterRuleStatement.java       |  0
 .../statement/rdl/alter/AlterStorageUnitStatement.java       |  0
 .../parser/statement/rdl/create/CreateRuleStatement.java     |  0
 .../statement/rdl/create/RegisterStorageUnitStatement.java   |  0
 .../create/SetDefaultSingleTableStorageUnitStatement.java    |  0
 .../distsql/parser/statement/rdl/drop/DropRuleStatement.java |  0
 .../statement/rdl/drop/UnregisterStorageUnitStatement.java   |  0
 .../distsql/parser/statement/rql/RQLStatement.java           |  0
 .../parser/statement/rql/show/CountSingleTableStatement.java |  0
 .../rql/show/ShowDefaultSingleTableStorageUnitStatement.java |  0
 .../statement/rql/show/ShowLogicalTablesStatement.java       |  0
 .../parser/statement/rql/show/ShowRulesStatement.java        |  0
 .../rql/show/ShowRulesUsedStorageUnitStatement.java          |  0
 .../parser/statement/rql/show/ShowSingleTableStatement.java  |  0
 .../parser/statement/rql/show/ShowStorageUnitsStatement.java |  0
 .../parser/statement/rql/show/ShowTablesStatement.java       |  0
 .../distsql/parser/statement/rul/RULStatement.java           |  0
 .../distsql/parser/statement/rul/SQLRULStatement.java        |  0
 .../distsql/parser/statement/rul/sql/FormatStatement.java    |  0
 .../distsql/parser/statement/rul/sql/ParseStatement.java     |  0
 .../distsql/parser/statement/rul/sql/PreviewStatement.java   |  0
 .../segment/converter/DataSourceSegmentsConverterTest.java   |  0
 parser/pom.xml                                               | 11 +++++++++++
 pom.xml                                                      |  5 -----
 test/it/parser/pom.xml                                       | 12 +-----------
 130 files changed, 49 insertions(+), 56 deletions(-)

diff --git a/agent/plugins/metrics/core/pom.xml b/agent/plugins/metrics/core/pom.xml
index 707f457a6f7..fe512d655cc 100644
--- a/agent/plugins/metrics/core/pom.xml
+++ b/agent/plugins/metrics/core/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/PostgreSQLCommandPacketFactoryTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/PostgreSQLCommandPacketFactoryTest.java
index 3ec8d5a720e..6de25b23f93 100644
--- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/PostgreSQLCommandPacketFactoryTest.java
+++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/PostgreSQLCommandPacketFactoryTest.java
@@ -73,12 +73,12 @@ class PostgreSQLCommandPacketFactoryTest {
     void assertNewInstanceWithCloseComPacket() {
         assertThat(PostgreSQLCommandPacketFactory.newInstance(PostgreSQLCommandPacketType.CLOSE_COMMAND, payload), instanceOf(PostgreSQLAggregatedCommandPacket.class));
     }
-
+    
     @Test
     void assertNewInstanceWithFlushComPacket() {
         assertThat(PostgreSQLCommandPacketFactory.newInstance(PostgreSQLCommandPacketType.FLUSH_COMMAND, payload), instanceOf(PostgreSQLAggregatedCommandPacket.class));
     }
-
+    
     @Test
     void assertNewInstanceWithTerminationComPacket() {
         when(payload.getByteBuf()).thenReturn(mock(ByteBuf.class));
diff --git a/distsql/pom.xml b/distsql/pom.xml
index b45c02700d6..230badba001 100644
--- a/distsql/pom.xml
+++ b/distsql/pom.xml
@@ -29,8 +29,6 @@
     <name>${project.artifactId}</name>
     
     <modules>
-        <module>statement</module>
-        <module>parser</module>
         <module>handler</module>
     </modules>
 </project>
diff --git a/features/encrypt/distsql/parser/pom.xml b/features/encrypt/distsql/parser/pom.xml
index 8ffd7acc846..d04798271d7 100644
--- a/features/encrypt/distsql/parser/pom.xml
+++ b/features/encrypt/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/features/encrypt/distsql/statement/pom.xml b/features/encrypt/distsql/statement/pom.xml
index 6ea14490f02..23163248e18 100644
--- a/features/encrypt/distsql/statement/pom.xml
+++ b/features/encrypt/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/features/mask/distsql/parser/pom.xml b/features/mask/distsql/parser/pom.xml
index c441ad6d477..6cf3b6f693d 100644
--- a/features/mask/distsql/parser/pom.xml
+++ b/features/mask/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/features/mask/distsql/statement/pom.xml b/features/mask/distsql/statement/pom.xml
index d3a32901700..b1dbc2bc0ef 100644
--- a/features/mask/distsql/statement/pom.xml
+++ b/features/mask/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/features/readwrite-splitting/distsql/parser/pom.xml b/features/readwrite-splitting/distsql/parser/pom.xml
index 0fa6728f38d..c5c76ce5bb2 100644
--- a/features/readwrite-splitting/distsql/parser/pom.xml
+++ b/features/readwrite-splitting/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/features/readwrite-splitting/distsql/statement/pom.xml b/features/readwrite-splitting/distsql/statement/pom.xml
index 79d1f3d302a..d6876727c96 100644
--- a/features/readwrite-splitting/distsql/statement/pom.xml
+++ b/features/readwrite-splitting/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/features/shadow/distsql/parser/pom.xml b/features/shadow/distsql/parser/pom.xml
index 13e7d0fadcd..4d4a132a17b 100644
--- a/features/shadow/distsql/parser/pom.xml
+++ b/features/shadow/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/features/shadow/distsql/statement/pom.xml b/features/shadow/distsql/statement/pom.xml
index 5831235cead..46d98f84fe7 100644
--- a/features/shadow/distsql/statement/pom.xml
+++ b/features/shadow/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/features/sharding/distsql/parser/pom.xml b/features/sharding/distsql/parser/pom.xml
index fb2215fc73d..bdf0a8328a3 100644
--- a/features/sharding/distsql/parser/pom.xml
+++ b/features/sharding/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/features/sharding/distsql/statement/pom.xml b/features/sharding/distsql/statement/pom.xml
index a0bd51cda90..7a3b2678b68 100644
--- a/features/sharding/distsql/statement/pom.xml
+++ b/features/sharding/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/infra/context/pom.xml b/infra/context/pom.xml
index 693bf2cc39a..5be35e6bb0e 100644
--- a/infra/context/pom.xml
+++ b/infra/context/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/infra/parser/pom.xml b/infra/parser/pom.xml
index f64dbf1a397..a6d35263558 100644
--- a/infra/parser/pom.xml
+++ b/infra/parser/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/kernel/authority/distsql/parser/pom.xml b/kernel/authority/distsql/parser/pom.xml
index a018db1a2bc..ee434ca8e6d 100644
--- a/kernel/authority/distsql/parser/pom.xml
+++ b/kernel/authority/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/kernel/authority/distsql/statement/pom.xml b/kernel/authority/distsql/statement/pom.xml
index b439a15f6bd..ca6933061fd 100644
--- a/kernel/authority/distsql/statement/pom.xml
+++ b/kernel/authority/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/kernel/data-pipeline/distsql/parser/pom.xml b/kernel/data-pipeline/distsql/parser/pom.xml
index fbf77b443d8..4eeaf49fb52 100644
--- a/kernel/data-pipeline/distsql/parser/pom.xml
+++ b/kernel/data-pipeline/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/kernel/data-pipeline/distsql/statement/pom.xml b/kernel/data-pipeline/distsql/statement/pom.xml
index 707b16d35c0..e191e6e482f 100644
--- a/kernel/data-pipeline/distsql/statement/pom.xml
+++ b/kernel/data-pipeline/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/kernel/global-clock/distsql/parser/pom.xml b/kernel/global-clock/distsql/parser/pom.xml
index 35cf89af830..e12ead98aae 100644
--- a/kernel/global-clock/distsql/parser/pom.xml
+++ b/kernel/global-clock/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/kernel/global-clock/distsql/statement/pom.xml b/kernel/global-clock/distsql/statement/pom.xml
index 77669f0f608..dbb41495a72 100644
--- a/kernel/global-clock/distsql/statement/pom.xml
+++ b/kernel/global-clock/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/kernel/sql-parser/distsql/parser/pom.xml b/kernel/sql-parser/distsql/parser/pom.xml
index ef1fb7f240c..97ef377c64b 100644
--- a/kernel/sql-parser/distsql/parser/pom.xml
+++ b/kernel/sql-parser/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/kernel/sql-parser/distsql/statement/pom.xml b/kernel/sql-parser/distsql/statement/pom.xml
index f3999be3ae6..0379963f6d3 100644
--- a/kernel/sql-parser/distsql/statement/pom.xml
+++ b/kernel/sql-parser/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/kernel/sql-translator/distsql/parser/pom.xml b/kernel/sql-translator/distsql/parser/pom.xml
index 8fad0f6771f..af9d30d1a8f 100644
--- a/kernel/sql-translator/distsql/parser/pom.xml
+++ b/kernel/sql-translator/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/kernel/sql-translator/distsql/statement/pom.xml b/kernel/sql-translator/distsql/statement/pom.xml
index 03cc2cf6e4f..7a93486b924 100644
--- a/kernel/sql-translator/distsql/statement/pom.xml
+++ b/kernel/sql-translator/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/kernel/traffic/distsql/parser/pom.xml b/kernel/traffic/distsql/parser/pom.xml
index 3f75bd9536d..b4259626cf9 100644
--- a/kernel/traffic/distsql/parser/pom.xml
+++ b/kernel/traffic/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/kernel/traffic/distsql/statement/pom.xml b/kernel/traffic/distsql/statement/pom.xml
index 6dd1a86f0cd..b4921f1ec2a 100644
--- a/kernel/traffic/distsql/statement/pom.xml
+++ b/kernel/traffic/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/kernel/transaction/distsql/parser/pom.xml b/kernel/transaction/distsql/parser/pom.xml
index aca0dc4c198..f0a011299aa 100644
--- a/kernel/transaction/distsql/parser/pom.xml
+++ b/kernel/transaction/distsql/parser/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/kernel/transaction/distsql/statement/pom.xml b/kernel/transaction/distsql/statement/pom.xml
index 55cc25d52c8..544e92c15b3 100644
--- a/kernel/transaction/distsql/statement/pom.xml
+++ b/kernel/transaction/distsql/statement/pom.xml
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/distsql/parser/pom.xml b/parser/distsql/engine/pom.xml
similarity index 94%
rename from distsql/parser/pom.xml
rename to parser/distsql/engine/pom.xml
index 5172f1f63a3..0fd5641e0c2 100644
--- a/distsql/parser/pom.xml
+++ b/parser/distsql/engine/pom.xml
@@ -21,16 +21,16 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere</groupId>
-        <artifactId>shardingsphere-distsql</artifactId>
+        <artifactId>shardingsphere-parser-distsql</artifactId>
         <version>5.3.3-SNAPSHOT</version>
     </parent>
-    <artifactId>shardingsphere-distsql-parser</artifactId>
+    <artifactId>shardingsphere-parser-distsql-engine</artifactId>
     <name>${project.artifactId}</name>
     
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
+            <artifactId>shardingsphere-parser-distsql-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/distsql/parser/src/main/antlr4/imports/Alphabet.g4 b/parser/distsql/engine/src/main/antlr4/imports/Alphabet.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/Alphabet.g4
rename to parser/distsql/engine/src/main/antlr4/imports/Alphabet.g4
diff --git a/distsql/parser/src/main/antlr4/imports/BaseRule.g4 b/parser/distsql/engine/src/main/antlr4/imports/BaseRule.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/BaseRule.g4
rename to parser/distsql/engine/src/main/antlr4/imports/BaseRule.g4
diff --git a/distsql/parser/src/main/antlr4/imports/Keyword.g4 b/parser/distsql/engine/src/main/antlr4/imports/Keyword.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/Keyword.g4
rename to parser/distsql/engine/src/main/antlr4/imports/Keyword.g4
diff --git a/distsql/parser/src/main/antlr4/imports/Literals.g4 b/parser/distsql/engine/src/main/antlr4/imports/Literals.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/Literals.g4
rename to parser/distsql/engine/src/main/antlr4/imports/Literals.g4
diff --git a/distsql/parser/src/main/antlr4/imports/RALStatement.g4 b/parser/distsql/engine/src/main/antlr4/imports/RALStatement.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/RALStatement.g4
rename to parser/distsql/engine/src/main/antlr4/imports/RALStatement.g4
diff --git a/distsql/parser/src/main/antlr4/imports/RDLStatement.g4 b/parser/distsql/engine/src/main/antlr4/imports/RDLStatement.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/RDLStatement.g4
rename to parser/distsql/engine/src/main/antlr4/imports/RDLStatement.g4
diff --git a/distsql/parser/src/main/antlr4/imports/RQLStatement.g4 b/parser/distsql/engine/src/main/antlr4/imports/RQLStatement.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/RQLStatement.g4
rename to parser/distsql/engine/src/main/antlr4/imports/RQLStatement.g4
diff --git a/distsql/parser/src/main/antlr4/imports/RULKeyword.g4 b/parser/distsql/engine/src/main/antlr4/imports/RULKeyword.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/RULKeyword.g4
rename to parser/distsql/engine/src/main/antlr4/imports/RULKeyword.g4
diff --git a/distsql/parser/src/main/antlr4/imports/RULStatement.g4 b/parser/distsql/engine/src/main/antlr4/imports/RULStatement.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/RULStatement.g4
rename to parser/distsql/engine/src/main/antlr4/imports/RULStatement.g4
diff --git a/distsql/parser/src/main/antlr4/imports/Symbol.g4 b/parser/distsql/engine/src/main/antlr4/imports/Symbol.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/imports/Symbol.g4
rename to parser/distsql/engine/src/main/antlr4/imports/Symbol.g4
diff --git a/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4 b/parser/distsql/engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
rename to parser/distsql/engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
diff --git a/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/UtilityDistSQLStatement.g4 b/parser/distsql/engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/UtilityDistSQLStatement.g4
similarity index 100%
rename from distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/UtilityDistSQLStatement.g4
rename to parser/distsql/engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/UtilityDistSQLStatement.g4
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLParseASTNode.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLParseASTNode.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLParseASTNode.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLParseASTNode.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLLexer.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLLexer.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLLexer.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLLexer.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLParser.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLParser.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLParser.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLParser.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementParserEngine.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementParserEngine.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementParserEngine.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementParserEngine.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLLexer.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLLexer.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLLexer.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLLexer.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLParser.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLParser.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLParser.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLParser.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementParserEngine.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementParserEngine.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementParserEngine.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementParserEngine.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/api/DistSQLStatementParserEngine.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/api/DistSQLStatementParserEngine.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/api/DistSQLStatementParserEngine.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/api/DistSQLStatementParserEngine.java
diff --git a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java
similarity index 100%
rename from distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java
diff --git a/distsql/parser/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java b/parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
similarity index 100%
rename from distsql/parser/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
rename to parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
diff --git a/distsql/pom.xml b/parser/distsql/pom.xml
similarity index 89%
copy from distsql/pom.xml
copy to parser/distsql/pom.xml
index b45c02700d6..ab19e6964cc 100644
--- a/distsql/pom.xml
+++ b/parser/distsql/pom.xml
@@ -21,16 +21,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere</groupId>
-        <artifactId>shardingsphere</artifactId>
+        <artifactId>shardingsphere-parser</artifactId>
         <version>5.3.3-SNAPSHOT</version>
     </parent>
-    <artifactId>shardingsphere-distsql</artifactId>
+    <artifactId>shardingsphere-parser-distsql</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     
     <modules>
+        <module>engine</module>
         <module>statement</module>
-        <module>parser</module>
-        <module>handler</module>
     </modules>
 </project>
diff --git a/distsql/statement/pom.xml b/parser/distsql/statement/pom.xml
similarity index 93%
rename from distsql/statement/pom.xml
rename to parser/distsql/statement/pom.xml
index 08ee70cdca0..33ed7a7c234 100644
--- a/distsql/statement/pom.xml
+++ b/parser/distsql/statement/pom.xml
@@ -21,10 +21,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere</groupId>
-        <artifactId>shardingsphere-distsql</artifactId>
+        <artifactId>shardingsphere-parser-distsql</artifactId>
         <version>5.3.3-SNAPSHOT</version>
     </parent>
-    <artifactId>shardingsphere-distsql-statement</artifactId>
+    <artifactId>shardingsphere-parser-distsql-statement</artifactId>
     <name>${project.artifactId}</name>
     
     <dependencies>
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/AlgorithmSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/AlgorithmSegment.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/AlgorithmSegment.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/AlgorithmSegment.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceSegment.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceSegment.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceSegment.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/HostnameAndPortBasedDataSourceSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/HostnameAndPortBasedDataSourceSegment.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/HostnameAndPortBasedDataSourceSegment.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/HostnameAndPortBasedDataSourceSegment.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/InventoryIncrementalRuleSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/InventoryIncrementalRuleSegment.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/InventoryIncrementalRuleSegment.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/InventoryIncrementalRuleSegment.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/ReadOrWriteSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/ReadOrWriteSegment.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/ReadOrWriteSegment.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/ReadOrWriteSegment.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/URLBasedDataSourceSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/URLBasedDataSourceSegment.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/URLBasedDataSourceSegment.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/URLBasedDataSourceSegment.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverter.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverter.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverter.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverter.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/FeaturedRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/FeaturedRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/FeaturedRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/FeaturedRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/QueryableRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/QueryableRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/QueryableRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/QueryableRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/RALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/RALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/RALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/RALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableGlobalRuleRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableGlobalRuleRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableGlobalRuleRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableGlobalRuleRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/PipelineRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/PipelineRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/PipelineRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/PipelineRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/QueryablePipelineRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/QueryablePipelineRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/QueryablePipelineRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/QueryablePipelineRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/UpdatablePipelineRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/UpdatablePipelineRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/UpdatablePipelineRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/UpdatablePipelineRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/CDCRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/CDCRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/CDCRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/CDCRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/MigrationRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/MigrationRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/MigrationRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/MigrationRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ConvertYamlConfigurationStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ConvertYamlConfigurationStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ConvertYamlConfigurationStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ConvertYamlConfigurationStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportDatabaseConfigurationStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportDatabaseConfigurationStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportDatabaseConfigurationStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportDatabaseConfigurationStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportMetaDataStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportMetaDataStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportMetaDataStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportStorageNodesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportStorageNodesStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportStorageNodesStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportStorageNodesStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeInfoStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeInfoStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeInfoStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeInfoStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeModeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeModeStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeModeStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeModeStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodesStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodesStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodesStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariableStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariableStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariableStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariableStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariablesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariablesStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariablesStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariablesStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowMigrationRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowMigrationRuleStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowMigrationRuleStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowMigrationRuleStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterComputeNodeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterComputeNodeStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterComputeNodeStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterComputeNodeStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportDatabaseConfigurationStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportDatabaseConfigurationStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportDatabaseConfigurationStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportDatabaseConfigurationStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportMetaDataStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportMetaDataStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportMetaDataStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LabelComputeNodeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LabelComputeNodeStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LabelComputeNodeStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LabelComputeNodeStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LockClusterStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LockClusterStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LockClusterStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LockClusterStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetDistVariableStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetDistVariableStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetDistVariableStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetDistVariableStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetInstanceStatusStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetInstanceStatusStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetInstanceStatusStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetInstanceStatusStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlabelComputeNodeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlabelComputeNodeStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlabelComputeNodeStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlabelComputeNodeStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlockClusterStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlockClusterStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlockClusterStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlockClusterStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RuleDefinitionStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RuleDefinitionStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RuleDefinitionStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RuleDefinitionStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/StorageUnitDefinitionStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/StorageUnitDefinitionStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/StorageUnitDefinitionStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/StorageUnitDefinitionStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterRuleStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterRuleStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterRuleStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterStorageUnitStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterStorageUnitStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterStorageUnitStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/CreateRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/CreateRuleStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/CreateRuleStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/CreateRuleStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/RegisterStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/RegisterStorageUnitStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/RegisterStorageUnitStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/RegisterStorageUnitStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/SetDefaultSingleTableStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/SetDefaultSingleTableStorageUnitStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/SetDefaultSingleTableStorageUnitStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/SetDefaultSingleTableStorageUnitStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/UnregisterStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/UnregisterStorageUnitStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/UnregisterStorageUnitStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/UnregisterStorageUnitStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/CountSingleTableStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/CountSingleTableStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/CountSingleTableStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/CountSingleTableStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowDefaultSingleTableStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowDefaultSingleTableStorageUnitStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowDefaultSingleTableStorageUnitStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowDefaultSingleTableStorageUnitStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowLogicalTablesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowLogicalTablesStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowLogicalTablesStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowLogicalTablesStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesUsedStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesUsedStorageUnitStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesUsedStorageUnitStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesUsedStorageUnitStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowSingleTableStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowSingleTableStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowSingleTableStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowSingleTableStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowStorageUnitsStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowStorageUnitsStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowStorageUnitsStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowStorageUnitsStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowTablesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowTablesStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowTablesStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowTablesStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/RULStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/RULStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/RULStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/RULStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/SQLRULStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/SQLRULStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/SQLRULStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/SQLRULStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/FormatStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/FormatStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/FormatStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/FormatStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/ParseStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/ParseStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/ParseStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/ParseStatement.java
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/PreviewStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/PreviewStatement.java
similarity index 100%
rename from distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/PreviewStatement.java
rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/PreviewStatement.java
diff --git a/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java b/parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
similarity index 100%
rename from distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
rename to parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
diff --git a/parser/pom.xml b/parser/pom.xml
index 0d49f8fc66d..2328b93dcfa 100644
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -30,5 +30,16 @@
     
     <modules>
         <module>sql</module>
+        <module>distsql</module>
     </modules>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <version>${antlr4.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
diff --git a/pom.xml b/pom.xml
index 4647d22af54..b84bf7d2c98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,11 +209,6 @@
                 <version>${transmittable-thread-local.version}</version>
             </dependency>
             
-            <dependency>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-runtime</artifactId>
-                <version>${antlr4.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
diff --git a/test/it/parser/pom.xml b/test/it/parser/pom.xml
index f8d6fc1c488..f96cb1a1979 100644
--- a/test/it/parser/pom.xml
+++ b/test/it/parser/pom.xml
@@ -39,16 +39,6 @@
             <artifactId>shardingsphere-parser-sql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-parser-sql-statement</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-statement</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>shardingsphere-data-pipeline-distsql-statement</artifactId>
@@ -61,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-distsql-parser</artifactId>
+            <artifactId>shardingsphere-parser-distsql-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>