You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/08/13 10:16:14 UTC
[shardingsphere] branch master updated: Add
advancedDistSQLStatement, and implement 'preview sql'. (#11802)
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 933ebab Add advancedDistSQLStatement, and implement 'preview sql'. (#11802)
933ebab is described below
commit 933ebab23d2431213c8fc9b01d9d096115eca4f8
Author: Raigor <ra...@gmail.com>
AuthorDate: Fri Aug 13 18:15:48 2021 +0800
Add advancedDistSQLStatement, and implement 'preview sql'. (#11802)
* Add advancedDistSQLStatement, and implement 'preview sql'.
* fix `Actual should not exist` syntax problem.
---
.../AdvancedKeyword.g4} | 23 ++---
.../AdvancedStatement.g4} | 19 ++--
...SQLStatement.g4 => AdvancedDistSQLStatement.g4} | 13 +--
.../parser/autogen/CommonDistSQLStatement.g4 | 1 -
.../parser/api/DistSQLStatementParserEngine.java | 7 +-
.../core/advanced/AdvancedDistSQLLexer.java} | 18 ++--
.../core/advanced/AdvancedDistSQLParser.java} | 25 +++--
.../AdvancedDistSQLStatementParserEngine.java} | 29 ++++--
.../advanced/AdvancedDistSQLStatementVisitor.java | 36 +++++++
...tatement.java => AdvancedDistSQLStatement.java} | 8 +-
.../preview/PreviewStatement.java | 6 +-
.../text/distsql/ral/RALBackendHandlerFactory.java | 7 +-
.../AdvancedDistSQLBackendHandlerFactory.java | 50 ++++++++++
.../ral/advanced/PrviewDistSQLBackendHandler.java | 104 +++++++++++++++++++++
.../common/CommonDistSQLBackendHandlerFactory.java | 4 -
.../ral/common/PrviewDistSQLBackendHandler.java | 44 ---------
.../asserts/segment/distsql/PropertiesAssert.java | 4 +-
.../asserts/segment/distsql/PropertyAssert.java | 4 +-
.../asserts/segment/distsql/TableRuleAssert.java | 4 +-
.../distsql/rdl/DatabaseDiscoveryRuleAssert.java | 8 +-
.../segment/distsql/rdl/EncryptColumnAssert.java | 4 +-
.../segment/distsql/rdl/EncryptRuleAssert.java | 8 +-
.../distsql/rdl/ReadwriteSplittingRuleAssert.java | 22 ++---
.../rdl/ShardingBindingTableRuleAssert.java | 4 +-
.../statement/distsql/ral/RALStatementAssert.java | 4 +
.../ral/impl/AdvancedDistSQLStatementAssert.java} | 37 +++-----
.../ral/impl/advanced/PreviewStatementAssert.java} | 29 +++---
.../AlterDatabaseDiscoveryRuleStatementAssert.java | 8 +-
.../impl/AlterEncryptRuleStatementAssert.java | 8 +-
...AlterReadwriteSplittingRuleStatementAssert.java | 10 +-
...erShardingBindingTableRulesStatementAssert.java | 8 +-
...ShardingBroadcastTableRulesStatementAssert.java | 4 +-
.../AlterShardingTableRuleStatementAssert.java | 8 +-
.../rdl/create/AddResourceStatementAssert.java | 8 +-
...CreateDatabaseDiscoveryRuleStatementAssert.java | 8 +-
.../impl/CreateEncryptRuleStatementAssert.java | 8 +-
...reateReadwriteSplittingRuleStatementAssert.java | 8 +-
...teShardingBindingTableRulesStatementAssert.java | 8 +-
...ShardingBroadcastTableRulesStatementAssert.java | 4 +-
.../CreateShardingTableRuleStatementAssert.java | 8 +-
.../DropDatabaseDiscoveryRuleStatementAssert.java | 4 +-
.../drop/impl/DropEncryptRuleStatementAssert.java | 4 +-
.../DropReadwriteSplittingRuleStatementAssert.java | 6 +-
.../jaxb/cases/domain/SQLParserTestCases.java | 5 +
.../distsql/ral/PreviewStatementTestCase.java | 14 ++-
.../src/main/resources/case/ral/preview.xml | 21 +++++
.../main/resources/sql/supported/ral/preview.xml | 21 +++++
47 files changed, 446 insertions(+), 249 deletions(-)
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/AdvancedKeyword.g4
similarity index 77%
copy from shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
copy to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/AdvancedKeyword.g4
index 01bf552..4211c46 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/AdvancedKeyword.g4
@@ -15,17 +15,18 @@
* limitations under the License.
*/
-grammar CommonDistSQLStatement;
+lexer grammar AdvancedKeyword;
-import Symbol, RALStatement, RDLStatement, RQLStatement;
+import Alphabet;
-execute
- : (addResource
- | dropResource
- | showResources
- | setVariable
- | showVariable
-// | previewSQL
- | clearHint
- ) SEMI?
+WS
+ : [ \t\r\n] +
+ ;
+
+PREVIEW
+ : P R E V I E W
+ ;
+
+SQLString
+ : WS.*
;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/AdvancedStatement.g4
similarity index 77%
copy from shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
copy to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/AdvancedStatement.g4
index 01bf552..bd2ad2c 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/AdvancedStatement.g4
@@ -15,17 +15,14 @@
* limitations under the License.
*/
-grammar CommonDistSQLStatement;
+grammar AdvancedStatement;
-import Symbol, RALStatement, RDLStatement, RQLStatement;
+import AdvancedKeyword;
-execute
- : (addResource
- | dropResource
- | showResources
- | setVariable
- | showVariable
-// | previewSQL
- | clearHint
- ) SEMI?
+previewSQL
+ : PREVIEW sql
+ ;
+
+sql
+ : SQLString
;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/AdvancedDistSQLStatement.g4
similarity index 78%
copy from shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
copy to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/AdvancedDistSQLStatement.g4
index 01bf552..62ce8dd 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/AdvancedDistSQLStatement.g4
@@ -15,17 +15,10 @@
* limitations under the License.
*/
-grammar CommonDistSQLStatement;
+grammar AdvancedDistSQLStatement;
-import Symbol, RALStatement, RDLStatement, RQLStatement;
+import Symbol, AdvancedStatement;
execute
- : (addResource
- | dropResource
- | showResources
- | setVariable
- | showVariable
-// | previewSQL
- | clearHint
- ) SEMI?
+ : previewSQL SEMI?
;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
index 01bf552..f514dec 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/CommonDistSQLStatement.g4
@@ -25,7 +25,6 @@ execute
| showResources
| setVariable
| showVariable
-// | previewSQL
| clearHint
) SEMI?
;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java
index c29a59b..ac689a0 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.distsql.parser.api;
import org.antlr.v4.runtime.misc.ParseCancellationException;
+import org.apache.shardingsphere.distsql.parser.core.advanced.AdvancedDistSQLStatementParserEngine;
import org.apache.shardingsphere.distsql.parser.core.common.CommonDistSQLStatementParserEngine;
import org.apache.shardingsphere.distsql.parser.core.rule.FeaturedDistSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
@@ -38,7 +39,11 @@ public final class DistSQLStatementParserEngine {
try {
return new CommonDistSQLStatementParserEngine().parse(sql);
} catch (final ParseCancellationException | SQLParsingException ignored) {
- return new FeaturedDistSQLStatementParserEngine().parse(sql);
+ try {
+ return new FeaturedDistSQLStatementParserEngine().parse(sql);
+ } catch (SQLParsingException ignoredToo) {
+ return new AdvancedDistSQLStatementParserEngine().parse(sql);
+ }
}
}
}
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLLexer.java
similarity index 63%
copy from shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java
copy to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLLexer.java
index 271e545..b269c22 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLLexer.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.statement.ral.common.preview;
+package org.apache.shardingsphere.distsql.parser.core.advanced;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.parser.statement.ral.common.PreviewDistSQLStatement;
+import org.antlr.v4.runtime.CharStream;
+import org.apache.shardingsphere.distsql.parser.autogen.AdvancedDistSQLStatementLexer;
+import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
/**
- * Preview statement.
+ * SQL lexer for advanced dist SQL.
*/
-@RequiredArgsConstructor
-@Getter
-public final class PreviewStatement extends PreviewDistSQLStatement {
+public final class AdvancedDistSQLLexer extends AdvancedDistSQLStatementLexer implements SQLLexer {
- private final String sql;
+ public AdvancedDistSQLLexer(final CharStream input) {
+ super(input);
+ }
}
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLParser.java
similarity index 53%
copy from shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java
copy to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLParser.java
index 271e545..b3a5716 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLParser.java
@@ -15,18 +15,25 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.statement.ral.common.preview;
+package org.apache.shardingsphere.distsql.parser.core.advanced;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.parser.statement.ral.common.PreviewDistSQLStatement;
+import org.antlr.v4.runtime.TokenStream;
+import org.apache.shardingsphere.distsql.parser.autogen.AdvancedDistSQLStatementParser;
+import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
+import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
+import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
/**
- * Preview statement.
+ * SQL parser for advanced dist SQL.
*/
-@RequiredArgsConstructor
-@Getter
-public final class PreviewStatement extends PreviewDistSQLStatement {
+public final class AdvancedDistSQLParser extends AdvancedDistSQLStatementParser implements SQLParser {
- private final String sql;
+ public AdvancedDistSQLParser(final TokenStream input) {
+ super(input);
+ }
+
+ @Override
+ public ASTNode parse() {
+ return new ParseASTNode(execute());
+ }
}
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLStatementParserEngine.java
similarity index 52%
copy from shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java
copy to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLStatementParserEngine.java
index c29a59b..44612c5 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLStatementParserEngine.java
@@ -15,18 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.api;
+package org.apache.shardingsphere.distsql.parser.core.advanced;
import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.apache.shardingsphere.distsql.parser.core.common.CommonDistSQLStatementParserEngine;
-import org.apache.shardingsphere.distsql.parser.core.rule.FeaturedDistSQLStatementParserEngine;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
+import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
+import org.apache.shardingsphere.sql.parser.core.SQLParserFactory;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
- * Dist SQL statement parser engine.
+ * SQL statement parser engine for advanced dist SQL.
*/
-public final class DistSQLStatementParserEngine {
+public final class AdvancedDistSQLStatementParserEngine {
/**
* Parse SQL.
@@ -35,10 +37,23 @@ public final class DistSQLStatementParserEngine {
* @return SQL statement
*/
public SQLStatement parse(final String sql) {
+ ASTNode astNode = parseToASTNode(sql);
+ return getSQLStatement(sql, (ParseASTNode) astNode);
+ }
+
+ private ASTNode parseToASTNode(final String sql) {
try {
- return new CommonDistSQLStatementParserEngine().parse(sql);
+ ASTNode result = SQLParserFactory.newInstance(sql, AdvancedDistSQLLexer.class, AdvancedDistSQLParser.class).parse();
+ return result;
} catch (final ParseCancellationException | SQLParsingException ignored) {
- return new FeaturedDistSQLStatementParserEngine().parse(sql);
+ throw new SQLParsingException("You have an error in your SQL syntax.");
+ }
+ }
+
+ private SQLStatement getSQLStatement(final String sql, final ParseASTNode parseASTNode) {
+ if (parseASTNode.getRootNode() instanceof ErrorNode) {
+ throw new SQLParsingException("Unsupported SQL of `%s`", sql);
}
+ return (SQLStatement) (new AdvancedDistSQLStatementVisitor()).visit(parseASTNode.getRootNode());
}
}
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLStatementVisitor.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLStatementVisitor.java
new file mode 100644
index 0000000..38b67be
--- /dev/null
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/advanced/AdvancedDistSQLStatementVisitor.java
@@ -0,0 +1,36 @@
+/*
+ * 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.distsql.parser.core.advanced;
+
+import org.apache.shardingsphere.distsql.parser.autogen.AdvancedDistSQLStatementBaseVisitor;
+import org.apache.shardingsphere.distsql.parser.autogen.AdvancedDistSQLStatementParser.PreviewSQLContext;
+import org.apache.shardingsphere.distsql.parser.statement.ral.advanced.preview.PreviewStatement;
+import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
+import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
+
+
+/**
+ * SQL statement visitor for advanced dist SQL.
+ */
+public final class AdvancedDistSQLStatementVisitor extends AdvancedDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+
+ @Override
+ public ASTNode visitPreviewSQL(final PreviewSQLContext ctx) {
+ return new PreviewStatement(ctx.sql().getText().trim());
+ }
+}
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/PreviewDistSQLStatement.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/AdvancedDistSQLStatement.java
similarity index 75%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/PreviewDistSQLStatement.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/AdvancedDistSQLStatement.java
index 8572c79..bc47bec 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/PreviewDistSQLStatement.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/AdvancedDistSQLStatement.java
@@ -15,12 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.statement.ral.common;
-
-import org.apache.shardingsphere.distsql.parser.statement.ral.CommonDistSQLStatement;
+package org.apache.shardingsphere.distsql.parser.statement.ral;
/**
- * Preview dist sql statement.
+ * Advanced dist sql statement.
*/
-public abstract class PreviewDistSQLStatement extends CommonDistSQLStatement {
+public abstract class AdvancedDistSQLStatement extends RALStatement {
}
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/advanced/preview/PreviewStatement.java
similarity index 79%
copy from shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java
copy to shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/advanced/preview/PreviewStatement.java
index 271e545..ad5eb36 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/advanced/preview/PreviewStatement.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.statement.ral.common.preview;
+package org.apache.shardingsphere.distsql.parser.statement.ral.advanced.preview;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.parser.statement.ral.common.PreviewDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.AdvancedDistSQLStatement;
/**
* Preview statement.
*/
@RequiredArgsConstructor
@Getter
-public final class PreviewStatement extends PreviewDistSQLStatement {
+public final class PreviewStatement extends AdvancedDistSQLStatement {
private final String sql;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
index 3e33646..cf98704 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
@@ -19,12 +19,14 @@ package org.apache.shardingsphere.proxy.backend.text.distsql.ral;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.distsql.parser.statement.ral.AdvancedDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.CommonDistSQLStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.CommonDistSQLStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement;
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.distsql.ral.advanced.AdvancedDistSQLBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.text.distsql.ral.query.QueryableRALBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.CommonDistSQLBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.text.distsql.ral.update.UpdatableRALBackendHandlerFactory;
@@ -55,6 +57,9 @@ public final class RALBackendHandlerFactory {
if (sqlStatement instanceof CommonDistSQLStatement) {
return CommonDistSQLBackendHandlerFactory.newInstance((CommonDistSQLStatement) sqlStatement, backendConnection);
}
+ if (sqlStatement instanceof AdvancedDistSQLStatement) {
+ return AdvancedDistSQLBackendHandlerFactory.newInstance((AdvancedDistSQLStatement) sqlStatement, backendConnection);
+ }
throw new UnsupportedOperationException(sqlStatement.getClass().getCanonicalName());
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/AdvancedDistSQLBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/AdvancedDistSQLBackendHandlerFactory.java
new file mode 100644
index 0000000..bd80efd
--- /dev/null
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/AdvancedDistSQLBackendHandlerFactory.java
@@ -0,0 +1,50 @@
+/*
+ * 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.proxy.backend.text.distsql.ral.advanced;
+
+import com.mchange.v1.db.sql.UnsupportedTypeException;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.distsql.parser.statement.ral.AdvancedDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.advanced.preview.PreviewStatement;
+import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
+import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+
+import java.sql.SQLException;
+
+/**
+ * Advanced dist sql backend handler factory.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class AdvancedDistSQLBackendHandlerFactory {
+
+ /**
+ * Create new instance of advanced dist sql backend handler.
+ *
+ * @param sqlStatement advanced dist sql statement
+ * @param backendConnection backend connection
+ * @return advanced dist sql backend handler
+ * @throws SQLException SQL exception
+ */
+ public static TextProtocolBackendHandler newInstance(final AdvancedDistSQLStatement sqlStatement, final BackendConnection backendConnection) throws SQLException {
+ if (sqlStatement instanceof PreviewStatement) {
+ return new PrviewDistSQLBackendHandler((PreviewStatement) sqlStatement, backendConnection);
+ }
+ throw new UnsupportedTypeException(sqlStatement.getClass().getCanonicalName());
+ }
+}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/PrviewDistSQLBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/PrviewDistSQLBackendHandler.java
new file mode 100644
index 0000000..60ae63f
--- /dev/null
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/PrviewDistSQLBackendHandler.java
@@ -0,0 +1,104 @@
+/*
+ * 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.proxy.backend.text.distsql.ral.advanced;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.parser.statement.ral.advanced.preview.PreviewStatement;
+import org.apache.shardingsphere.infra.binder.LogicSQL;
+import org.apache.shardingsphere.infra.binder.SQLStatementContextFactory;
+import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
+import org.apache.shardingsphere.infra.binder.type.TableAvailable;
+import org.apache.shardingsphere.infra.context.kernel.KernelProcessor;
+import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
+import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
+import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
+import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
+import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
+import org.apache.shardingsphere.proxy.backend.communication.SQLStatementSchemaHolder;
+import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
+import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
+import org.apache.shardingsphere.proxy.backend.exception.RuleNotExistedException;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
+import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
+import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Preview dist sql backend handler.
+ */
+@RequiredArgsConstructor
+@Getter
+public final class PrviewDistSQLBackendHandler implements TextProtocolBackendHandler {
+
+ private final PreviewStatement previewStatement;
+
+ private final BackendConnection backendConnection;
+
+ private final KernelProcessor kernelProcessor = new KernelProcessor();
+
+ private List<QueryHeader> queryHeaders;
+
+ private Iterator<ExecutionUnit> executionUnits;
+
+ @Override
+ public ResponseHeader execute() {
+ MetaDataContexts metaDataContexts = ProxyContext.getInstance().getMetaDataContexts();
+ String defaultSchemaName = backendConnection.getDefaultSchemaName();
+ String databaseType = DatabaseTypeRegistry.getTrunkDatabaseTypeName(metaDataContexts.getMetaData(defaultSchemaName).getResource().getDatabaseType());
+ SQLStatement sqlStatement = new ShardingSphereSQLParserEngine(databaseType).parse(previewStatement.getSql(), false);
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaDataMap(), Collections.emptyList(), sqlStatement, defaultSchemaName);
+ // TODO optimize SQLStatementSchemaHolder
+ if (sqlStatementContext instanceof TableAvailable) {
+ ((TableAvailable) sqlStatementContext).getTablesContext().getSchemaName().ifPresent(SQLStatementSchemaHolder::set);
+ }
+ ShardingSphereMetaData metaData = ProxyContext.getInstance().getMetaData(backendConnection.getSchemaName());
+ if (!metaData.isComplete()) {
+ throw new RuleNotExistedException();
+ }
+ LogicSQL logicSQL = new LogicSQL(sqlStatementContext, previewStatement.getSql(), Collections.emptyList());
+ executionUnits = kernelProcessor.generateExecutionContext(logicSQL, metaData, metaDataContexts.getProps()).getExecutionUnits().iterator();
+ queryHeaders = new ArrayList<>(2);
+ queryHeaders.add(new QueryHeader("", "", "datasource_name", "", Types.CHAR, "CHAR", 255, 0, false, false, false, false));
+ queryHeaders.add(new QueryHeader("", "", "sql", "", Types.CHAR, "CHAR", 255, 0, false, false, false, false));
+ return new QueryResponseHeader(queryHeaders);
+ }
+
+ @Override
+ public boolean next() {
+ return null != executionUnits && executionUnits.hasNext();
+ }
+
+ @Override
+ public Collection<Object> getRowData() {
+ ExecutionUnit executionUnit = executionUnits.next();
+ Collection<Object> result = new LinkedList<>();
+ result.add(executionUnit.getDataSourceName());
+ result.add(executionUnit.getSqlUnit().getSql());
+ return result;
+ }
+}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/CommonDistSQLBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/CommonDistSQLBackendHandlerFactory.java
index fd65a91..c24c705 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/CommonDistSQLBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/CommonDistSQLBackendHandlerFactory.java
@@ -22,7 +22,6 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.ral.CommonDistSQLStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.common.PreviewDistSQLStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.common.SetDistSQLStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.common.ShowDistSQLStatement;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
@@ -51,9 +50,6 @@ public final class CommonDistSQLBackendHandlerFactory {
if (sqlStatement instanceof ShowDistSQLStatement) {
return new ShowDistSQLBackendHandler((ShowDistSQLStatement) sqlStatement, backendConnection);
}
- if (sqlStatement instanceof PreviewDistSQLStatement) {
- return new PrviewDistSQLBackendHandler((PreviewDistSQLStatement) sqlStatement, backendConnection);
- }
if (sqlStatement instanceof HintDistSQLStatement) {
return new HintDistSQLBackendHandler((HintDistSQLStatement) sqlStatement, backendConnection);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/PrviewDistSQLBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/PrviewDistSQLBackendHandler.java
deleted file mode 100644
index 589516b..0000000
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/PrviewDistSQLBackendHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.proxy.backend.text.distsql.ral.common;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.parser.statement.ral.common.PreviewDistSQLStatement;
-import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
-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.TextProtocolBackendHandler;
-
-/**
- * Preview dist sql backend handler.
- */
-@RequiredArgsConstructor
-@Getter
-public final class PrviewDistSQLBackendHandler implements TextProtocolBackendHandler {
-
- private final PreviewDistSQLStatement sqlStatement;
-
- private final BackendConnection backendConnection;
-
- @Override
- public ResponseHeader execute() {
- // TODO add execute logic
- return new UpdateResponseHeader(null);
- }
-}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertiesAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertiesAssert.java
index fd5c98d..6331262 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertiesAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertiesAssert.java
@@ -43,12 +43,12 @@ public final class PropertiesAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final Properties actual, final ExpectedProperties expected) {
if (null != expected && null != expected.getProperties()) {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual properties should exist."), actual);
for (ExpectedProperty expectedProperty : expected.getProperties()) {
PropertyAssert.assertIs(assertContext, actual, expectedProperty);
}
} else {
- assertTrue(assertContext.getText("Actual should not exist."), actual.isEmpty());
+ assertTrue(assertContext.getText("Actual properties should not exist."), actual.isEmpty());
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertyAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertyAssert.java
index e1e81e5..00ca94f 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertyAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertyAssert.java
@@ -44,9 +44,9 @@ public final class PropertyAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final Properties actual, final ExpectedProperty expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual properties should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual properties should exist."), actual);
assertThat(assertContext.getText("properties assertion error: "), actual.getProperty(expected.getKey()), is(expected.getValue()));
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/TableRuleAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/TableRuleAssert.java
index 34be0f6..81955eb 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/TableRuleAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/TableRuleAssert.java
@@ -43,9 +43,9 @@ public final class TableRuleAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final TableRuleSegment actual, final ExpectedTableRule expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual table rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual table rule should exist."), actual);
assertThat(assertContext.getText(String.format("`%s`'s table rule segment assertion error: ", actual.getClass().getSimpleName())),
actual.getLogicTable(), CoreMatchers.is(expected.getName()));
assertThat(assertContext.getText(String.format("`%s`'s table rule segment assertion error: ", actual.getClass().getSimpleName())),
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/DatabaseDiscoveryRuleAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/DatabaseDiscoveryRuleAssert.java
index 5eb6f8d..2daa4fc 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/DatabaseDiscoveryRuleAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/DatabaseDiscoveryRuleAssert.java
@@ -47,9 +47,9 @@ public final class DatabaseDiscoveryRuleAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final DatabaseDiscoveryRuleSegment actual, final ExpectedDatabaseDiscoveryRule expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist"), actual);
+ assertNull(assertContext.getText("Actual database discovery rule should not exist"), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist"), actual);
+ assertNotNull(assertContext.getText("Actual database discovery rule should exist"), actual);
assertDatabaseDiscoveryRule(assertContext, actual, expected);
}
}
@@ -64,9 +64,9 @@ public final class DatabaseDiscoveryRuleAssert {
private static void assertProps(final SQLCaseAssertContext assertContext, final Properties actual, final ExpectedProperties expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist"), actual);
+ assertNull(assertContext.getText("Actual properties should not exist"), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist"), actual);
+ assertNotNull(assertContext.getText("Actual properties should exist"), actual);
PropertiesAssert.assertIs(assertContext, actual, expected);
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/EncryptColumnAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/EncryptColumnAssert.java
index 649cba3..2ad66d9 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/EncryptColumnAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/EncryptColumnAssert.java
@@ -44,9 +44,9 @@ public final class EncryptColumnAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final EncryptColumnSegment actual, final ExpectedEncryptColumn expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual encrypt column should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual encrypt column should exist."), actual);
assertThat(assertContext.getText(String.format("`%s`'s assertion error", actual.getClass().getSimpleName())), actual.getName(), is(expected.getName()));
assertThat(assertContext.getText(String.format("`%s`'s assertion error", actual.getClass().getSimpleName())), actual.getPlainColumn(), is(expected.getPlainColumn()));
assertThat(assertContext.getText(String.format("`%s`'s assertion error", actual.getClass().getSimpleName())), actual.getCipherColumn(), is(expected.getCipherColumn()));
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/EncryptRuleAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/EncryptRuleAssert.java
index 83ad12b..f0fe67f 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/EncryptRuleAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/EncryptRuleAssert.java
@@ -48,9 +48,9 @@ public final class EncryptRuleAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final EncryptRuleSegment actual, final ExpectedEncryptRule expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual encrypt rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual encrypt rule should exist."), actual);
assertThat(assertContext.getText("encrypt rule assertion error: "), actual.getTableName(), is(expected.getName()));
assertEncryptColumns(assertContext, actual.getColumns(), expected.getColumns());
}
@@ -58,9 +58,9 @@ public final class EncryptRuleAssert {
private static void assertEncryptColumns(final SQLCaseAssertContext assertContext, final Collection<EncryptColumnSegment> actual, final List<ExpectedEncryptColumn> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual encrypt column should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual encrypt column should exist."), actual);
assertThat(assertContext.getText(String.format("Actual encrypt column size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
for (EncryptColumnSegment encryptColumnSegment : actual) {
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java
index b366c6c..c9f90f9 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java
@@ -30,32 +30,32 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
/**
- * Read-write splitting rule assert.
+ * Readwrite splitting rule assert.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ReadwriteSplittingRuleAssert {
/**
- * Assert read-write splitting rule is correct with expected parser result.
+ * Assert readwrite splitting rule is correct with expected parser result.
*
* @param assertContext assert context
- * @param actual actual read-write splitting rule
- * @param expected expected read-write splitting rule test case
+ * @param actual actual readwrite splitting rule
+ * @param expected expected readwrite splitting rule test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final ReadwriteSplittingRuleSegment actual, final ExceptedReadwriteSplittingRule expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exit."), actual);
+ assertNull(assertContext.getText("Actual readwrite splitting rule should not exit."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exit."), actual);
- assertThat(assertContext.getText(String.format("`%s`'s read-write splitting rule segment assertion error: ",
+ assertNotNull(assertContext.getText("Actual readwrite splitting rule should exit."), actual);
+ assertThat(assertContext.getText(String.format("`%s`'s readwrite splitting rule segment assertion error: ",
actual.getClass().getSimpleName())), actual.getName(), is(expected.getName()));
- assertThat(assertContext.getText(String.format("`%s`'s read-write splitting rule segment assertion error: ",
+ assertThat(assertContext.getText(String.format("`%s`'s readwrite splitting rule segment assertion error: ",
actual.getClass().getSimpleName())), actual.getAutoAwareResource(), is(expected.getAutoAwareResource()));
- assertThat(assertContext.getText(String.format("`%s`'s read-write splitting rule segment assertion error: ",
+ assertThat(assertContext.getText(String.format("`%s`'s readwrite splitting rule segment assertion error: ",
actual.getClass().getSimpleName())), actual.getWriteDataSource(), is(expected.getWriteDataSource()));
- assertThat(assertContext.getText(String.format("`%s`'s read-write splitting rule segment assertion error: ",
+ assertThat(assertContext.getText(String.format("`%s`'s readwrite splitting rule segment assertion error: ",
actual.getClass().getSimpleName())), actual.getReadDataSources(), is(expected.getReadDataSources()));
- assertThat(assertContext.getText(String.format("`%s`'s read-write splitting rule segment assertion error: ",
+ assertThat(assertContext.getText(String.format("`%s`'s readwrite splitting rule segment assertion error: ",
actual.getClass().getSimpleName())), actual.getLoadBalancer(), is(expected.getLoadBalancer()));
PropertiesAssert.assertIs(assertContext, actual.getProps(), expected.getProps());
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/ShardingBindingTableRuleAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/ShardingBindingTableRuleAssert.java
index 32571ff..4e5c621 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/ShardingBindingTableRuleAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/rdl/ShardingBindingTableRuleAssert.java
@@ -43,9 +43,9 @@ public final class ShardingBindingTableRuleAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final BindingTableRuleSegment actual, final ExpectedShardingBindingTableRule expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual sharding binding table rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual sharding binding table rule should exist."), actual);
assertThat(assertContext.getText(String.format("`%s`'s sharding binding table rule segment assertion error: ",
actual.getClass().getSimpleName())), actual.getTableGroups(), is(expected.getTableGroups()));
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/RALStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/RALStatementAssert.java
index d2777bd..861b1c1 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/RALStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/RALStatementAssert.java
@@ -19,10 +19,12 @@ package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statemen
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.distsql.parser.statement.ral.AdvancedDistSQLStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
+import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.AdvancedDistSQLStatementAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.QueryableRALStatementAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.UpdatableRALStatementAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
@@ -45,6 +47,8 @@ public final class RALStatementAssert {
QueryableRALStatementAssert.assertIs(assertContext, (QueryableRALStatement) actual, expected);
} else if (actual instanceof UpdatableRALStatement) {
UpdatableRALStatementAssert.assertIs(assertContext, (UpdatableRALStatement) actual, expected);
+ } else if (actual instanceof AdvancedDistSQLStatement) {
+ AdvancedDistSQLStatementAssert.assertIs(assertContext, (AdvancedDistSQLStatement) actual, expected);
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertiesAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/AdvancedDistSQLStatementAssert.java
similarity index 56%
copy from shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertiesAssert.java
copy to shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/AdvancedDistSQLStatementAssert.java
index fd5c98d..5198957 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertiesAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/AdvancedDistSQLStatementAssert.java
@@ -15,40 +15,33 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.distsql;
+package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.distsql.parser.statement.ral.AdvancedDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.advanced.preview.PreviewStatement;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.distsql.ExpectedProperties;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.distsql.ExpectedProperty;
-
-import java.util.Properties;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.advanced.PreviewStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.PreviewStatementTestCase;
/**
- * Properties assert.
+ * Advanced dist SQL statement assert.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class PropertiesAssert {
-
+public final class AdvancedDistSQLStatementAssert {
+
/**
- * Assert properties is correct with expected parser result.
+ * Assert updatable RAL statement is correct with expected parser result.
*
* @param assertContext assert context
- * @param actual actual properties
- * @param expected expected properties test case
+ * @param actual actual advanced dist SQL statement
+ * @param expected expected advanced dist SQL statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final Properties actual, final ExpectedProperties expected) {
- if (null != expected && null != expected.getProperties()) {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
- for (ExpectedProperty expectedProperty : expected.getProperties()) {
- PropertyAssert.assertIs(assertContext, actual, expectedProperty);
- }
- } else {
- assertTrue(assertContext.getText("Actual should not exist."), actual.isEmpty());
+ public static void assertIs(final SQLCaseAssertContext assertContext, final AdvancedDistSQLStatement actual, final SQLParserTestCase expected) {
+ if (actual instanceof PreviewStatement) {
+ PreviewStatementAssert.assertIs(assertContext, (PreviewStatement) actual, (PreviewStatementTestCase) expected);
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertyAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/advanced/PreviewStatementAssert.java
similarity index 59%
copy from shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertyAssert.java
copy to shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/advanced/PreviewStatementAssert.java
index e1e81e5..8c56956 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/PropertyAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/advanced/PreviewStatementAssert.java
@@ -15,39 +15,32 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.distsql;
+package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.advanced;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.distsql.parser.statement.ral.advanced.preview.PreviewStatement;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.distsql.ExpectedProperty;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.PreviewStatementTestCase;
-import java.util.Properties;
-
-import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
/**
- * Property assert.
+ * Preview statement assert.
*/
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class PropertyAssert {
+public final class PreviewStatementAssert {
/**
- * Assert property is correct with expected parser result.
+ * Assert preview statement is correct with expected parser result.
*
* @param assertContext assert context
- * @param actual actual property
- * @param expected expected property test case
+ * @param actual actual preview statement
+ * @param expected expected preview statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final Properties actual, final ExpectedProperty expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext, final PreviewStatement actual, final PreviewStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
- assertThat(assertContext.getText("properties assertion error: "), actual.getProperty(expected.getKey()), is(expected.getValue()));
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterDatabaseDiscoveryRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterDatabaseDiscoveryRuleStatementAssert.java
index f708443..89dd6e2 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterDatabaseDiscoveryRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterDatabaseDiscoveryRuleStatementAssert.java
@@ -49,9 +49,9 @@ public final class AlterDatabaseDiscoveryRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final AlterDatabaseDiscoveryRuleStatement actual, final AlterDataBaseDiscoveryRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertDatabaseDiscoveryRules(assertContext, actual.getRules(), expected.getRules());
}
@@ -60,9 +60,9 @@ public final class AlterDatabaseDiscoveryRuleStatementAssert {
private static void assertDatabaseDiscoveryRules(final SQLCaseAssertContext assertContext, final Collection<DatabaseDiscoveryRuleSegment> actual,
final List<ExpectedDatabaseDiscoveryRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual database discovery rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual database discovery rule should exist."), actual);
assertThat(assertContext.getText(String.format("Actual database discovery rule size should be %s , but it was %s", expected.size(), actual.size())),
actual.size(), is(expected.size()));
int count = 0;
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterEncryptRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterEncryptRuleStatementAssert.java
index 62bf0c1..3d959ef 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterEncryptRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterEncryptRuleStatementAssert.java
@@ -49,18 +49,18 @@ public final class AlterEncryptRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final AlterEncryptRuleStatement actual, final AlterEncryptRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertEncryptRules(assertContext, actual.getRules(), expected.getRules());
}
}
private static void assertEncryptRules(final SQLCaseAssertContext assertContext, final Collection<EncryptRuleSegment> actual, final List<ExpectedEncryptRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual encrypt rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual encrypt rule should exist."), actual);
assertThat(assertContext.getText(String.format("Actual encrypt rule size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
for (EncryptRuleSegment encryptRuleSegment : actual) {
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java
index 79a1205..43e2c26 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java
@@ -49,9 +49,9 @@ public final class AlterReadwriteSplittingRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final AlterReadwriteSplittingRuleStatement actual, final AlterReadWriteSplittingRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertReadwriteSplittingRule(assertContext, actual.getRules(), expected.getRules());
}
}
@@ -59,10 +59,10 @@ public final class AlterReadwriteSplittingRuleStatementAssert {
private static void assertReadwriteSplittingRule(final SQLCaseAssertContext assertContext, final Collection<ReadwriteSplittingRuleSegment> actual,
final List<ExceptedReadwriteSplittingRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual readwrite splitting rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
- assertThat(assertContext.getText(String.format("Actual readwrite splitting size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
+ assertNotNull(assertContext.getText("Actual readwrite splitting rule should exist."), actual);
+ assertThat(assertContext.getText(String.format("Actual readwrite splitting rule size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
for (ReadwriteSplittingRuleSegment readwriteSplittingRuleSegment : actual) {
ExceptedReadwriteSplittingRule exceptedReadwriteSplittingRule = expected.get(count);
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingBindingTableRulesStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingBindingTableRulesStatementAssert.java
index 9f3c73d..1985f6d 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingBindingTableRulesStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingBindingTableRulesStatementAssert.java
@@ -49,9 +49,9 @@ public final class AlterShardingBindingTableRulesStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final AlterShardingBindingTableRulesStatement actual, final AlterShardingBindingTableRulesStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertShardingBindingTableRules(assertContext, actual.getRules(), expected.getRules());
}
}
@@ -59,9 +59,9 @@ public final class AlterShardingBindingTableRulesStatementAssert {
private static void assertShardingBindingTableRules(final SQLCaseAssertContext assertContext, final Collection<BindingTableRuleSegment> actual,
final List<ExpectedShardingBindingTableRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual sharding binding table rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual sharding binding table rule should exist."), actual);
assertThat(assertContext.getText(String.format("Actual sharding binding table rule size should be %s , but it was %s", expected.size(), actual.size())),
actual.size(), is(expected.size()));
int count = 0;
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingBroadcastTableRulesStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingBroadcastTableRulesStatementAssert.java
index 792c1f6..2c1e165 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingBroadcastTableRulesStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingBroadcastTableRulesStatementAssert.java
@@ -43,9 +43,9 @@ public final class AlterShardingBroadcastTableRulesStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final AlterShardingBroadcastTableRulesStatement actual, final AlterShardingBroadcastTableRulesStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("sharding broadcast table rule assertion error : "), actual.getTables(), is(expected.getTables()));
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java
index ea6038d..49d1640 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java
@@ -47,18 +47,18 @@ public final class AlterShardingTableRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final AlterShardingTableRuleStatement actual, final AlterShardingTableRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertShardingTableRules(assertContext, actual.getRules(), expected.getRules());
}
}
private static void assertShardingTableRules(final SQLCaseAssertContext assertContext, final Collection<TableRuleSegment> actual, final List<ExpectedTableRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual sharding table rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual sharding table rule should exist."), actual);
int count = 0;
for (TableRuleSegment tableRuleSegment : actual) {
ExpectedTableRule expectedTableRule = expected.get(count);
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/AddResourceStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/AddResourceStatementAssert.java
index e4781c4..40ef82b 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/AddResourceStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/AddResourceStatementAssert.java
@@ -49,18 +49,18 @@ public final class AddResourceStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final AddResourceStatement actual, final AddResourceStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertDataSources(assertContext, actual.getDataSources(), expected.getDataSources());
}
}
private static void assertDataSources(final SQLCaseAssertContext assertContext, final Collection<DataSourceSegment> actual, final List<ExpectedDataSource> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual datasource should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual datasource should exist."), actual);
assertThat(assertContext.getText(String.format("Actual datasource size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
for (DataSourceSegment actualDataSource : actual) {
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateDatabaseDiscoveryRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateDatabaseDiscoveryRuleStatementAssert.java
index 5bd5704..e5f4a8e 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateDatabaseDiscoveryRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateDatabaseDiscoveryRuleStatementAssert.java
@@ -49,9 +49,9 @@ public final class CreateDatabaseDiscoveryRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final CreateDatabaseDiscoveryRuleStatement actual, final CreateDataBaseDiscoveryRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertDatabaseDiscoveryRules(assertContext, actual.getRules(), expected.getRules());
}
}
@@ -59,9 +59,9 @@ public final class CreateDatabaseDiscoveryRuleStatementAssert {
private static void assertDatabaseDiscoveryRules(final SQLCaseAssertContext assertContext, final Collection<DatabaseDiscoveryRuleSegment> actual,
final List<ExpectedDatabaseDiscoveryRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual database discovery rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual database discovery rule should exist."), actual);
assertThat(assertContext.getText(String.format("Actual database discovery rule size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
for (DatabaseDiscoveryRuleSegment databaseDiscoveryRuleSegment : actual) {
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateEncryptRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateEncryptRuleStatementAssert.java
index 7cd6c32..e100d85 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateEncryptRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateEncryptRuleStatementAssert.java
@@ -49,18 +49,18 @@ public final class CreateEncryptRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final CreateEncryptRuleStatement actual, final CreateEncryptRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertEncryptRules(assertContext, actual.getRules(), expected.getRules());
}
}
private static void assertEncryptRules(final SQLCaseAssertContext assertContext, final Collection<EncryptRuleSegment> actual, final List<ExpectedEncryptRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual encrypt rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual encrypt rule should exist."), actual);
assertThat(assertContext.getText(String.format("Actual encrypt rule size should be %s , but it was %s",
expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java
index 9bb653b..ac87c3b 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java
@@ -49,9 +49,9 @@ public final class CreateReadwriteSplittingRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final CreateReadwriteSplittingRuleStatement actual, final CreateReadWriteSplittingRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertReadwriteSplittingRule(assertContext, actual.getRules(), expected.getRules());
}
}
@@ -59,9 +59,9 @@ public final class CreateReadwriteSplittingRuleStatementAssert {
private static void assertReadwriteSplittingRule(final SQLCaseAssertContext assertContext, final Collection<ReadwriteSplittingRuleSegment> actual,
final List<ExceptedReadwriteSplittingRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual readwrite splitting rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual readwrite splitting rule should exist."), actual);
assertThat(assertContext.getText(String.format("Actual readwrite splitting rule size should be %s , but it was %s",
expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingBindingTableRulesStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingBindingTableRulesStatementAssert.java
index b13bc64..535ca18 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingBindingTableRulesStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingBindingTableRulesStatementAssert.java
@@ -49,9 +49,9 @@ public final class CreateShardingBindingTableRulesStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final CreateShardingBindingTableRulesStatement actual, final CreateShardingBindingTableRulesStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertShardingBindingTableRules(assertContext, actual.getRules(), expected.getRules());
}
}
@@ -59,9 +59,9 @@ public final class CreateShardingBindingTableRulesStatementAssert {
private static void assertShardingBindingTableRules(final SQLCaseAssertContext assertContext, final Collection<BindingTableRuleSegment> actual,
final List<ExpectedShardingBindingTableRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual sharding binding table rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual sharding binding table rule should exist."), actual);
assertThat(assertContext.getText(String.format("Actual sharding binding table rule size should be %s , but it was %s",
expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingBroadcastTableRulesStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingBroadcastTableRulesStatementAssert.java
index 729ab36..8136f70 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingBroadcastTableRulesStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingBroadcastTableRulesStatementAssert.java
@@ -43,9 +43,9 @@ public final class CreateShardingBroadcastTableRulesStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final CreateShardingBroadcastTableRulesStatement actual, final CreateShardingBroadcastTableRulesStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("create sharding broadcast table rule assertion error: "), actual.getTables(), is(expected.getTables()));
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingTableRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingTableRuleStatementAssert.java
index d0640c2..2f222eb 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingTableRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/create/impl/CreateShardingTableRuleStatementAssert.java
@@ -47,18 +47,18 @@ public final class CreateShardingTableRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final CreateShardingTableRuleStatement actual, final CreateShardingTableRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertShardingTableRules(assertContext, actual.getRules(), expected.getRules());
}
}
private static void assertShardingTableRules(final SQLCaseAssertContext assertContext, final Collection<TableRuleSegment> actual, final List<ExpectedTableRule> expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual sharding table rule should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual sharding table rule should exist."), actual);
int count = 0;
for (TableRuleSegment tableRuleSegment : actual) {
ExpectedTableRule expectedTableRule = expected.get(count);
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryRuleStatementAssert.java
index e04f571..357b543 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryRuleStatementAssert.java
@@ -43,9 +43,9 @@ public final class DropDatabaseDiscoveryRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final DropDatabaseDiscoveryRuleStatement actual, final DropDataBaseDiscoveryRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("database discovery rule assertion error: "), actual.getRuleNames(), is(expected.getRules()));
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropEncryptRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropEncryptRuleStatementAssert.java
index 4e4fd4d..7c9bb01 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropEncryptRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropEncryptRuleStatementAssert.java
@@ -43,9 +43,9 @@ public final class DropEncryptRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final DropEncryptRuleStatement actual, final DropEncryptRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("encrypt rule assertion error: "), actual.getTables(), is(expected.getTables()));
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java
index cd43b6f..abadad4 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java
@@ -43,10 +43,10 @@ public final class DropReadwriteSplittingRuleStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final DropReadwriteSplittingRuleStatement actual, final DropReadWriteSplittingRuleStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual should not exist."), actual);
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual should exist."), actual);
- assertThat(assertContext.getText("read-write splitting assertion error: "), actual.getRuleNames(), is(expected.getRules()));
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
+ assertThat(assertContext.getText("readwrite splitting assertion error: "), actual.getRuleNames(), is(expected.getRules()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
index 344f344..cd6a10f 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
@@ -84,6 +84,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.ddl.FlashbackTableStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.ddl.NoAuditStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.ddl.TruncateStatementTestCase;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.PreviewStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowScalingJobListStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterDataBaseDiscoveryRuleStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterEncryptRuleStatementTestCase;
@@ -464,6 +465,9 @@ public final class SQLParserTestCases {
@XmlElement(name = "show-scaling-job-list")
private final List<ShowScalingJobListStatementTestCase> showScalingJobListStatementTestCase = new LinkedList<>();
+ @XmlElement(name = "preview-sql")
+ private final List<PreviewStatementTestCase> previewStatementTestCase = new LinkedList<>();
+
/**
* Get all SQL parser test cases.
*
@@ -578,6 +582,7 @@ public final class SQLParserTestCases {
putAll(showShardingTableRulesTestCase, result);
putAll(showShardingTableRuleTestCase, result);
putAll(showScalingJobListStatementTestCase, result);
+ putAll(previewStatementTestCase, result);
return result;
}
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/PreviewStatementTestCase.java
similarity index 69%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java
rename to shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/PreviewStatementTestCase.java
index 271e545..9e59af8 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/preview/PreviewStatement.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/PreviewStatementTestCase.java
@@ -15,18 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.statement.ral.common.preview;
+package org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.parser.statement.ral.common.PreviewDistSQLStatement;
+import lombok.Setter;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
/**
- * Preview statement.
+ * Preview statement test case.
*/
-@RequiredArgsConstructor
@Getter
-public final class PreviewStatement extends PreviewDistSQLStatement {
-
- private final String sql;
+@Setter
+public final class PreviewStatementTestCase extends SQLParserTestCase {
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/preview.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/preview.xml
new file mode 100644
index 0000000..004b5f4
--- /dev/null
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/preview.xml
@@ -0,0 +1,21 @@
+<?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.
+ -->
+
+<sql-parser-test-cases>
+ <preview-sql sql-case-id="preview-sql" />
+</sql-parser-test-cases>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/preview.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/preview.xml
new file mode 100644
index 0000000..23b688e
--- /dev/null
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/preview.xml
@@ -0,0 +1,21 @@
+<?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.
+ -->
+
+<sql-cases>
+ <distsql-case id="preview-sql" value="PREVIEW SELECT * FROM t_order;" />
+</sql-cases>