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 2020/10/29 11:37:27 UTC
[shardingsphere] branch master updated: Rename RDL to DistSQL
(#7964)
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 a06b568 Rename RDL to DistSQL (#7964)
a06b568 is described below
commit a06b56836f2f9231b2dde27a464d35164cc1b049
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Oct 29 19:36:36 2020 +0800
Rename RDL to DistSQL (#7964)
* Remove useless ShardingSphereVisitor.getter
* Rename RDLVisitor
* Rename RDL to DistSQL
* Rename RDL module name
* Rename RDL package name
* Rename RDL class name
---
pom.xml | 2 +-
.../pom.xml | 10 +++----
.../shardingsphere-distsql-parser-binder}/pom.xml | 6 ++--
.../context/CreateDataSourcesStatementContext.java | 12 ++++----
.../CreateShardingRuleStatementContext.java | 8 +++---
.../generator/SQLStatementContextConverter.java | 2 +-
.../binder/util/DataSourceConnectionUrlUtil.java | 8 +++---
.../util/ShardingAlgorithmPropertiesUtil.java | 2 +-
.../util/DataSourceConnectionUrlUtilTest.java | 4 +--
.../shardingsphere-distsql-parser-engine}/pom.xml | 6 ++--
.../ShardingSphereSQLStatementParserEngine.java | 10 +++----
.../engine/DistSQLStatementParserEngine.java | 14 ++++-----
.../engine/executor/DistSQLParserExecutor.java | 14 ++++-----
.../shardingsphere-distsql-parser-sql}/pom.xml | 6 ++--
.../src/main/antlr4/imports/Alphabet.g4 | 0
.../src/main/antlr4/imports/Keyword.g4 | 0
.../src/main/antlr4/imports/Literals.g4 | 0
.../src/main/antlr4/imports/RDLStatement.g4 | 0
.../src/main/antlr4/imports/Symbol.g4 | 0
.../distsql/parser/autogen/DistSQLStatement.g4 | 2 +-
.../distsql/parser/sql/parser/DistSQLParser.java | 12 ++++----
.../sql/visitor/DistSQLStatementVisitor.java | 33 ++++++++++------------
.../pom.xml | 6 ++--
.../statement/rdl/CreateDataSourcesStatement.java | 2 +-
.../statement/rdl/CreateShardingRuleStatement.java | 2 +-
.../statement/rdl/DataSourceConnectionSegment.java | 2 +-
.../parser/statement/rdl/RDLStatement.java | 2 +-
.../parser/statement/rdl/TableRuleSegment.java | 2 +-
.../shardingsphere-sharding-common/pom.xml | 2 +-
...reateShardingRuleStatementContextConverter.java | 6 ++--
...eShardingRuleStatementContextConverterTest.java | 6 ++--
.../shardingsphere-infra-context/pom.xml | 2 +-
.../statement/ShardingSpherePreparedStatement.java | 2 +-
.../core/statement/ShardingSphereStatement.java | 2 +-
.../shardingsphere-proxy-backend/pom.xml | 2 +-
.../text/TextProtocolBackendHandlerFactory.java | 4 +--
.../backend/text/admin/RDLBackendHandler.java | 8 +++---
.../explain/ShardingCTLExplainBackendHandler.java | 2 +-
.../backend/text/admin/RDLBackendHandlerTest.java | 4 +--
.../shardingsphere-proxy-common/pom.xml | 2 +-
...CreateDataSourcesStatementContextConverter.java | 6 ++--
...teDataSourcesStatementContextConverterTest.java | 6 ++--
.../execute/MySQLComStmtExecuteExecutor.java | 2 +-
.../prepare/MySQLComStmtPrepareExecutor.java | 2 +-
.../fieldlist/MySQLComFieldListPacketExecutor.java | 2 +-
.../binary/bind/PostgreSQLComBindExecutor.java | 2 +-
.../binary/parse/PostgreSQLComParseExecutor.java | 2 +-
47 files changed, 114 insertions(+), 117 deletions(-)
diff --git a/pom.xml b/pom.xml
index 508cf47..d7ea665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<modules>
<module>shardingsphere-sql-parser</module>
- <module>shardingsphere-rdl-parser</module>
+ <module>shardingsphere-distsql-parser</module>
<module>shardingsphere-db-protocol</module>
<module>shardingsphere-infra</module>
diff --git a/shardingsphere-rdl-parser/pom.xml b/shardingsphere-distsql-parser/pom.xml
similarity index 82%
rename from shardingsphere-rdl-parser/pom.xml
rename to shardingsphere-distsql-parser/pom.xml
index 2c6265b..5ae5202 100644
--- a/shardingsphere-rdl-parser/pom.xml
+++ b/shardingsphere-distsql-parser/pom.xml
@@ -25,14 +25,14 @@
<artifactId>shardingsphere</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-rdl-parser</artifactId>
+ <artifactId>shardingsphere-distsql-parser</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<modules>
- <module>shardingsphere-rdl-parser-sql</module>
- <module>shardingsphere-rdl-parser-statement</module>
- <module>shardingsphere-rdl-parser-engine</module>
- <module>shardingsphere-rdl-parser-binder</module>
+ <module>shardingsphere-distsql-parser-sql</module>
+ <module>shardingsphere-distsql-parser-statement</module>
+ <module>shardingsphere-distsql-parser-engine</module>
+ <module>shardingsphere-distsql-parser-binder</module>
</modules>
</project>
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/pom.xml b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml
similarity index 90%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/pom.xml
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml
index a48ca30..8aac110 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/pom.xml
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-rdl-parser</artifactId>
+ <artifactId>shardingsphere-distsql-parser</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-rdl-parser-binder</artifactId>
+ <artifactId>shardingsphere-distsql-parser-binder</artifactId>
<name>${project.artifactId}</name>
<dependencies>
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-rdl-parser-statement</artifactId>
+ <artifactId>shardingsphere-distsql-parser-statement</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/context/CreateDataSourcesStatementContext.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateDataSourcesStatementContext.java
similarity index 81%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/context/CreateDataSourcesStatementContext.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateDataSourcesStatementContext.java
index 947de83..d87f8cb 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/context/CreateDataSourcesStatementContext.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateDataSourcesStatementContext.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.binder.context;
+package org.apache.shardingsphere.distsql.parser.binder.context;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.rdl.parser.binder.util.DataSourceConnectionUrlUtil;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateDataSourcesStatement;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.DataSourceConnectionSegment;
+import org.apache.shardingsphere.distsql.parser.binder.util.DataSourceConnectionUrlUtil;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.DataSourceConnectionSegment;
import org.apache.shardingsphere.infra.binder.statement.CommonSQLStatementContext;
/**
@@ -38,10 +38,10 @@ public final class CreateDataSourcesStatementContext extends CommonSQLStatementC
}
/**
- * Get url.
+ * Get URL.
*
* @param segment segment
- * @return url
+ * @return URL
*/
public String getUrl(final DataSourceConnectionSegment segment) {
return DataSourceConnectionUrlUtil.getUrl(segment, databaseType);
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/context/CreateShardingRuleStatementContext.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateShardingRuleStatementContext.java
similarity index 82%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/context/CreateShardingRuleStatementContext.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateShardingRuleStatementContext.java
index 0f367ce..1e5a619 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/context/CreateShardingRuleStatementContext.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateShardingRuleStatementContext.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.binder.context;
+package org.apache.shardingsphere.distsql.parser.binder.context;
-import org.apache.shardingsphere.rdl.parser.binder.util.ShardingAlgorithmPropertiesUtil;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateShardingRuleStatement;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.TableRuleSegment;
+import org.apache.shardingsphere.distsql.parser.binder.util.ShardingAlgorithmPropertiesUtil;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.TableRuleSegment;
import org.apache.shardingsphere.infra.binder.statement.CommonSQLStatementContext;
import java.util.Properties;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/generator/SQLStatementContextConverter.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/generator/SQLStatementContextConverter.java
similarity index 94%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/generator/SQLStatementContextConverter.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/generator/SQLStatementContextConverter.java
index 22df840..5dcde3b 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/generator/SQLStatementContextConverter.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/generator/SQLStatementContextConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.binder.generator;
+package org.apache.shardingsphere.distsql.parser.binder.generator;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/util/DataSourceConnectionUrlUtil.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtil.java
similarity index 90%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/util/DataSourceConnectionUrlUtil.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtil.java
index c3bc147..84afbb9 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/util/DataSourceConnectionUrlUtil.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtil.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.binder.util;
+package org.apache.shardingsphere.distsql.parser.binder.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.DataSourceConnectionSegment;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.DataSourceConnectionSegment;
/**
* Data source connection url util.
@@ -30,11 +30,11 @@ import org.apache.shardingsphere.rdl.parser.statement.rdl.DataSourceConnectionSe
public final class DataSourceConnectionUrlUtil {
/**
- * Get url.
+ * Get URL.
*
* @param connectionSegment connection segment
* @param databaseType database type
- * @return url
+ * @return URL
*/
public static String getUrl(final DataSourceConnectionSegment connectionSegment, final DatabaseType databaseType) {
return getUrl(connectionSegment, databaseType.getJdbcUrlPrefixes().iterator().next());
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/util/ShardingAlgorithmPropertiesUtil.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/ShardingAlgorithmPropertiesUtil.java
similarity index 97%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/util/ShardingAlgorithmPropertiesUtil.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/ShardingAlgorithmPropertiesUtil.java
index cfebb27..fbfc0a5 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/main/java/org/apache/shardingsphere/rdl/parser/binder/util/ShardingAlgorithmPropertiesUtil.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/ShardingAlgorithmPropertiesUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.binder.util;
+package org.apache.shardingsphere.distsql.parser.binder.util;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/test/java/org/apache/shardingsphere/rdl/parser/binder/util/DataSourceConnectionUrlUtilTest.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/test/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtilTest.java
similarity index 96%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/test/java/org/apache/shardingsphere/rdl/parser/binder/util/DataSourceConnectionUrlUtilTest.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/test/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtilTest.java
index 7d48565..d5756dc 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/src/test/java/org/apache/shardingsphere/rdl/parser/binder/util/DataSourceConnectionUrlUtilTest.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/test/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtilTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.binder.util;
+package org.apache.shardingsphere.distsql.parser.binder.util;
import org.apache.shardingsphere.infra.database.type.dialect.MariaDBDatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.OracleDatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.SQLServerDatabaseType;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.DataSourceConnectionSegment;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.DataSourceConnectionSegment;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/pom.xml b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/pom.xml
similarity index 90%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/pom.xml
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/pom.xml
index b5ee0b8..16e02e3 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/pom.xml
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/pom.xml
@@ -20,12 +20,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>shardingsphere-rdl-parser</artifactId>
+ <artifactId>shardingsphere-distsql-parser</artifactId>
<groupId>org.apache.shardingsphere</groupId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shardingsphere-rdl-parser-engine</artifactId>
+ <artifactId>shardingsphere-distsql-parser-engine</artifactId>
<dependencies>
<dependency>
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-rdl-parser-sql</artifactId>
+ <artifactId>shardingsphere-distsql-parser-sql</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLStatementParserEngine.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/ShardingSphereSQLStatementParserEngine.java
similarity index 84%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLStatementParserEngine.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/ShardingSphereSQLStatementParserEngine.java
index 94a857b..1850786 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLStatementParserEngine.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/ShardingSphereSQLStatementParserEngine.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.engine;
+package org.apache.shardingsphere.distsql.parser.engine;
+import org.apache.shardingsphere.distsql.parser.engine.engine.DistSQLStatementParserEngine;
import org.apache.shardingsphere.infra.parser.SQLStatementParserEngine;
import org.apache.shardingsphere.infra.parser.standard.StandardSQLStatementParserEngine;
import org.apache.shardingsphere.infra.parser.standard.StandardSQLStatementParserEngineFactory;
-import org.apache.shardingsphere.rdl.parser.engine.engine.RDLSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
@@ -30,11 +30,11 @@ public final class ShardingSphereSQLStatementParserEngine implements SQLStatemen
private final StandardSQLStatementParserEngine standardSQLStatementParserEngine;
- private final RDLSQLStatementParserEngine rdlSQLStatementParserEngine;
+ private final DistSQLStatementParserEngine distSQLStatementParserEngine;
public ShardingSphereSQLStatementParserEngine(final String databaseTypeName) {
standardSQLStatementParserEngine = StandardSQLStatementParserEngineFactory.getSQLStatementParserEngine(databaseTypeName);
- rdlSQLStatementParserEngine = new RDLSQLStatementParserEngine();
+ distSQLStatementParserEngine = new DistSQLStatementParserEngine();
}
@Override
@@ -45,7 +45,7 @@ public final class ShardingSphereSQLStatementParserEngine implements SQLStatemen
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- result = rdlSQLStatementParserEngine.parse(sql, useCache);
+ result = distSQLStatementParserEngine.parse(sql, useCache);
}
return result;
}
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLStatementParserEngine.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/engine/DistSQLStatementParserEngine.java
similarity index 79%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLStatementParserEngine.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/engine/DistSQLStatementParserEngine.java
index 0ccf8d0..f1437e3 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLStatementParserEngine.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/engine/DistSQLStatementParserEngine.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.engine.engine;
+package org.apache.shardingsphere.distsql.parser.engine.engine;
import lombok.RequiredArgsConstructor;
import org.antlr.v4.runtime.tree.ParseTree;
+import org.apache.shardingsphere.distsql.parser.engine.executor.DistSQLParserExecutor;
import org.apache.shardingsphere.infra.parser.SQLStatementParserEngine;
-import org.apache.shardingsphere.rdl.parser.engine.executor.RDLSQLParserExecutor;
-import org.apache.shardingsphere.rdl.parser.sql.visitor.ShardingSphereVisitor;
+import org.apache.shardingsphere.distsql.parser.sql.visitor.DistSQLStatementVisitor;
import org.apache.shardingsphere.sql.parser.hook.ParsingHookRegistry;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
- * RDL SQL statement parser engine.
+ * Dist SQL statement parser engine.
*/
@RequiredArgsConstructor
-public final class RDLSQLStatementParserEngine implements SQLStatementParserEngine {
+public final class DistSQLStatementParserEngine implements SQLStatementParserEngine {
private final ParsingHookRegistry parsingHookRegistry = ParsingHookRegistry.getInstance();
@@ -43,8 +43,8 @@ public final class RDLSQLStatementParserEngine implements SQLStatementParserEngi
public SQLStatement parse(final String sql, final boolean useCache) {
parsingHookRegistry.start(sql);
try {
- ParseTree parseTree = new RDLSQLParserExecutor(sql).execute().getRootNode();
- SQLStatement result = (SQLStatement) new ShardingSphereVisitor().visit(parseTree);
+ ParseTree parseTree = new DistSQLParserExecutor(sql).execute().getRootNode();
+ SQLStatement result = (SQLStatement) new DistSQLStatementVisitor().visit(parseTree);
parsingHookRegistry.finishSuccess(result);
return result;
// CHECKSTYLE:OFF
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/executor/RDLSQLParserExecutor.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/executor/DistSQLParserExecutor.java
similarity index 86%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/executor/RDLSQLParserExecutor.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/executor/DistSQLParserExecutor.java
index 1c44992..beac0b4 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/executor/RDLSQLParserExecutor.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/executor/DistSQLParserExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.engine.executor;
+package org.apache.shardingsphere.distsql.parser.engine.executor;
import lombok.RequiredArgsConstructor;
import org.antlr.v4.runtime.BailErrorStrategy;
@@ -28,8 +28,8 @@ import org.antlr.v4.runtime.Parser;
import org.antlr.v4.runtime.atn.PredictionMode;
import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.antlr.v4.runtime.tree.ErrorNode;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementLexer;
-import org.apache.shardingsphere.rdl.parser.sql.parser.ShardingSphereParser;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementLexer;
+import org.apache.shardingsphere.distsql.parser.sql.parser.DistSQLParser;
import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
import org.apache.shardingsphere.sql.parser.core.parser.ParseASTNode;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
@@ -37,10 +37,10 @@ import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
import java.nio.CharBuffer;
/**
- * RDL SQL parser executor.
+ * Dist SQL parser executor.
*/
@RequiredArgsConstructor
-public final class RDLSQLParserExecutor {
+public final class DistSQLParserExecutor {
private final String sql;
@@ -74,7 +74,7 @@ public final class RDLSQLParserExecutor {
private SQLParser createSQLParser() {
CodePointBuffer buffer = CodePointBuffer.withChars(CharBuffer.wrap(sql.toCharArray()));
CodePointCharStream codePointCharStream = CodePointCharStream.fromBuffer(buffer);
- Lexer lexer = new ShardingSphereStatementLexer(codePointCharStream);
- return new ShardingSphereParser(new CommonTokenStream(lexer));
+ Lexer lexer = new DistSQLStatementLexer(codePointCharStream);
+ return new DistSQLParser(new CommonTokenStream(lexer));
}
}
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/pom.xml b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/pom.xml
similarity index 93%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/pom.xml
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/pom.xml
index 8f53c48..a85603c 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/pom.xml
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/pom.xml
@@ -20,12 +20,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>shardingsphere-rdl-parser</artifactId>
+ <artifactId>shardingsphere-distsql-parser</artifactId>
<groupId>org.apache.shardingsphere</groupId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shardingsphere-rdl-parser-sql</artifactId>
+ <artifactId>shardingsphere-distsql-parser-sql</artifactId>
<dependencies>
<dependency>
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-rdl-parser-statement</artifactId>
+ <artifactId>shardingsphere-distsql-parser-statement</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Alphabet.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Alphabet.g4
similarity index 100%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Alphabet.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Alphabet.g4
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Keyword.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Keyword.g4
similarity index 100%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Keyword.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Keyword.g4
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Literals.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Literals.g4
similarity index 100%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Literals.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Literals.g4
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/RDLStatement.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/RDLStatement.g4
similarity index 100%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/RDLStatement.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/RDLStatement.g4
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Symbol.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Symbol.g4
similarity index 100%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/imports/Symbol.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Symbol.g4
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/org/apache/shardingsphere/rdl/parser/autogen/ShardingSphereStatement.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
similarity index 96%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/org/apache/shardingsphere/rdl/parser/autogen/ShardingSphereStatement.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
index afd52ae..d8363e6 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/antlr4/org/apache/shardingsphere/rdl/parser/autogen/ShardingSphereStatement.g4
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-grammar ShardingSphereStatement;
+grammar DistSQLStatement;
import Symbol, RDLStatement;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/parser/ShardingSphereParser.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/parser/DistSQLParser.java
similarity index 78%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/parser/ShardingSphereParser.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/parser/DistSQLParser.java
index 2c3d3b7..76c972d 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/parser/ShardingSphereParser.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/parser/DistSQLParser.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.sql.parser;
+package org.apache.shardingsphere.distsql.parser.sql.parser;
import org.antlr.v4.runtime.TokenStream;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser;
-import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser;
import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
+import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
import org.apache.shardingsphere.sql.parser.core.parser.ParseASTNode;
/**
- * SQL parser for RDL.
+ * SQL parser for Dist SQL.
*/
-public final class ShardingSphereParser extends ShardingSphereStatementParser implements SQLParser {
+public final class DistSQLParser extends DistSQLStatementParser implements SQLParser {
- public ShardingSphereParser(final TokenStream input) {
+ public DistSQLParser(final TokenStream input) {
super(input);
}
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/visitor/ShardingSphereVisitor.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/visitor/DistSQLStatementVisitor.java
similarity index 71%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/visitor/ShardingSphereVisitor.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/visitor/DistSQLStatementVisitor.java
index e396a54..1b16e6f 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-sql/src/main/java/org/apache/shardingsphere/rdl/parser/sql/visitor/ShardingSphereVisitor.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/visitor/DistSQLStatementVisitor.java
@@ -15,22 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.sql.visitor;
+package org.apache.shardingsphere.distsql.parser.sql.visitor;
-import lombok.AccessLevel;
-import lombok.Getter;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementBaseVisitor;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.CreateShardingRuleContext;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.CreateDataSourcesContext;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.DataSourceContext;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.DataSourceDefinitionContext;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.StrategyPropContext;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.StrategyPropsContext;
-import org.apache.shardingsphere.rdl.parser.autogen.ShardingSphereStatementParser.TableRuleContext;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateDataSourcesStatement;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateShardingRuleStatement;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.DataSourceConnectionSegment;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.TableRuleSegment;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementBaseVisitor;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.CreateDataSourcesContext;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.CreateShardingRuleContext;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.DataSourceContext;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.DataSourceDefinitionContext;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.StrategyPropContext;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.StrategyPropsContext;
+import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.TableRuleContext;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.DataSourceConnectionSegment;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.TableRuleSegment;
import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
import org.apache.shardingsphere.sql.parser.sql.common.value.collection.CollectionValue;
@@ -38,10 +36,9 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * ShardingSphere visitor.
+ * Dist SQL statement visitor.
*/
-@Getter(AccessLevel.PROTECTED)
-public final class ShardingSphereVisitor extends ShardingSphereStatementBaseVisitor<ASTNode> {
+public final class DistSQLStatementVisitor extends DistSQLStatementBaseVisitor<ASTNode> {
@Override
public ASTNode visitCreateDataSources(final CreateDataSourcesContext ctx) {
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/pom.xml b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/pom.xml
similarity index 91%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/pom.xml
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/pom.xml
index 7b42583..550202d 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/pom.xml
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-rdl-parser</artifactId>
+ <artifactId>shardingsphere-distsql-parser</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-rdl-parser-statement</artifactId>
+ <artifactId>shardingsphere-distsql-parser-statement</artifactId>
<name>${project.artifactId}</name>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/CreateDataSourcesStatement.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/CreateDataSourcesStatement.java
similarity index 94%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/CreateDataSourcesStatement.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/CreateDataSourcesStatement.java
index 04140b3..d5cf5bb 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/CreateDataSourcesStatement.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/CreateDataSourcesStatement.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.statement.rdl;
+package org.apache.shardingsphere.distsql.parser.statement.rdl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/CreateShardingRuleStatement.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/CreateShardingRuleStatement.java
similarity index 94%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/CreateShardingRuleStatement.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/CreateShardingRuleStatement.java
index 04ba4e6..f38968c 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/CreateShardingRuleStatement.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/CreateShardingRuleStatement.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.statement.rdl;
+package org.apache.shardingsphere.distsql.parser.statement.rdl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/DataSourceConnectionSegment.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/DataSourceConnectionSegment.java
similarity index 95%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/DataSourceConnectionSegment.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/DataSourceConnectionSegment.java
index 46b56d8..a094277 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/DataSourceConnectionSegment.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/DataSourceConnectionSegment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.statement.rdl;
+package org.apache.shardingsphere.distsql.parser.statement.rdl;
import lombok.Getter;
import lombok.Setter;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/RDLStatement.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java
similarity index 93%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/RDLStatement.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java
index 3501811..5d12857 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/RDLStatement.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.statement.rdl;
+package org.apache.shardingsphere.distsql.parser.statement.rdl;
import org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStatement;
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/TableRuleSegment.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/TableRuleSegment.java
similarity index 95%
rename from shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/TableRuleSegment.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/TableRuleSegment.java
index 836e384..9e93a94 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-statement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/TableRuleSegment.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/TableRuleSegment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.rdl.parser.statement.rdl;
+package org.apache.shardingsphere.distsql.parser.statement.rdl;
import lombok.Getter;
import lombok.Setter;
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml
index 305ef9a..7570f1f 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml
@@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-rdl-parser-binder</artifactId>
+ <artifactId>shardingsphere-distsql-parser-binder</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/convert/CreateShardingRuleStatementContextConverter.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/convert/CreateShardingRuleStatementContextConverter.java
index d6772ff..8e31f83 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/convert/CreateShardingRuleStatementContextConverter.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/convert/CreateShardingRuleStatementContextConverter.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.sharding.convert;
import com.google.common.base.Joiner;
import org.apache.shardingsphere.infra.yaml.config.algorithm.YamlShardingSphereAlgorithmConfiguration;
-import org.apache.shardingsphere.rdl.parser.binder.context.CreateShardingRuleStatementContext;
-import org.apache.shardingsphere.rdl.parser.binder.generator.SQLStatementContextConverter;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.TableRuleSegment;
+import org.apache.shardingsphere.distsql.parser.binder.context.CreateShardingRuleStatementContext;
+import org.apache.shardingsphere.distsql.parser.binder.generator.SQLStatementContextConverter;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.TableRuleSegment;
import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.yaml.config.rule.YamlShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlShardingStrategyConfiguration;
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/convert/CreateShardingRuleStatementContextConverterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/convert/CreateShardingRuleStatementContextConverterTest.java
index bf6e4ac..5ca3261 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/convert/CreateShardingRuleStatementContextConverterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/convert/CreateShardingRuleStatementContextConverterTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.sharding.convert;
-import org.apache.shardingsphere.rdl.parser.binder.context.CreateShardingRuleStatementContext;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateShardingRuleStatement;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.TableRuleSegment;
+import org.apache.shardingsphere.distsql.parser.binder.context.CreateShardingRuleStatementContext;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.TableRuleSegment;
import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
import org.junit.Before;
import org.junit.Test;
diff --git a/shardingsphere-infra/shardingsphere-infra-context/pom.xml b/shardingsphere-infra/shardingsphere-infra-context/pom.xml
index 3ab0bae..bf5fd97 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/pom.xml
+++ b/shardingsphere-infra/shardingsphere-infra-context/pom.xml
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-rdl-parser-engine</artifactId>
+ <artifactId>shardingsphere-distsql-parser-engine</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index cfc7483..da68478 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -58,7 +58,7 @@ import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.metadata.model.physical.model.schema.PhysicalSchemaMetaData;
import org.apache.shardingsphere.infra.rule.DataNodeRoutedRule;
import org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
-import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.engine.ShardingSphereSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement;
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index 4d6df1b..f850bf9 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -56,7 +56,7 @@ import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.metadata.model.physical.model.schema.PhysicalSchemaMetaData;
import org.apache.shardingsphere.infra.rule.DataNodeRoutedRule;
import org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
-import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.engine.ShardingSphereSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
index 3a03a77..dcdea18 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-rdl-parser-binder</artifactId>
+ <artifactId>shardingsphere-distsql-parser-binder</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
index d4822f1..6fa850c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
@@ -29,8 +29,8 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.ShardingCTLBackendHandl
import org.apache.shardingsphere.proxy.backend.text.sctl.utils.SCTLUtils;
import org.apache.shardingsphere.proxy.backend.text.skip.SkipBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.transaction.TransactionBackendHandlerFactory;
-import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLStatementParserEngine;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.RDLStatement;
+import org.apache.shardingsphere.distsql.parser.engine.ShardingSphereSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateDatabaseStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
index 9897e4d..6ebed1c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
@@ -37,10 +37,10 @@ import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.config.util.DataSourceParameterConverter;
import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
import org.apache.shardingsphere.proxy.convert.CreateDataSourcesStatementContextConverter;
-import org.apache.shardingsphere.rdl.parser.binder.context.CreateDataSourcesStatementContext;
-import org.apache.shardingsphere.rdl.parser.binder.context.CreateShardingRuleStatementContext;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateDataSourcesStatement;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateShardingRuleStatement;
+import org.apache.shardingsphere.distsql.parser.binder.context.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.distsql.parser.binder.context.CreateShardingRuleStatementContext;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
import org.apache.shardingsphere.sharding.convert.CreateShardingRuleStatementContextConverter;
import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java
index b226ee6..9d52971 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandler.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.proxy.backend.response.query.QueryData;
import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.sctl.exception.InvalidShardingCTLFormatException;
-import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.engine.ShardingSphereSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.Types;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandlerTest.java
index fe81ca9..c69c534 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandlerTest.java
@@ -30,8 +30,8 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.exception.DBCreateExistsException;
import org.apache.shardingsphere.proxy.backend.response.BackendResponse;
import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateDataSourcesStatement;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateShardingRuleStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateDatabaseStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabaseStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.ddl.MySQLCreateDatabaseStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
index b41819a..9ea8ff3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-rdl-parser-binder</artifactId>
+ <artifactId>shardingsphere-distsql-parser-binder</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/convert/CreateDataSourcesStatementContextConverter.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/convert/CreateDataSourcesStatementContextConverter.java
index 66b074f..aa76218 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/convert/CreateDataSourcesStatementContextConverter.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/convert/CreateDataSourcesStatementContextConverter.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.proxy.convert;
import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
-import org.apache.shardingsphere.rdl.parser.binder.context.CreateDataSourcesStatementContext;
-import org.apache.shardingsphere.rdl.parser.binder.generator.SQLStatementContextConverter;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.DataSourceConnectionSegment;
+import org.apache.shardingsphere.distsql.parser.binder.context.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.distsql.parser.binder.generator.SQLStatementContextConverter;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.DataSourceConnectionSegment;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/convert/CreateDataSourcesStatementContextConverterTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/convert/CreateDataSourcesStatementContextConverterTest.java
index 524509e..20bef9d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/convert/CreateDataSourcesStatementContextConverterTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/convert/CreateDataSourcesStatementContextConverterTest.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.proxy.convert;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
-import org.apache.shardingsphere.rdl.parser.binder.context.CreateDataSourcesStatementContext;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateDataSourcesStatement;
-import org.apache.shardingsphere.rdl.parser.statement.rdl.DataSourceConnectionSegment;
+import org.apache.shardingsphere.distsql.parser.binder.context.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.DataSourceConnectionSegment;
import org.junit.Before;
import org.junit.Test;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
index 228884f..e4dce8f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import org.apache.shardingsphere.proxy.frontend.mysql.command.query.builder.ResponsePacketBuilder;
-import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.engine.ShardingSphereSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.SQLException;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
index 8bb4234..07271a1 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.command.executor.CommandExecutor;
import org.apache.shardingsphere.proxy.frontend.exception.UnsupportedPreparedStatementException;
-import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.engine.ShardingSphereSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
index b7d4647..86d3b65 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/fieldlist/MySQLComFieldListPacketExecutor.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicati
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.command.executor.CommandExecutor;
-import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.engine.ShardingSphereSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.SQLException;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
index beabda8..0df2e4d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
@@ -43,7 +43,7 @@ import org.apache.shardingsphere.proxy.backend.response.query.QueryResponse;
import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
import org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
-import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.engine.ShardingSphereSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.ResultSetMetaData;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/parse/PostgreSQLComParseExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/parse/PostgreSQLComParseExecutor.java
index d3432b5..4e5bf52 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/parse/PostgreSQLComParseExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/parse/PostgreSQLComParseExecutor.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.command.executor.CommandExecutor;
-import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.engine.ShardingSphereSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Collection;