From 32b4a1300e909110df657c42492416458b593cab Mon Sep 17 00:00:00 2001 From: zhangliang Date: Thu, 25 Jan 2024 11:29:18 +0800 Subject: [PATCH] Add RuleQueryStatement and ResourceQueryStatement --- .../BroadcastDistSQLStatementVisitor.java | 2 +- .../ShowBroadcastTableRulesStatement.java | 2 +- .../core/EncryptDistSQLStatementVisitor.java | 2 +- .../statement/ShowEncryptRulesStatement.java | 2 +- .../core/MaskDistSQLStatementVisitor.java | 2 +- .../statement/ShowMaskRulesStatement.java | 2 +- ...writeSplittingDistSQLStatementVisitor.java | 2 +- .../ShowReadwriteSplittingRulesStatement.java | 2 +- ...sFromReadwriteSplittingRulesStatement.java | 4 +-- .../core/ShadowDistSQLStatementVisitor.java | 2 +- .../ShowDefaultShadowAlgorithmStatement.java | 2 +- .../ShowShadowAlgorithmsStatement.java | 2 +- .../statement/ShowShadowRulesStatement.java | 2 +- .../ShowShadowTableRulesStatement.java | 2 +- .../core/ShardingDistSQLStatementVisitor.java | 2 +- .../ShowDefaultShardingStrategyStatement.java | 2 +- .../ShowShardingAlgorithmsStatement.java | 2 +- .../ShowShardingAuditorsStatement.java | 2 +- .../ShowShardingKeyGeneratorsStatement.java | 2 +- .../ShowShardingTableNodesStatement.java | 2 +- ...wShardingTableReferenceRulesStatement.java | 2 +- .../ShowShardingTableRulesStatement.java | 2 +- ...rdingTableRulesUsedAlgorithmStatement.java | 2 +- ...hardingTableRulesUsedAuditorStatement.java | 2 +- ...ngTableRulesUsedKeyGeneratorStatement.java | 2 +- ...ShowUnusedShardingAlgorithmsStatement.java | 2 +- .../ShowUnusedShardingAuditorsStatement.java | 2 +- ...wUnusedShardingKeyGeneratorsStatement.java | 2 +- .../type/rql/count/CountRQLExecutor.java | 2 +- .../statement/ShowAuthorityRuleStatement.java | 2 +- .../ShowGlobalClockRuleStatement.java | 2 +- .../core/SingleDistSQLStatementVisitor.java | 2 +- ...efaultSingleTableStorageUnitStatement.java | 2 +- .../ShowSQLFederationRuleStatement.java | 2 +- .../queryable/ShowSQLParserRuleStatement.java | 2 +- .../ShowSQLTranslatorRuleStatement.java | 2 +- .../queryable/ShowTrafficRulesStatement.java | 2 +- .../ShowTransactionRuleStatement.java | 2 +- .../kernel/KernelDistSQLStatementVisitor.java | 2 +- .../rql/resource/ResourceQueryStatement.java | 26 +++++++++++++++++++ .../resource/ShowStorageUnitsStatement.java | 3 +-- .../rql/resource/ShowTablesStatement.java | 3 +-- .../rql/rule/RuleQueryStatement.java | 26 +++++++++++++++++++ .../{ => database}/CountRuleStatement.java | 2 +- .../ShowDatabaseRulesStatement.java | 6 ++--- .../ShowRulesUsedStorageUnitStatement.java | 3 +-- .../ShowGlobalRulesStatement.java | 6 ++--- .../ShowRulesUsedStorageUnitExecutor.java | 2 +- .../ShowRulesUsedStorageUnitExecutorTest.java | 2 +- .../statement/rql/RQLStatementAssert.java | 2 +- .../rql/impl/ShowRulesStatementAssert.java | 2 +- 51 files changed, 106 insertions(+), 57 deletions(-) create mode 100644 parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ResourceQueryStatement.java create mode 100644 parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/RuleQueryStatement.java rename parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/{ => database}/CountRuleStatement.java (94%) rename parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/{ => database}/ShowDatabaseRulesStatement.java (83%) rename parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/{resource => rule/database}/ShowRulesUsedStorageUnitStatement.java (90%) rename parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/{ => global}/ShowGlobalRulesStatement.java (79%) diff --git a/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLStatementVisitor.java b/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLStatementVisitor.java index ffad568b6113a..61fc8cb5ac3d2 100644 --- a/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLStatementVisitor.java +++ b/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLStatementVisitor.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.BroadcastDistSQLStatementParser.DatabaseNameContext; import org.apache.shardingsphere.distsql.parser.autogen.BroadcastDistSQLStatementParser.DropBroadcastTableRuleContext; import org.apache.shardingsphere.distsql.parser.autogen.BroadcastDistSQLStatementParser.ShowBroadcastTableRulesContext; -import org.apache.shardingsphere.distsql.statement.rql.rule.CountRuleStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.CountRuleStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java index 10b97885fdbc4..b48788383e3a5 100644 --- a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java +++ b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.broadcast.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java index fb37534d2412a..05eb1e3081b60 100644 --- a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java +++ b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java @@ -33,7 +33,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.ShowEncryptRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.TableNameContext; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.statement.rql.rule.CountRuleStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.CountRuleStatement; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java index 3a46e67566b98..08242ba35340a 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.encrypt.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java index 2107ae2364db7..367aa83d49d21 100644 --- a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java +++ b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java @@ -32,7 +32,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.ShowMaskAlgorithmImplementationsContext; import org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.ShowMaskRulesContext; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.statement.rql.rule.CountRuleStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.CountRuleStatement; import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; import org.apache.shardingsphere.mask.distsql.statement.AlterMaskRuleStatement; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java index b80d8ee94d2c1..56b09d36e1e9a 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java index e388a59ec359e..4ae5117524c44 100644 --- a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java +++ b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java @@ -33,7 +33,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ShowReadwriteSplittingRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ShowStatusFromReadwriteSplittingRulesContext; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.statement.rql.rule.CountRuleStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.CountRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.statement.CreateReadwriteSplittingRuleStatement; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java index 51867bcdf40d3..dbd0623c76608 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.readwritesplitting.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java index 4e99af727ffff..dabc5ce5c0f92 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.resource.ResourceQueryStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; @@ -30,7 +30,7 @@ */ @RequiredArgsConstructor @Getter -public final class ShowStatusFromReadwriteSplittingRulesStatement extends RQLStatement implements FromDatabaseAvailable { +public final class ShowStatusFromReadwriteSplittingRulesStatement extends ResourceQueryStatement implements FromDatabaseAvailable { private final DatabaseSegment database; 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 5d1a8b5cf094d..912c104c525a9 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 @@ -38,7 +38,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShowShadowRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShowShadowTableRulesContext; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.statement.rql.rule.CountRuleStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.CountRuleStatement; import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import org.apache.shardingsphere.shadow.distsql.statement.AlterDefaultShadowAlgorithmStatement; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java index 9b1294cf09b02..ccab9fe11a401 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java index d7ac501bc461a..733f31552397d 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java index 4a1ced00bd379..25e1683ae5ff4 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java index 9eae808d9ec37..a4cdf39c873cf 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java index 80bd15c5ed4e7..c39a779a2f6ae 100644 --- a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java +++ b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java @@ -64,7 +64,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.TableNameContext; import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.TableReferenceRuleDefinitionContext; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.statement.rql.rule.CountRuleStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.CountRuleStatement; import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingAuditorSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java index 76917a1a16730..79cf42c34b1b8 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java index a3adfe06c6573..09dc56006181d 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java index 93fb93daf372a..ab36099a8c58c 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java index cf0845bfd8578..d051381e4ebc9 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java index dadd2172634d2..e9b19dc214e90 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java index cd6e9ce7ee79c..dd7c2cce2c29e 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java index 0b52172ff27f6..9c2fdcedccb92 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java index b93ea940a9c3e..9cbd71a60625e 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import java.util.Optional; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java index c3805d5f9bc75..aac785d4dbcb7 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import java.util.Optional; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java index 8779256ae55bc..8917deacab11f 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import java.util.Optional; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java index ffc1dd5a68e99..f34560cd6b465 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java index cdd28d7f5b303..f8fabd7623883 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java index b07116af29c28..50bfb1996f26c 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rql/count/CountRQLExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rql/count/CountRQLExecutor.java index 96ad65dbf82c7..c50ff62c39516 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rql/count/CountRQLExecutor.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rql/count/CountRQLExecutor.java @@ -19,7 +19,7 @@ import lombok.Setter; import org.apache.shardingsphere.distsql.handler.type.rql.aware.DatabaseAwareRQLExecutor; -import org.apache.shardingsphere.distsql.statement.rql.rule.CountRuleStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.CountRuleStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.rule.ShardingSphereRule; diff --git a/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java b/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java index 69e3365cb0481..5f8cc7368b66b 100644 --- a/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java +++ b/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.authority.distsql.statement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowGlobalRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.global.ShowGlobalRulesStatement; /** * Show authority rule statement. diff --git a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java index d816d1a491713..a501ffdf9e6cf 100644 --- a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java +++ b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.globalclock.distsql.statement.queryable; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowGlobalRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.global.ShowGlobalRulesStatement; /** * Show global clock rule statement. diff --git a/kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/core/SingleDistSQLStatementVisitor.java b/kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/core/SingleDistSQLStatementVisitor.java index d63a2cd700729..90ff833c239ee 100644 --- a/kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/core/SingleDistSQLStatementVisitor.java +++ b/kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/core/SingleDistSQLStatementVisitor.java @@ -35,7 +35,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.SingleDistSQLStatementParser.TableFromStorageUnitContext; import org.apache.shardingsphere.distsql.parser.autogen.SingleDistSQLStatementParser.TableIdentifierContext; import org.apache.shardingsphere.distsql.parser.autogen.SingleDistSQLStatementParser.UnloadSingleTableContext; -import org.apache.shardingsphere.distsql.statement.rql.rule.CountRuleStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.CountRuleStatement; import org.apache.shardingsphere.single.distsql.segment.SingleTableSegment; import org.apache.shardingsphere.single.distsql.statement.rdl.LoadSingleTableStatement; import org.apache.shardingsphere.single.distsql.statement.rdl.SetDefaultSingleTableStorageUnitStatement; diff --git a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowDefaultSingleTableStorageUnitStatement.java b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowDefaultSingleTableStorageUnitStatement.java index f641e092c93b2..3bba01d1ec457 100644 --- a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowDefaultSingleTableStorageUnitStatement.java +++ b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowDefaultSingleTableStorageUnitStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.single.distsql.statement.rql; import lombok.Getter; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/queryable/ShowSQLFederationRuleStatement.java b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/queryable/ShowSQLFederationRuleStatement.java index 6996d6c2555a7..5b11b22a1103a 100644 --- a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/queryable/ShowSQLFederationRuleStatement.java +++ b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/queryable/ShowSQLFederationRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sqlfederation.distsql.statement.queryable; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowGlobalRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.global.ShowGlobalRulesStatement; /** * Show SQL federation rule statement. diff --git a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java index a772bd5f42333..e104de3c51a4f 100644 --- a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java +++ b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.parser.distsql.statement.queryable; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowGlobalRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.global.ShowGlobalRulesStatement; /** * Show SQL parser rule statement. diff --git a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/queryable/ShowSQLTranslatorRuleStatement.java b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/queryable/ShowSQLTranslatorRuleStatement.java index d57b0f0add9e7..d378891165d26 100644 --- a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/queryable/ShowSQLTranslatorRuleStatement.java +++ b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/queryable/ShowSQLTranslatorRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sqltranslator.distsql.statement.queryable; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowGlobalRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.global.ShowGlobalRulesStatement; /** * Show SQL translator rule statement. diff --git a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java index aec41146cf03b..dd8e2866eaf64 100644 --- a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java +++ b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowGlobalRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.global.ShowGlobalRulesStatement; /** * Show traffic rules statement. diff --git a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java index 7d07733d023a4..f9ba0bb0f2c63 100644 --- a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java +++ b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.transaction.distsql.statement.queryable; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowGlobalRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.global.ShowGlobalRulesStatement; /** * Show transaction rule statement. diff --git a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java index 4c31c904bb2d3..5c86197f20070 100644 --- a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java +++ b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java @@ -105,7 +105,7 @@ import org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement; import org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.UnregisterStorageUnitStatement; import org.apache.shardingsphere.distsql.statement.rql.resource.ShowLogicalTablesStatement; -import org.apache.shardingsphere.distsql.statement.rql.resource.ShowRulesUsedStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement; import org.apache.shardingsphere.distsql.statement.rql.resource.ShowStorageUnitsStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ResourceQueryStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ResourceQueryStatement.java new file mode 100644 index 0000000000000..ff3812bcb47cf --- /dev/null +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ResourceQueryStatement.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.shardingsphere.distsql.statement.rql.resource; + +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; + +/** + * Resource query statement. + */ +public abstract class ResourceQueryStatement extends RQLStatement { +} diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowStorageUnitsStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowStorageUnitsStatement.java index 537f95a58f5ac..bd05e30681a67 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowStorageUnitsStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowStorageUnitsStatement.java @@ -19,7 +19,6 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; @@ -30,7 +29,7 @@ */ @Getter @RequiredArgsConstructor -public final class ShowStorageUnitsStatement extends RQLStatement implements FromDatabaseAvailable { +public final class ShowStorageUnitsStatement extends ResourceQueryStatement implements FromDatabaseAvailable { private final DatabaseSegment database; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowTablesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowTablesStatement.java index 777d06ae6ec5a..925fdceb8cb8a 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowTablesStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowTablesStatement.java @@ -18,7 +18,6 @@ package org.apache.shardingsphere.distsql.statement.rql.resource; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; @@ -28,7 +27,7 @@ * Show tables statement. */ @RequiredArgsConstructor -public abstract class ShowTablesStatement extends RQLStatement implements FromDatabaseAvailable { +public abstract class ShowTablesStatement extends ResourceQueryStatement implements FromDatabaseAvailable { private final String likePattern; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/RuleQueryStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/RuleQueryStatement.java new file mode 100644 index 0000000000000..d71e97df387c2 --- /dev/null +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/RuleQueryStatement.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.shardingsphere.distsql.statement.rql.rule; + +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; + +/** + * Rule query statement. + */ +public abstract class RuleQueryStatement extends RQLStatement { +} diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/CountRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/CountRuleStatement.java similarity index 94% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/CountRuleStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/CountRuleStatement.java index 9d7327beaac38..de90bc9d7c8dd 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/CountRuleStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/CountRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.statement.rql.rule; +package org.apache.shardingsphere.distsql.statement.rql.rule.database; import lombok.Getter; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/ShowDatabaseRulesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowDatabaseRulesStatement.java similarity index 83% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/ShowDatabaseRulesStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowDatabaseRulesStatement.java index 035844e474bb0..529768c2ca08e 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/ShowDatabaseRulesStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowDatabaseRulesStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.statement.rql.rule; +package org.apache.shardingsphere.distsql.statement.rql.rule.database; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.RuleQueryStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; @@ -28,7 +28,7 @@ * Show database rules statement. */ @RequiredArgsConstructor -public abstract class ShowDatabaseRulesStatement extends RQLStatement implements FromDatabaseAvailable { +public abstract class ShowDatabaseRulesStatement extends RuleQueryStatement implements FromDatabaseAvailable { private final DatabaseSegment database; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowRulesUsedStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowRulesUsedStorageUnitStatement.java similarity index 90% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowRulesUsedStorageUnitStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowRulesUsedStorageUnitStatement.java index 42733d550a2ee..6dc1566845aa5 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowRulesUsedStorageUnitStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowRulesUsedStorageUnitStatement.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.statement.rql.resource; +package org.apache.shardingsphere.distsql.statement.rql.rule.database; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import java.util.Optional; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/ShowGlobalRulesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/global/ShowGlobalRulesStatement.java similarity index 79% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/ShowGlobalRulesStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/global/ShowGlobalRulesStatement.java index 670eb1bc5b70b..41f651c9dc674 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/ShowGlobalRulesStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/global/ShowGlobalRulesStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.statement.rql.rule; +package org.apache.shardingsphere.distsql.statement.rql.rule.global; -import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.RuleQueryStatement; /** * Show global rules statement. */ -public abstract class ShowGlobalRulesStatement extends RQLStatement { +public abstract class ShowGlobalRulesStatement extends RuleQueryStatement { } diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/type/ShowRulesUsedStorageUnitExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/type/ShowRulesUsedStorageUnitExecutor.java index c6be8f4796ef5..88387fa84565f 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/type/ShowRulesUsedStorageUnitExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/type/ShowRulesUsedStorageUnitExecutor.java @@ -19,7 +19,7 @@ import lombok.Setter; import org.apache.shardingsphere.distsql.handler.type.rql.aware.DatabaseAwareRQLExecutor; -import org.apache.shardingsphere.distsql.statement.rql.resource.ShowRulesUsedStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.rule.EncryptRule; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/type/ShowRulesUsedStorageUnitExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/type/ShowRulesUsedStorageUnitExecutorTest.java index ce2f4d8958f87..4c64e6d0980e8 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/type/ShowRulesUsedStorageUnitExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/type/ShowRulesUsedStorageUnitExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rql.type; -import org.apache.shardingsphere.distsql.statement.rql.resource.ShowRulesUsedStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowRulesUsedStorageUnitStatement; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; import org.apache.shardingsphere.encrypt.rule.EncryptRule; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/RQLStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/RQLStatementAssert.java index 3632aae7ff21c..868fc9c931790 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/RQLStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/RQLStatementAssert.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.distsql.statement.rql.resource.ShowStorageUnitsStatement; import org.apache.shardingsphere.distsql.statement.rql.resource.ShowTablesStatement; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.parser.distsql.statement.queryable.ShowSQLParserRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.statement.ShowStatusFromReadwriteSplittingRulesStatement; import org.apache.shardingsphere.sqltranslator.distsql.statement.queryable.ShowSQLTranslatorRuleStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java index 5a1488e3ce40c..1b63931f12da9 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.statement.rql.rule.ShowDatabaseRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.rule.database.ShowDatabaseRulesStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.database.DatabaseAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DatabaseContainedTestCase;