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 2693f88 Split RDL to RDL and RQL (#8645)
2693f88 is described below
commit 2693f88172ac08e86938b0d6c21dfbaf4b50b14b
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Dec 16 15:54:21 2020 +0800
Split RDL to RDL and RQL (#8645)
* Support drop sharding rule by table names
* Split RDL to RDL and RQL
---
.../src/main/antlr4/imports/RDLStatement.g4 | 16 --------------
.../RQLStatement.g4} | 25 ++++++++++++++--------
.../distsql/parser/autogen/DistSQLStatement.g4 | 2 +-
.../distsql/parser/core/DistSQLVisitor.java | 8 +++----
.../{rdl => }/DataSourceConnectionSegment.java | 2 +-
.../parser/segment/{rdl => }/TableRuleSegment.java | 2 +-
.../create/impl/CreateDataSourcesStatement.java | 2 +-
.../create/impl/CreateShardingRuleStatement.java | 2 +-
.../RQLStatement.java} | 8 +++----
.../show}/ShowDataSourcesStatement.java | 6 +++---
.../show/impl => rql/show}/ShowRuleStatement.java | 6 +++---
...reateShardingRuleStatementContextConverter.java | 2 +-
...eShardingRuleStatementContextConverterTest.java | 2 +-
.../rdl/ShowDataSourcesStatementContext.java | 2 +-
.../statement/rdl/ShowRuleStatementContext.java | 2 +-
.../text/TextProtocolBackendHandlerFactory.java | 8 +++----
.../DistSQLBackendHandlerFactory.java} | 20 ++++++++---------
.../rdl/RDLBackendHandler.java} | 6 +++---
.../rql}/DataSourcesQueryBackendHandler.java | 4 ++--
.../rql}/RuleQueryBackendHandler.java | 4 ++--
.../{rdl => distsql}/RDLBackendHandlerTest.java | 14 ++++++------
...CreateDataSourcesStatementContextConverter.java | 2 +-
...teDataSourcesStatementContextConverterTest.java | 2 +-
.../transaction/core/TransactionManagerType.java | 3 ++-
24 files changed, 71 insertions(+), 79 deletions(-)
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4
index fcedec1..16361de 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4
@@ -102,19 +102,3 @@ columName
dropShardingRule
: DROP SHARDING RULE LP tableName (COMMA tableName)* RP
;
-
-showDataSources
- : SHOW DATASOURCES (FROM schemaName)?
- ;
-
-showRule
- : SHOW ruleType RULE (FROM schemaName)?
- ;
-
-ruleType
- : SHARDING | REPLICA_QUERY | ENCRYPT | SHADOW
- ;
-
-schemaName
- : IDENTIFIER
- ;
\ No newline at end of file
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RQLStatement.g4
similarity index 74%
copy from
shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
copy to
shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RQLStatement.g4
index b6407dd..4bd2e37 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RQLStatement.g4
@@ -15,15 +15,22 @@
* limitations under the License.
*/
-grammar DistSQLStatement;
+grammar RQLStatement;
-import Symbol, RDLStatement;
+import Keyword, Literals, Symbol;
-execute
- : (createDataSources
- | createShardingRule
- | dropShardingRule
- | showDataSources
- | showRule
- ) SEMI?
+showDataSources
+ : SHOW DATASOURCES (FROM schemaName)?
+ ;
+
+showRule
+ : SHOW ruleType RULE (FROM schemaName)?
+ ;
+
+ruleType
+ : SHARDING | REPLICA_QUERY | ENCRYPT | SHADOW
+ ;
+
+schemaName
+ : IDENTIFIER
;
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
index b6407dd..87debf7 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
@@ -17,7 +17,7 @@
grammar DistSQLStatement;
-import Symbol, RDLStatement;
+import Symbol, RDLStatement, RQLStatement;
execute
: (createDataSources
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLVisitor.java
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLVisitor.java
index e408fc1..b332118 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLVisitor.java
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLVisitor.java
@@ -30,13 +30,13 @@ import
org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.S
import
org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.ShowDataSourcesContext;
import
org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.ShowRuleContext;
import
org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.TableNameContext;
-import
org.apache.shardingsphere.distsql.parser.segment.rdl.DataSourceConnectionSegment;
-import org.apache.shardingsphere.distsql.parser.segment.rdl.TableRuleSegment;
+import
org.apache.shardingsphere.distsql.parser.segment.DataSourceConnectionSegment;
+import org.apache.shardingsphere.distsql.parser.segment.TableRuleSegment;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.impl.CreateDataSourcesStatement;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.impl.CreateShardingRuleStatement;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.drop.impl.DropShardingRuleStatement;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl.ShowDataSourcesStatement;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl.ShowRuleStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowDataSourcesStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRuleStatement;
import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.SchemaSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment;
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/DataSourceConnectionSegment.java
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceConnectionSegment.java
similarity index 95%
rename from
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/DataSourceConnectionSegment.java
rename to
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceConnectionSegment.java
index 695b24e..ae6d09c 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/DataSourceConnectionSegment.java
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceConnectionSegment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.segment.rdl;
+package org.apache.shardingsphere.distsql.parser.segment;
import lombok.Getter;
import lombok.Setter;
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/TableRuleSegment.java
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/TableRuleSegment.java
similarity index 95%
rename from
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/TableRuleSegment.java
rename to
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/TableRuleSegment.java
index 1405c16..0adcaf6 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/rdl/TableRuleSegment.java
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/TableRuleSegment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.segment.rdl;
+package org.apache.shardingsphere.distsql.parser.segment;
import lombok.Getter;
import lombok.Setter;
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/impl/CreateDataSourcesStatement.java
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/impl/CreateDataSourcesStatement.java
index 8b427f2..c41752a 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/impl/CreateDataSourcesStatement.java
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/impl/CreateDataSourcesStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.distsql.parser.statement.rdl.create.impl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.segment.rdl.DataSourceConnectionSegment;
+import
org.apache.shardingsphere.distsql.parser.segment.DataSourceConnectionSegment;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRDLStatement;
import java.util.Collection;
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/impl/CreateShardingRuleStatement.java
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/impl/CreateShardingRuleStatement.java
index 07c0d31..dfa1f1a 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/impl/CreateShardingRuleStatement.java
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/impl/CreateShardingRuleStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.distsql.parser.statement.rdl.create.impl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.parser.segment.rdl.TableRuleSegment;
+import org.apache.shardingsphere.distsql.parser.segment.TableRuleSegment;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRDLStatement;
import java.util.Collection;
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/show/ShowRDLStatement.java
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java
similarity index 77%
rename from
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/show/ShowRDLStatement.java
rename to
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java
index 8dd18dd..a59d186 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/show/ShowRDLStatement.java
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.statement.rdl.show;
+package org.apache.shardingsphere.distsql.parser.statement.rql;
-import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement;
+import
org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStatement;
/**
- * Show RDL statement.
+ * RQL statement.
*/
-public abstract class ShowRDLStatement extends RDLStatement {
+public abstract class RQLStatement extends AbstractSQLStatement {
}
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/show/impl/ShowDataSourcesStatement.java
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowDataSourcesStatement.java
similarity index 82%
rename from
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/show/impl/ShowDataSourcesStatement.java
rename to
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowDataSourcesStatement.java
index 3793285..60476a9 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/show/impl/ShowDataSourcesStatement.java
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowDataSourcesStatement.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl;
+package org.apache.shardingsphere.distsql.parser.statement.rql.show;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.ShowRDLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.SchemaSegment;
/**
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.SchemaSeg
*/
@RequiredArgsConstructor
@Getter
-public final class ShowDataSourcesStatement extends ShowRDLStatement {
+public final class ShowDataSourcesStatement extends RQLStatement {
private final SchemaSegment schemaName;
}
diff --git
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/show/impl/ShowRuleStatement.java
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRuleStatement.java
similarity index 83%
rename from
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/show/impl/ShowRuleStatement.java
rename to
shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRuleStatement.java
index e30ff47..e38f505 100644
---
a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/show/impl/ShowRuleStatement.java
+++
b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRuleStatement.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl;
+package org.apache.shardingsphere.distsql.parser.statement.rql.show;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.ShowRDLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.SchemaSegment;
/**
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.SchemaSeg
*/
@RequiredArgsConstructor
@Getter
-public final class ShowRuleStatement extends ShowRDLStatement {
+public final class ShowRuleStatement extends RQLStatement {
private final String ruleType;
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 4b03399..91c9f60 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.sharding.converter;
import com.google.common.base.Joiner;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.parser.segment.rdl.TableRuleSegment;
+import org.apache.shardingsphere.distsql.parser.segment.TableRuleSegment;
import
org.apache.shardingsphere.infra.binder.statement.rdl.CreateShardingRuleStatementContext;
import
org.apache.shardingsphere.infra.yaml.config.algorithm.YamlShardingSphereAlgorithmConfiguration;
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 a3a06ed..18d1450 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.converter;
import
org.apache.shardingsphere.infra.binder.statement.rdl.CreateShardingRuleStatementContext;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.impl.CreateShardingRuleStatement;
-import org.apache.shardingsphere.distsql.parser.segment.rdl.TableRuleSegment;
+import org.apache.shardingsphere.distsql.parser.segment.TableRuleSegment;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.sharding.spi.ShardingAlgorithm;
import
org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/ShowDataSourcesStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/ShowDataSourcesStatementContext.java
index bf21219..8dbef02 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/ShowDataSourcesStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/ShowDataSourcesStatementContext.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.binder.statement.rdl;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl.ShowDataSourcesStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowDataSourcesStatement;
import
org.apache.shardingsphere.infra.binder.statement.CommonSQLStatementContext;
/**
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/ShowRuleStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/ShowRuleStatementContext.java
index 9b46f1c..e1bc564 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/ShowRuleStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/rdl/ShowRuleStatementContext.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.binder.statement.rdl;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl.ShowRuleStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRuleStatement;
import
org.apache.shardingsphere.infra.binder.statement.CommonSQLStatementContext;
/**
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 7332b3e..076e936 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
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.Bac
import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminBackendHandlerFactory;
import
org.apache.shardingsphere.proxy.backend.text.data.DatabaseBackendHandlerFactory;
-import
org.apache.shardingsphere.proxy.backend.text.rdl.RDLBackendHandlerFactory;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.DistSQLBackendHandlerFactory;
import
org.apache.shardingsphere.proxy.backend.text.sctl.ShardingCTLBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.text.sctl.utils.SCTLUtils;
import org.apache.shardingsphere.proxy.backend.text.skip.SkipBackendHandler;
@@ -78,9 +78,9 @@ public final class TextProtocolBackendHandlerFactory {
return databaseAdminBackendHandler.get();
}
}
- Optional<TextProtocolBackendHandler> rdlBackendHandler =
RDLBackendHandlerFactory.newInstance(sqlStatement, backendConnection);
- if (rdlBackendHandler.isPresent()) {
- return rdlBackendHandler.get();
+ Optional<TextProtocolBackendHandler> distSQLBackendHandler =
DistSQLBackendHandlerFactory.newInstance(sqlStatement, backendConnection);
+ if (distSQLBackendHandler.isPresent()) {
+ return distSQLBackendHandler.get();
}
return DatabaseBackendHandlerFactory.newInstance(sqlStatement, sql,
backendConnection);
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/RDLBackendHandlerFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
similarity index 76%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/RDLBackendHandlerFactory.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
index 7042996..67a844c 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/RDLBackendHandlerFactory.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactory.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.rdl;
+package org.apache.shardingsphere.proxy.backend.text.distsql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl.ShowDataSourcesStatement;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl.ShowRuleStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowDataSourcesStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRuleStatement;
import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.rdl.query.DataSourcesQueryBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.rdl.query.RuleQueryBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.rdl.update.RDLUpdateBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.rql.DataSourcesQueryBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.rql.RuleQueryBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.rdl.RDLBackendHandler;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateDatabaseStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabaseStatement;
@@ -34,13 +34,13 @@ import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabas
import java.util.Optional;
/**
- * RDL backend handler factory.
+ * DistSQL backend handler factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class RDLBackendHandlerFactory {
+public final class DistSQLBackendHandlerFactory {
/**
- * Create new instance of RDL backend handler.
+ * Create new instance of DistSQL backend handler.
*
* @param sqlStatement SQL statement
* @param backendConnection backend connection
@@ -54,7 +54,7 @@ public final class RDLBackendHandlerFactory {
return Optional.of(new
DataSourcesQueryBackendHandler((ShowDataSourcesStatement) sqlStatement,
backendConnection));
}
if (sqlStatement instanceof RDLStatement || sqlStatement instanceof
CreateDatabaseStatement || sqlStatement instanceof DropDatabaseStatement) {
- return Optional.of(new RDLUpdateBackendHandler(sqlStatement,
backendConnection));
+ return Optional.of(new RDLBackendHandler(sqlStatement,
backendConnection));
}
return Optional.empty();
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/update/RDLUpdateBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandler.java
similarity index 98%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/update/RDLUpdateBackendHandler.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandler.java
index 6f11c5b..51ef3b1 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/update/RDLUpdateBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.rdl.update;
+package org.apache.shardingsphere.proxy.backend.text.distsql.rdl;
import com.google.common.base.Joiner;
import lombok.RequiredArgsConstructor;
@@ -69,10 +69,10 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Backend handler for RDL update.
+ * RDL backend handler.
*/
@RequiredArgsConstructor
-public final class RDLUpdateBackendHandler implements
TextProtocolBackendHandler {
+public final class RDLBackendHandler implements TextProtocolBackendHandler {
private final SQLStatement sqlStatement;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/query/DataSourcesQueryBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/DataSourcesQueryBackendHandler.java
similarity index 96%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/query/DataSourcesQueryBackendHandler.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/DataSourcesQueryBackendHandler.java
index f236d2d..7f32de4 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/query/DataSourcesQueryBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/DataSourcesQueryBackendHandler.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.rdl.query;
+package org.apache.shardingsphere.proxy.backend.text.distsql.rql;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl.ShowDataSourcesStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowDataSourcesStatement;
import
org.apache.shardingsphere.infra.binder.statement.rdl.ShowDataSourcesStatementContext;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/query/RuleQueryBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RuleQueryBackendHandler.java
similarity index 97%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/query/RuleQueryBackendHandler.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RuleQueryBackendHandler.java
index ed9198a..8db3973 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/rdl/query/RuleQueryBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RuleQueryBackendHandler.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.rdl.query;
+package org.apache.shardingsphere.proxy.backend.text.distsql.rql;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.rdl.show.impl.ShowRuleStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRuleStatement;
import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
import
org.apache.shardingsphere.infra.binder.statement.rdl.ShowRuleStatementContext;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/rdl/RDLBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/RDLBackendHandlerTest.java
similarity index 93%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/rdl/RDLBackendHandlerTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/RDLBackendHandlerTest.java
index ce815e3..9d44b5d 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/rdl/RDLBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/RDLBackendHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.rdl;
+package org.apache.shardingsphere.proxy.backend.text.distsql;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.impl.CreateDataSourcesStatement;
@@ -32,7 +32,7 @@ import
org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.exception.DBCreateExistsException;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.rdl.update.RDLUpdateBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.rdl.RDLBackendHandler;
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;
@@ -81,7 +81,7 @@ public final class RDLBackendHandlerTest {
BackendConnection connection = mock(BackendConnection.class);
when(connection.getSchemaName()).thenReturn("schema");
sqlStatement.setDatabaseName("new_db");
- RDLUpdateBackendHandler executeEngine = new
RDLUpdateBackendHandler(sqlStatement, connection);
+ RDLBackendHandler executeEngine = new RDLBackendHandler(sqlStatement,
connection);
try {
executeEngine.execute();
} catch (final SQLException ex) {
@@ -106,7 +106,7 @@ public final class RDLBackendHandlerTest {
BackendConnection connection = mock(BackendConnection.class);
when(connection.getSchemaName()).thenReturn("schema");
sqlStatement.setDatabaseName("schema");
- RDLUpdateBackendHandler executeEngine = new
RDLUpdateBackendHandler(sqlStatement, connection);
+ RDLBackendHandler executeEngine = new RDLBackendHandler(sqlStatement,
connection);
try {
executeEngine.execute();
} catch (final SQLException ex) {
@@ -131,7 +131,7 @@ public final class RDLBackendHandlerTest {
BackendConnection connection = mock(BackendConnection.class);
when(connection.getSchemaName()).thenReturn("schema");
sqlStatement.setDatabaseName("schema");
- RDLUpdateBackendHandler executeEngine = new
RDLUpdateBackendHandler(sqlStatement, connection);
+ RDLBackendHandler executeEngine = new RDLBackendHandler(sqlStatement,
connection);
try {
executeEngine.execute();
} catch (final SQLException ex) {
@@ -155,7 +155,7 @@ public final class RDLBackendHandlerTest {
public void assertExecuteDataSourcesContext() throws SQLException {
BackendConnection connection = mock(BackendConnection.class);
when(connection.getSchemaName()).thenReturn("schema");
- RDLUpdateBackendHandler executeEngine = new
RDLUpdateBackendHandler(mock(CreateDataSourcesStatement.class), connection);
+ RDLBackendHandler executeEngine = new
RDLBackendHandler(mock(CreateDataSourcesStatement.class), connection);
try {
executeEngine.execute();
} catch (final SQLException ex) {
@@ -170,7 +170,7 @@ public final class RDLBackendHandlerTest {
public void assertExecuteShardingRuleContext() throws SQLException {
BackendConnection connection = mock(BackendConnection.class);
when(connection.getSchemaName()).thenReturn("schema");
- RDLUpdateBackendHandler executeEngine = new
RDLUpdateBackendHandler(mock(CreateShardingRuleStatement.class), connection);
+ RDLBackendHandler executeEngine = new
RDLBackendHandler(mock(CreateShardingRuleStatement.class), connection);
try {
executeEngine.execute();
} catch (final SQLException ex) {
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 3f4c0c1..e3b682a 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 lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.segment.rdl.DataSourceConnectionSegment;
+import
org.apache.shardingsphere.distsql.parser.segment.DataSourceConnectionSegment;
import
org.apache.shardingsphere.infra.binder.statement.rdl.CreateDataSourcesStatementContext;
import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
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 676a30a..e872f44 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
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.converter;
-import
org.apache.shardingsphere.distsql.parser.segment.rdl.DataSourceConnectionSegment;
+import
org.apache.shardingsphere.distsql.parser.segment.DataSourceConnectionSegment;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.impl.CreateDataSourcesStatement;
import
org.apache.shardingsphere.infra.binder.statement.rdl.CreateDataSourcesStatementContext;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
diff --git
a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
index e4dd360..ebb49bf 100644
---
a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
+++
b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
@@ -17,10 +17,11 @@
package org.apache.shardingsphere.transaction.core;
-import java.util.Arrays;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import java.util.Arrays;
+
/**
* Transaction manager type.
*/
