From 8130da3ff304da218078052855e68a9f0cb518d1 Mon Sep 17 00:00:00 2001 From: Liang Zhang Date: Sat, 31 Oct 2020 19:02:23 +0800 Subject: [PATCH] Merge shardingsphere-distsql-parser-binder into shardingsphere-infra-binder (#7993) --- shardingsphere-distsql-parser/pom.xml | 1 - .../pom.xml | 48 ------------------- .../shardingsphere-sharding-common/pom.xml | 7 +-- ...ShardingRuleStatementContextConverter.java | 2 +- ...dingRuleStatementContextConverterTest.java | 2 +- .../CreateDataSourcesStatementContext.java | 4 +- .../CreateShardingRuleStatementContext.java | 4 +- .../util/DataSourceConnectionUrlUtil.java | 5 +- .../util/ShardingAlgorithmPropertiesUtil.java | 2 +- .../util/DataSourceConnectionUrlUtilTest.java | 26 +++++----- .../shardingsphere-proxy-backend/pom.xml | 5 -- .../backend/text/admin/RDLBackendHandler.java | 4 +- .../shardingsphere-proxy-common/pom.xml | 6 +-- ...eDataSourcesStatementContextConverter.java | 2 +- ...aSourcesStatementContextConverterTest.java | 2 +- 15 files changed, 28 insertions(+), 92 deletions(-) delete mode 100644 shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml rename {shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context => shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl}/CreateDataSourcesStatementContext.java (92%) rename {shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context => shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl}/CreateShardingRuleStatementContext.java (91%) rename {shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder => shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl}/util/DataSourceConnectionUrlUtil.java (87%) rename {shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder => shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl}/util/ShardingAlgorithmPropertiesUtil.java (97%) rename {shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/src/test/java/org/apache/shardingsphere/distsql/parser/binder => shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/rdl}/util/DataSourceConnectionUrlUtilTest.java (91%) diff --git a/shardingsphere-distsql-parser/pom.xml b/shardingsphere-distsql-parser/pom.xml index 356ab856da..5857f3bf04 100644 --- a/shardingsphere-distsql-parser/pom.xml +++ b/shardingsphere-distsql-parser/pom.xml @@ -32,6 +32,5 @@ shardingsphere-distsql-parser-statement shardingsphere-distsql-parser-engine - shardingsphere-distsql-parser-binder 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 8aac1105f8..0000000000 --- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - 4.0.0 - - org.apache.shardingsphere - shardingsphere-distsql-parser - 5.0.0-RC1-SNAPSHOT - - shardingsphere-distsql-parser-binder - ${project.artifactId} - - - - org.apache.shardingsphere - shardingsphere-infra-common - ${project.version} - - - org.apache.shardingsphere - shardingsphere-distsql-parser-statement - ${project.version} - - - org.apache.shardingsphere - shardingsphere-infra-binder - ${project.version} - - - diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml index 7570f1f570..092c20dda7 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 @@ org.apache.shardingsphere - shardingsphere-infra-common - ${project.version} - - - org.apache.shardingsphere - shardingsphere-distsql-parser-binder + shardingsphere-infra-binder ${project.version} 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 bd7b66c25e..905ecea52b 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 938e208fb4..59a034ac33 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 d87f8cbfd1..e01359a80f 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 1e5a61939d..a86a35a744 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 84afbb9e0a..02407ef3fd 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 fbfc0a5ff9..9afc41d0cf 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 d5756dc0ca..bdee5d3282 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 c32d88552b..49d896a0c8 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml +++ b/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml @@ -52,11 +52,6 @@ shardingsphere-sql-parser-sqlserver ${project.version} - - org.apache.shardingsphere - shardingsphere-distsql-parser-binder - ${project.version} - org.apache.shardingsphere shardingsphere-db-protocol-core 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 3a853a775f..f23bb75d6e 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 9ea8ff3cc9..0af1f7d282 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml +++ b/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml @@ -57,11 +57,7 @@ shardingsphere-encrypt-common ${project.version} - - org.apache.shardingsphere - shardingsphere-distsql-parser-binder - ${project.version} - + com.zaxxer HikariCP 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 4deb912e0d..d0f2c6d034 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 9834fb6cf9..b9c3bc901c 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; -- GitLab