Create parser binder and statements (#6491)

* Create parser binder and statements * license
apache · Jul 28, 2020 · 263a492 · 263a492
1 parent c899766
commit 263a492
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 25 deletions.
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
@@ -52,6 +52,11 @@
             <artifactId>shardingsphere-sql-parser-sqlserver</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-rdl-parser-binder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>shardingsphere-db-protocol-core</artifactId>

diff --git a/...apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactory.java b/...apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactory.java
@@ -28,9 +28,9 @@
 import org.apache.shardingsphere.proxy.backend.communication.jdbc.wrapper.JDBCExecutorWrapper;
 import org.apache.shardingsphere.proxy.backend.communication.jdbc.wrapper.PreparedStatementExecutorWrapper;
 import org.apache.shardingsphere.proxy.backend.communication.jdbc.wrapper.StatementExecutorWrapper;
+import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateDataSourcesStatement;
+import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateShardingRuleStatement;
 import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
-import org.apache.shardingsphere.sql.parser.sql.statement.ddl.CreateDataSourcesStatement;
-import org.apache.shardingsphere.sql.parser.sql.statement.ddl.CreateShardingRuleStatement;
 
 import java.util.List;
 

diff --git a/.../shardingsphere/proxy/backend/communication/jdbc/execute/RegistryCenterExecuteEngine.java b/.../shardingsphere/proxy/backend/communication/jdbc/execute/RegistryCenterExecuteEngine.java
@@ -33,10 +33,10 @@
 import org.apache.shardingsphere.proxy.backend.schema.ProxySchemaContexts;
 import org.apache.shardingsphere.proxy.config.util.DataSourceConverter;
 import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateShardingRuleStatementContext;
 import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
 import org.apache.shardingsphere.sql.parser.binder.statement.CommonSQLStatementContext;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateDataSourcesStatementContext;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateShardingRuleStatementContext;
 import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
 
 import java.sql.SQLException;

diff --git a/...xy/backend/communication/jdbc/execute/generator/YamlDataSourceConfigurationGenerator.java b/...xy/backend/communication/jdbc/execute/generator/YamlDataSourceConfigurationGenerator.java
@@ -18,8 +18,9 @@
 package org.apache.shardingsphere.proxy.backend.communication.jdbc.execute.generator;
 
 import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateDataSourcesStatementContext;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateDataSourcesStatementContext.DataSourceContext;
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateDataSourcesStatementContext.DataSourceContext;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 

diff --git a/.../backend/communication/jdbc/execute/generator/YamlShardingRuleConfigurationGenerator.java b/.../backend/communication/jdbc/execute/generator/YamlShardingRuleConfigurationGenerator.java
@@ -19,11 +19,11 @@
 
 import com.google.common.base.Joiner;
 import org.apache.shardingsphere.infra.yaml.config.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateShardingRuleStatementContext;
 import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
 import org.apache.shardingsphere.sharding.yaml.config.rule.YamlShardingAutoTableRuleConfiguration;
 import org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlShardingStrategyConfiguration;
 import org.apache.shardingsphere.sharding.yaml.config.strategy.sharding.YamlStandardShardingStrategyConfiguration;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateShardingRuleStatementContext;
 
 /**
  * Yaml sharding rule configuration generator.

diff --git a/...rdingsphere/proxy/backend/communication/jdbc/execute/RegistryCenterExecuteEngineTest.java b/...rdingsphere/proxy/backend/communication/jdbc/execute/RegistryCenterExecuteEngineTest.java
@@ -24,10 +24,10 @@
 import org.apache.shardingsphere.proxy.backend.response.error.ErrorResponse;
 import org.apache.shardingsphere.proxy.backend.response.update.UpdateResponse;
 import org.apache.shardingsphere.proxy.backend.schema.ProxySchemaContexts;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateDataSourcesStatementContext;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateShardingRuleStatementContext;
-import org.apache.shardingsphere.sql.parser.sql.statement.ddl.CreateDataSourcesStatement;
-import org.apache.shardingsphere.sql.parser.sql.statement.ddl.CreateShardingRuleStatement;
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateShardingRuleStatementContext;
+import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateDataSourcesStatement;
+import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateShardingRuleStatement;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...ackend/communication/jdbc/execute/generator/YamlDataSourceConfigurationGeneratorTest.java b/...ackend/communication/jdbc/execute/generator/YamlDataSourceConfigurationGeneratorTest.java
@@ -1,8 +1,8 @@
 package org.apache.shardingsphere.proxy.backend.communication.jdbc.execute.generator;
 
 import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateDataSourcesStatementContext;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateDataSourcesStatementContext.DataSourceContext;
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateDataSourcesStatementContext;
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateDataSourcesStatementContext.DataSourceContext;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/...kend/communication/jdbc/execute/generator/YamlShardingRuleConfigurationGeneratorTest.java b/...kend/communication/jdbc/execute/generator/YamlShardingRuleConfigurationGeneratorTest.java
@@ -1,7 +1,7 @@
 package org.apache.shardingsphere.proxy.backend.communication.jdbc.execute.generator;
 
+import org.apache.shardingsphere.rdl.parser.binder.context.CreateShardingRuleStatementContext;
 import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
-import org.apache.shardingsphere.sql.parser.binder.statement.ddl.CreateShardingRuleStatementContext;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/shardingsphere-rdl-parser/pom.xml b/shardingsphere-rdl-parser/pom.xml
@@ -33,5 +33,6 @@
         <module>shardingsphere-rdl-parser-sql</module>
         <module>shardingsphere-rdl-parser-statement</module>
         <module>shardingsphere-rdl-parser-engine</module>
+        <module>shardingsphere-rdl-parser-binder</module>
     </modules>
 </project>
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/pom.xml b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-binder/pom.xml
@@ -0,0 +1,42 @@
+<?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">
+    <parent>
+        <artifactId>shardingsphere-rdl-parser</artifactId>
+        <groupId>org.apache.shardingsphere</groupId>
+        <version>5.0.0-RC1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>shardingsphere-rdl-parser-binder</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-rdl-parser-statement</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-sql-parser-binder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...dl/CreateDataSourcesStatementContext.java → ...xt/CreateDataSourcesStatementContext.java b/...dl/CreateDataSourcesStatementContext.java → ...xt/CreateDataSourcesStatementContext.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sql.parser.binder.statement.ddl;
+package org.apache.shardingsphere.rdl.parser.binder.context;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateDataSourcesStatement;
 import org.apache.shardingsphere.sql.parser.binder.statement.CommonSQLStatementContext;
-import org.apache.shardingsphere.sql.parser.sql.statement.ddl.CreateDataSourcesStatement;
 
 import java.util.Collection;
 import java.util.LinkedList;

diff --git a/...l/CreateShardingRuleStatementContext.java → ...t/CreateShardingRuleStatementContext.java b/...l/CreateShardingRuleStatementContext.java → ...t/CreateShardingRuleStatementContext.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sql.parser.binder.statement.ddl;
+package org.apache.shardingsphere.rdl.parser.binder.context;
 
+import org.apache.shardingsphere.rdl.parser.statement.rdl.CreateShardingRuleStatement;
 import org.apache.shardingsphere.sql.parser.binder.statement.CommonSQLStatementContext;
-import org.apache.shardingsphere.sql.parser.sql.statement.ddl.CreateShardingRuleStatement;
 
 import java.util.Collection;
 import java.util.LinkedList;

diff --git a/...src/main/java/org/apache/shardingsphere/rdl/parser/sql/visitor/ShardingSphereVisitor.java b/...src/main/java/org/apache/shardingsphere/rdl/parser/sql/visitor/ShardingSphereVisitor.java
@@ -20,17 +20,17 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.apache.shardingsphere.rdl.parser.sql.autogen.ShardingSphereStatementBaseVisitor;
-import org.apache.shardingsphere.rdl.parser.sql.autogen.ShardingSphereStatementParser;
+import org.apache.shardingsphere.rdl.parser.sql.autogen.ShardingSphereStatementParser.CreateDatasourceContext;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 
 /**
- * MySQL visitor.
+ * ShardingSphere visitor.
  */
 @Getter(AccessLevel.PROTECTED)
 public final class ShardingSphereVisitor extends ShardingSphereStatementBaseVisitor<ASTNode> {
 
     @Override
-    public ASTNode visitCreateDatasource(final ShardingSphereStatementParser.CreateDatasourceContext ctx) {
+    public ASTNode visitCreateDatasource(final CreateDatasourceContext ctx) {
         return super.visitCreateDatasource(ctx);
     }
 }
diff --git a/...ement/ddl/CreateDataSourcesStatement.java → ...ement/rdl/CreateDataSourcesStatement.java b/...ement/ddl/CreateDataSourcesStatement.java → ...ement/rdl/CreateDataSourcesStatement.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sql.parser.sql.statement.ddl;
+package org.apache.shardingsphere.rdl.parser.statement.rdl;
 
 /**
  * Create dataSource statement.
  */
-public final class CreateDataSourcesStatement extends DDLStatement {
+public final class CreateDataSourcesStatement extends RDLStatement {
 }
diff --git a/...ment/ddl/CreateShardingRuleStatement.java → ...ment/rdl/CreateShardingRuleStatement.java b/...ment/ddl/CreateShardingRuleStatement.java → ...ment/rdl/CreateShardingRuleStatement.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sql.parser.sql.statement.ddl;
+package org.apache.shardingsphere.rdl.parser.statement.rdl;
 
 /**
  * Create sharding rule statement.
  */
-public final class CreateShardingRuleStatement extends DDLStatement {
+public final class CreateShardingRuleStatement extends RDLStatement {
 }
diff --git a/...tement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/RDLStatement.java b/...tement/src/main/java/org/apache/shardingsphere/rdl/parser/statement/rdl/RDLStatement.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+package org.apache.shardingsphere.rdl.parser.statement.rdl;
+
+import org.apache.shardingsphere.sql.parser.sql.statement.AbstractSQLStatement;
+
+/**
+ * RDL statement.
+ */
+public abstract class RDLStatement extends AbstractSQLStatement {
+}