You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by do...@apache.org on 2020/10/31 11:02:51 UTC
[shardingsphere] branch master updated: Merge
shardingsphere-distsql-parser-binder into shardingsphere-infra-binder
(#7993)
This is an automated email from the ASF dual-hosted git repository.
dongzonglei 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 8130da3 Merge shardingsphere-distsql-parser-binder into shardingsphere-infra-binder (#7993)
8130da3 is described below
commit 8130da3ff304da218078052855e68a9f0cb518d1
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Oct 31 19:02:23 2020 +0800
Merge shardingsphere-distsql-parser-binder into shardingsphere-infra-binder (#7993)
---
shardingsphere-distsql-parser/pom.xml | 1 -
.../shardingsphere-distsql-parser-binder/pom.xml | 48 ----------------------
.../shardingsphere-sharding-common/pom.xml | 7 +---
...reateShardingRuleStatementContextConverter.java | 2 +-
...eShardingRuleStatementContextConverterTest.java | 2 +-
.../rdl}/CreateDataSourcesStatementContext.java | 4 +-
.../rdl}/CreateShardingRuleStatementContext.java | 4 +-
.../rdl}/util/DataSourceConnectionUrlUtil.java | 5 +--
.../rdl}/util/ShardingAlgorithmPropertiesUtil.java | 2 +-
.../rdl}/util/DataSourceConnectionUrlUtilTest.java | 26 ++++++------
.../shardingsphere-proxy-backend/pom.xml | 5 ---
.../backend/text/admin/RDLBackendHandler.java | 4 +-
.../shardingsphere-proxy-common/pom.xml | 6 +--
...CreateDataSourcesStatementContextConverter.java | 2 +-
...teDataSourcesStatementContextConverterTest.java | 2 +-
15 files changed, 28 insertions(+), 92 deletions(-)
diff --git a/shardingsphere-distsql-parser/pom.xml b/shardingsphere-distsql-parser/pom.xml
index 356ab85..5857f3b 100644
--- a/shardingsphere-distsql-parser/pom.xml
+++ b/shardingsphere-distsql-parser/pom.xml
@@ -32,6 +32,5 @@
<modules>
<module>shardingsphere-distsql-parser-statement</module>
<module>shardingsphere-distsql-parser-engine</module>
- <module>shardingsphere-distsql-parser-binder</module>
</modules>
</project>
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml
deleted file mode 100644
index 8aac110..0000000
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- 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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-parser</artifactId>
- <version>5.0.0-RC1-SNAPSHOT</version>
- </parent>
- <artifactId>shardingsphere-distsql-parser-binder</artifactId>
- <name>${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-parser-statement</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-binder</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml
index 7570f1f..092c20d 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml
@@ -29,12 +29,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-parser-binder</artifactId>
+ <artifactId>shardingsphere-infra-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/converter/CreateShardingRuleStatementContextConverter.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverter.java
index bd7b66c..905ecea 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverter.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverter.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.converter;
import com.google.common.base.Joiner;
import org.apache.shardingsphere.infra.yaml.config.algorithm.YamlShardingSphereAlgorithmConfiguration;
-import org.apache.shardingsphere.distsql.parser.binder.context.CreateShardingRuleStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.rdl.CreateShardingRuleStatementContext;
import org.apache.shardingsphere.infra.binder.converter.SQLStatementContextConverter;
import org.apache.shardingsphere.distsql.parser.statement.rdl.TableRuleSegment;
import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverterTest.java
index 938e208..59a034a 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sharding.converter;
-import org.apache.shardingsphere.distsql.parser.binder.context.CreateShardingRuleStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.rdl.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;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateDataSourcesStatementContext.java b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/CreateDataSourcesStatementContext.java
similarity index 92%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateDataSourcesStatementContext.java
rename to shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/CreateDataSourcesStatementContext.java
index d87f8cb..e01359a 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateDataSourcesStatementContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/CreateDataSourcesStatementContext.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.binder.context;
+package org.apache.shardingsphere.infra.binder.statement.rdl;
import lombok.Getter;
+import org.apache.shardingsphere.infra.binder.statement.rdl.util.DataSourceConnectionUrlUtil;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-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;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateShardingRuleStatementContext.java b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/CreateShardingRuleStatementContext.java
similarity index 91%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateShardingRuleStatementContext.java
rename to shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/CreateShardingRuleStatementContext.java
index 1e5a619..a86a35a 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context/CreateShardingRuleStatementContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/CreateShardingRuleStatementContext.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.binder.context;
+package org.apache.shardingsphere.infra.binder.statement.rdl;
-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 org.apache.shardingsphere.infra.binder.statement.rdl.util.ShardingAlgorithmPropertiesUtil;
import java.util.Properties;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtil.java b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/DataSourceConnectionUrlUtil.java
similarity index 87%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtil.java
rename to shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/DataSourceConnectionUrlUtil.java
index 84afbb9..02407ef 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtil.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/DataSourceConnectionUrlUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.binder.util;
+package org.apache.shardingsphere.infra.binder.statement.rdl.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -41,7 +41,6 @@ public final class DataSourceConnectionUrlUtil {
}
private static String getUrl(final DataSourceConnectionSegment connectionSegment, final String jdbcUrlPrefix) {
- return String.format("%s//%s:%s/%s", jdbcUrlPrefix,
- connectionSegment.getHostName(), connectionSegment.getPort(), connectionSegment.getDb());
+ return String.format("%s//%s:%s/%s", jdbcUrlPrefix, connectionSegment.getHostName(), connectionSegment.getPort(), connectionSegment.getDb());
}
}
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/ShardingAlgorithmPropertiesUtil.java b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/ShardingAlgorithmPropertiesUtil.java
similarity index 97%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/ShardingAlgorithmPropertiesUtil.java
rename to shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/ShardingAlgorithmPropertiesUtil.java
index fbfc0a5..9afc41d 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/util/ShardingAlgorithmPropertiesUtil.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/ShardingAlgorithmPropertiesUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.binder.util;
+package org.apache.shardingsphere.infra.binder.statement.rdl.util;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/test/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtilTest.java b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/DataSourceConnectionUrlUtilTest.java
similarity index 91%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/test/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtilTest.java
rename to shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/DataSourceConnectionUrlUtilTest.java
index d5756dc..bdee5d3 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/test/java/org/apache/shardingsphere/distsql/parser/binder/util/DataSourceConnectionUrlUtilTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/DataSourceConnectionUrlUtilTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.binder.util;
+package org.apache.shardingsphere.infra.binder.statement.rdl.util;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.DataSourceConnectionSegment;
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.distsql.parser.statement.rdl.DataSourceConnectionSegment;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat;
@RunWith(MockitoJUnitRunner.class)
public final class DataSourceConnectionUrlUtilTest {
-
+
@Test
public void assertMySQLGetUrl() {
DataSourceConnectionSegment segment = buildDataSourceConnectionSegment();
@@ -41,7 +41,7 @@ public final class DataSourceConnectionUrlUtilTest {
String expected = "jdbc:mysql://127.0.0.1:3306/test";
assertThat(actual, is(expected));
}
-
+
@Test
public void assertPostgreSQLGetUrl() {
DataSourceConnectionSegment segment = buildDataSourceConnectionSegment();
@@ -50,7 +50,7 @@ public final class DataSourceConnectionUrlUtilTest {
String expected = "jdbc:postgresql://127.0.0.1:3306/test";
assertThat(actual, is(expected));
}
-
+
@Test
public void assertMariaDBGetUrl() {
DataSourceConnectionSegment segment = buildDataSourceConnectionSegment();
@@ -59,7 +59,7 @@ public final class DataSourceConnectionUrlUtilTest {
String expected = "jdbc:mariadb://127.0.0.1:3306/test";
assertThat(actual, is(expected));
}
-
+
@Test
public void assertOracleGetUrl() {
DataSourceConnectionSegment segment = buildDataSourceConnectionSegment();
@@ -68,7 +68,7 @@ public final class DataSourceConnectionUrlUtilTest {
String expected = "jdbc:oracle://127.0.0.1:3306/test";
assertThat(actual, is(expected));
}
-
+
@Test
public void assertSQLServerGetUrl() {
DataSourceConnectionSegment segment = buildDataSourceConnectionSegment();
@@ -79,11 +79,11 @@ public final class DataSourceConnectionUrlUtilTest {
}
private DataSourceConnectionSegment buildDataSourceConnectionSegment() {
- DataSourceConnectionSegment segment = new DataSourceConnectionSegment();
- segment.setHostName("127.0.0.1");
- segment.setDb("test");
- segment.setUser("root");
- segment.setPort("3306");
- return segment;
+ DataSourceConnectionSegment result = new DataSourceConnectionSegment();
+ result.setHostName("127.0.0.1");
+ result.setDb("test");
+ result.setUser("root");
+ result.setPort("3306");
+ return result;
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
index c32d885..49d896a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
@@ -54,11 +54,6 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-parser-binder</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-db-protocol-core</artifactId>
<version>${project.version}</version>
</dependency>
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 3a853a7..f23bb75 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,8 +37,8 @@ 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.converter.CreateDataSourcesStatementContextConverter;
-import org.apache.shardingsphere.distsql.parser.binder.context.CreateDataSourcesStatementContext;
-import org.apache.shardingsphere.distsql.parser.binder.context.CreateShardingRuleStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.rdl.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.rdl.CreateShardingRuleStatementContext;
import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateShardingRuleStatement;
import org.apache.shardingsphere.sharding.converter.CreateShardingRuleStatementContextConverter;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
index 9ea8ff3..0af1f7d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
@@ -57,11 +57,7 @@
<artifactId>shardingsphere-encrypt-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-parser-binder</artifactId>
- <version>${project.version}</version>
- </dependency>
+
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverter.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverter.java
index 4deb912..d0f2c6d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverter.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverter.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.converter;
import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
-import org.apache.shardingsphere.distsql.parser.binder.context.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.rdl.CreateDataSourcesStatementContext;
import org.apache.shardingsphere.infra.binder.converter.SQLStatementContextConverter;
import org.apache.shardingsphere.distsql.parser.statement.rdl.DataSourceConnectionSegment;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverterTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverterTest.java
index 9834fb6..b9c3bc9 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverterTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverterTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.converter;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
-import org.apache.shardingsphere.distsql.parser.binder.context.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.infra.binder.statement.rdl.CreateDataSourcesStatementContext;
import org.apache.shardingsphere.distsql.parser.statement.rdl.CreateDataSourcesStatement;
import org.apache.shardingsphere.distsql.parser.statement.rdl.DataSourceConnectionSegment;
import org.junit.Before;