Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
8130da3f
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8130da3f
编写于
10月 31, 2020
作者:
L
Liang Zhang
提交者:
GitHub
10月 31, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge shardingsphere-distsql-parser-binder into shardingsphere-infra-binder (#7993)
上级
4ebe65d2
变更
15
显示空白变更内容
内联
并排
Showing
15 changed file
with
28 addition
and
92 deletion
+28
-92
shardingsphere-distsql-parser/pom.xml
shardingsphere-distsql-parser/pom.xml
+0
-1
shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml
...stsql-parser/shardingsphere-distsql-parser-binder/pom.xml
+0
-48
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml
...ingsphere-sharding/shardingsphere-sharding-common/pom.xml
+1
-6
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverter.java
...onverter/CreateShardingRuleStatementContextConverter.java
+1
-1
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverterTest.java
...rter/CreateShardingRuleStatementContextConverterTest.java
+1
-1
shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/CreateDataSourcesStatementContext.java
...nder/statement/rdl/CreateDataSourcesStatementContext.java
+2
-2
shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/CreateShardingRuleStatementContext.java
...der/statement/rdl/CreateShardingRuleStatementContext.java
+2
-2
shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/DataSourceConnectionUrlUtil.java
...inder/statement/rdl/util/DataSourceConnectionUrlUtil.java
+2
-3
shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/ShardingAlgorithmPropertiesUtil.java
...r/statement/rdl/util/ShardingAlgorithmPropertiesUtil.java
+1
-1
shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/rdl/util/DataSourceConnectionUrlUtilTest.java
...r/statement/rdl/util/DataSourceConnectionUrlUtilTest.java
+13
-13
shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
+0
-5
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
...ingsphere/proxy/backend/text/admin/RDLBackendHandler.java
+2
-2
shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
+1
-5
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverter.java
...converter/CreateDataSourcesStatementContextConverter.java
+1
-1
shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverterTest.java
...erter/CreateDataSourcesStatementContextConverterTest.java
+1
-1
未找到文件。
shardingsphere-distsql-parser/pom.xml
浏览文件 @
8130da3f
...
...
@@ -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>
shardingsphere-distsql-parser/shardingsphere-distsql-parser-binder/pom.xml
已删除
100644 → 0
浏览文件 @
4ebe65d2
<?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>
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/pom.xml
浏览文件 @
8130da3f
...
...
@@ -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>
...
...
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverter.java
浏览文件 @
8130da3f
...
...
@@ -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
;
...
...
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/converter/CreateShardingRuleStatementContextConverterTest.java
浏览文件 @
8130da3f
...
...
@@ -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
;
...
...
shardingsphere-
distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context
/CreateDataSourcesStatementContext.java
→
shardingsphere-
infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl
/CreateDataSourcesStatementContext.java
浏览文件 @
8130da3f
...
...
@@ -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
;
...
...
shardingsphere-
distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder/context
/CreateShardingRuleStatementContext.java
→
shardingsphere-
infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl
/CreateShardingRuleStatementContext.java
浏览文件 @
8130da3f
...
...
@@ -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
;
...
...
shardingsphere-
distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder
/util/DataSourceConnectionUrlUtil.java
→
shardingsphere-
infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl
/util/DataSourceConnectionUrlUtil.java
浏览文件 @
8130da3f
...
...
@@ -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
());
}
}
shardingsphere-
distsql-parser/shardingsphere-distsql-parser-binder/src/main/java/org/apache/shardingsphere/distsql/parser/binder
/util/ShardingAlgorithmPropertiesUtil.java
→
shardingsphere-
infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl
/util/ShardingAlgorithmPropertiesUtil.java
浏览文件 @
8130da3f
...
...
@@ -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
;
...
...
shardingsphere-
distsql-parser/shardingsphere-distsql-parser-binder/src/test/java/org/apache/shardingsphere/distsql/parser/binder
/util/DataSourceConnectionUrlUtilTest.java
→
shardingsphere-
infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/rdl
/util/DataSourceConnectionUrlUtilTest.java
浏览文件 @
8130da3f
...
...
@@ -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
;
...
...
@@ -79,11 +79,11 @@ public final class DataSourceConnectionUrlUtilTest {
}
private
DataSourceConnectionSegment
buildDataSourceConnectionSegment
()
{
DataSourceConnectionSegment
segmen
t
=
new
DataSourceConnectionSegment
();
segmen
t
.
setHostName
(
"127.0.0.1"
);
segmen
t
.
setDb
(
"test"
);
segmen
t
.
setUser
(
"root"
);
segmen
t
.
setPort
(
"3306"
);
return
segmen
t
;
DataSourceConnectionSegment
resul
t
=
new
DataSourceConnectionSegment
();
resul
t
.
setHostName
(
"127.0.0.1"
);
resul
t
.
setDb
(
"test"
);
resul
t
.
setUser
(
"root"
);
resul
t
.
setPort
(
"3306"
);
return
resul
t
;
}
}
shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
浏览文件 @
8130da3f
...
...
@@ -52,11 +52,6 @@
<artifactId>
shardingsphere-sql-parser-sqlserver
</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>
org.apache.shardingsphere
</groupId>
<artifactId>
shardingsphere-db-protocol-core
</artifactId>
...
...
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/RDLBackendHandler.java
浏览文件 @
8130da3f
...
...
@@ -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
;
...
...
shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
浏览文件 @
8130da3f
...
...
@@ -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>
...
...
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverter.java
浏览文件 @
8130da3f
...
...
@@ -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
;
...
...
shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/converter/CreateDataSourcesStatementContextConverterTest.java
浏览文件 @
8130da3f
...
...
@@ -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
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录