This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 32f1b8662d6 Optimise DistSQL RDL parser test (#23440)
32f1b8662d6 is described below
commit 32f1b8662d69caa033305198c94c9698ed9d0aab
Author: Zichao <[email protected]>
AuthorDate: Tue Jan 10 01:23:41 2023 +1300
Optimise DistSQL RDL parser test (#23440)
---
.../parser/core/ShadowDistSQLStatementVisitor.java | 2 +-
.../asserts/statement/rdl/RDLStatementAssert.java | 39 +++++-----------------
.../rdl/drop/DropRuleStatementAssert.java | 5 +++
3 files changed, 14 insertions(+), 32 deletions(-)
diff --git
a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
index f8d5960c853..db8f7f4833c 100644
---
a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
+++
b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
@@ -136,7 +136,7 @@ public final class ShadowDistSQLStatementVisitor extends
ShadowDistSQLStatementB
public ASTNode visitDropShadowAlgorithm(final DropShadowAlgorithmContext
ctx) {
return new DropShadowAlgorithmStatement(null != ctx.ifExists(), null
== ctx.algorithmName()
? Collections.emptyList()
- :
ctx.algorithmName().stream().map(this::getIdentifierValue).collect(Collectors.toSet()));
+ :
ctx.algorithmName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
}
@Override
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
index 37707430f27..a433c852ff3 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.dbdiscovery.distsql.parser.statement.AlterDatabaseDiscoveryRuleStatement;
import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement;
@@ -27,27 +26,15 @@ import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleS
import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.drop.UnregisterStorageUnitStatement;
-import
org.apache.shardingsphere.encrypt.distsql.parser.statement.AlterEncryptRuleStatement;
-import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.AlterReadwriteSplittingRuleStatement;
-import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableReferenceRuleStatement;
-import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableRuleStatement;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.AlterStorageUnitStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.AlterRuleStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.impl.AlterDatabaseDiscoveryRuleStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.impl.AlterEncryptRuleStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.impl.AlterReadwriteSplittingRuleStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.impl.AlterShardingTableReferenceRulesStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.impl.AlterShardingTableRuleStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.create.RegisterStorageUnitStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.AlterStorageUnitStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.create.CreateRuleStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.UnregisterStorageUnitStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.create.RegisterStorageUnitStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.DropRuleStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.UnregisterStorageUnitStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.encrypt.AlterEncryptRuleStatementTestCase;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.readwritesplitting.AlterReadwriteSplittingRuleStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.resource.AlterStorageUnitStatementTestCase;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.AlterShardingTableReferenceRulesStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.resource.RegisterStorageUnitStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.resource.UnregisterStorageUnitStatementTestCase;
@@ -65,28 +52,18 @@ public final class RDLStatementAssert {
* @param expected expected parser result
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final RDLStatement actual, final SQLParserTestCase expected) {
- if (actual instanceof AlterDatabaseDiscoveryRuleStatement) {
- AlterDatabaseDiscoveryRuleStatementAssert.assertIs(assertContext,
(AlterDatabaseDiscoveryRuleStatement) actual, expected);
- } else if (actual instanceof AlterReadwriteSplittingRuleStatement) {
- AlterReadwriteSplittingRuleStatementAssert.assertIs(assertContext,
(AlterReadwriteSplittingRuleStatement) actual,
(AlterReadwriteSplittingRuleStatementTestCase) expected);
- } else if (actual instanceof AlterShardingTableReferenceRuleStatement)
{
-
AlterShardingTableReferenceRulesStatementAssert.assertIs(assertContext,
(AlterShardingTableReferenceRuleStatement) actual,
(AlterShardingTableReferenceRulesStatementTestCase) expected);
- } else if (actual instanceof AlterEncryptRuleStatement) {
- AlterEncryptRuleStatementAssert.assertIs(assertContext,
(AlterEncryptRuleStatement) actual, (AlterEncryptRuleStatementTestCase)
expected);
- } else if (actual instanceof AlterShardingTableRuleStatement) {
- AlterShardingTableRuleStatementAssert.assertIs(assertContext,
(AlterShardingTableRuleStatement) actual, expected);
- } else if (actual instanceof CreateRuleStatement) {
+ if (actual instanceof CreateRuleStatement) {
CreateRuleStatementAssert.assertIs(assertContext,
(CreateRuleStatement) actual, expected);
+ } else if (actual instanceof AlterRuleStatement) {
+ AlterRuleStatementAssert.assertIs(assertContext,
(AlterRuleStatement) actual, expected);
+ } else if (actual instanceof DropRuleStatement) {
+ DropRuleStatementAssert.assertIs(assertContext,
(DropRuleStatement) actual, expected);
} else if (actual instanceof RegisterStorageUnitStatement) {
RegisterStorageUnitStatementAssert.assertIs(assertContext,
(RegisterStorageUnitStatement) actual, (RegisterStorageUnitStatementTestCase)
expected);
} else if (actual instanceof AlterStorageUnitStatement) {
AlterStorageUnitStatementAssert.assertIs(assertContext,
(AlterStorageUnitStatement) actual, (AlterStorageUnitStatementTestCase)
expected);
- } else if (actual instanceof AlterRuleStatement) {
- AlterRuleStatementAssert.assertIs(assertContext,
(AlterRuleStatement) actual, expected);
} else if (actual instanceof UnregisterStorageUnitStatement) {
UnregisterStorageUnitStatementAssert.assertIs(assertContext,
(UnregisterStorageUnitStatement) actual,
(UnregisterStorageUnitStatementTestCase) expected);
- } else if (actual instanceof DropRuleStatement) {
- DropRuleStatementAssert.assertIs(assertContext,
(DropRuleStatement) actual, expected);
}
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java
index 083c3cd809f..477c5f2def3 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java
@@ -25,6 +25,7 @@ import
org.apache.shardingsphere.dbdiscovery.distsql.parser.statement.DropDataba
import
org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import
org.apache.shardingsphere.encrypt.distsql.parser.statement.DropEncryptRuleStatement;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement;
+import
org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowAlgorithmStatement;
import
org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowRuleStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.DropBroadcastTableRuleStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.DropDefaultShardingStrategyStatement;
@@ -41,6 +42,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.r
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropDefaultShardingStrategyStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropEncryptRuleStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropReadwriteSplittingRuleStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropShadowAlgorithmStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropShadowRuleStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropShardingAlgorithmStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropShardingAuditorStatementAssert;
@@ -48,6 +50,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.r
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropShardingTableReferenceRulesStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropShardingTableRuleStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.shadow.DropShadowAlgorithmStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.DropBroadcastTableRuleStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.dbdiscovery.DropDatabaseDiscoveryHeartbeatStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.dbdiscovery.DropDatabaseDiscoveryRuleStatementTestCase;
@@ -96,6 +99,8 @@ public final class DropRuleStatementAssert {
DropShardingTableRuleStatementAssert.assertIs(assertContext,
(DropShardingTableRuleStatement) actual,
(DropShardingTableRuleStatementTestCase) expected);
} else if (actual instanceof DropShadowRuleStatement) {
DropShadowRuleStatementAssert.assertIs(assertContext,
(DropShadowRuleStatement) actual, (DropShadowRuleStatementTestCase) expected);
+ } else if (actual instanceof DropShadowAlgorithmStatement) {
+ DropShadowAlgorithmStatementAssert.assertIs(assertContext,
(DropShadowAlgorithmStatement) actual, (DropShadowAlgorithmStatementTestCase)
expected);
} else if (actual instanceof DropShardingAlgorithmStatement) {
DropShardingAlgorithmStatementAssert.assertIs(assertContext,
(DropShardingAlgorithmStatement) actual,
(DropShardingAlgorithmStatementTestCase) expected);
} else if (actual instanceof DropShardingKeyGeneratorStatement) {
