This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 a71c9683923 Rename ShowDatabaseRulesStatement (#29839)
a71c9683923 is described below
commit a71c9683923d973e4ddee6bf775cb8186b92c793
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jan 24 23:49:58 2024 +0800
Rename ShowDatabaseRulesStatement (#29839)
---
.../ShowBroadcastTableRulesStatement.java | 4 +--
.../statement/ShowEncryptRulesStatement.java | 4 +--
.../distsql/statement/ShowMaskRulesStatement.java | 4 +--
.../ShowReadwriteSplittingRulesStatement.java | 4 +--
.../statement/CountShadowRuleStatement.java | 31 ----------------------
.../ShowDefaultShadowAlgorithmStatement.java | 4 +--
.../statement/ShowShadowAlgorithmsStatement.java | 4 +--
.../statement/ShowShadowRulesStatement.java | 4 +--
.../statement/ShowShadowTableRulesStatement.java | 4 +--
.../statement/CountShardingRuleStatement.java | 31 ----------------------
.../ShowDefaultShardingStrategyStatement.java | 4 +--
.../statement/ShowShardingAlgorithmsStatement.java | 4 +--
.../statement/ShowShardingAuditorsStatement.java | 4 +--
.../ShowShardingKeyGeneratorsStatement.java | 4 +--
.../statement/ShowShardingTableNodesStatement.java | 4 +--
.../ShowShardingTableReferenceRulesStatement.java | 4 +--
.../statement/ShowShardingTableRulesStatement.java | 4 +--
...owShardingTableRulesUsedAlgorithmStatement.java | 4 +--
...ShowShardingTableRulesUsedAuditorStatement.java | 4 +--
...hardingTableRulesUsedKeyGeneratorStatement.java | 4 +--
.../ShowUnusedShardingAlgorithmsStatement.java | 4 +--
.../ShowUnusedShardingAuditorsStatement.java | 4 +--
.../ShowUnusedShardingKeyGeneratorsStatement.java | 4 +--
...ShowDefaultSingleTableStorageUnitStatement.java | 4 +--
.../statement/rql/show/CountRuleStatement.java | 2 +-
...tement.java => ShowDatabaseRulesStatement.java} | 4 +--
.../show/ShowRulesUsedStorageUnitStatement.java | 2 +-
.../asserts/statement/rql/RQLStatementAssert.java | 6 ++---
.../rql/impl/ShowRulesStatementAssert.java | 6 ++---
29 files changed, 54 insertions(+), 116 deletions(-)
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 a6d91ec1f42..4fc09890747 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,13 +17,13 @@
package org.apache.shardingsphere.broadcast.distsql.statement;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show broadcast table rules statement.
*/
-public final class ShowBroadcastTableRulesStatement extends ShowRulesStatement
{
+public final class ShowBroadcastTableRulesStatement extends
ShowDatabaseRulesStatement {
public ShowBroadcastTableRulesStatement(final DatabaseSegment database) {
super(database);
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 3eb42d1bad0..892e5747291 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,14 +18,14 @@
package org.apache.shardingsphere.encrypt.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show encrypt rules statement.
*/
@Getter
-public final class ShowEncryptRulesStatement extends ShowRulesStatement {
+public final class ShowEncryptRulesStatement extends
ShowDatabaseRulesStatement {
private final String tableName;
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 e48b6957081..1f179a977b0 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,14 +18,14 @@
package org.apache.shardingsphere.mask.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show mask rules statement.
*/
@Getter
-public final class ShowMaskRulesStatement extends ShowRulesStatement {
+public final class ShowMaskRulesStatement extends ShowDatabaseRulesStatement {
private final String tableName;
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 9ddac7816fc..c3d3a11f9d6 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,14 +18,14 @@
package org.apache.shardingsphere.readwritesplitting.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show readwrite-splitting rules statement.
*/
@Getter
-public final class ShowReadwriteSplittingRulesStatement extends
ShowRulesStatement {
+public final class ShowReadwriteSplittingRulesStatement extends
ShowDatabaseRulesStatement {
private final String ruleName;
diff --git
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java
deleted file mode 100644
index 5a24330e463..00000000000
---
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java
+++ /dev/null
@@ -1,31 +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.shadow.distsql.statement;
-
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
-import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
-
-/**
- * Count shadow rule statement.
- */
-public final class CountShadowRuleStatement extends ShowRulesStatement {
-
- public CountShadowRuleStatement(final DatabaseSegment database) {
- super(database);
- }
-}
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 bffaafd4f3e..ef95b3166b8 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,14 +18,14 @@
package org.apache.shardingsphere.shadow.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show default shadow algorithm statement.
*/
@Getter
-public final class ShowDefaultShadowAlgorithmStatement extends
ShowRulesStatement {
+public final class ShowDefaultShadowAlgorithmStatement extends
ShowDatabaseRulesStatement {
public ShowDefaultShadowAlgorithmStatement(final DatabaseSegment database)
{
super(database);
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 fcd345b7392..57f955926b3 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,14 +18,14 @@
package org.apache.shardingsphere.shadow.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show shadow algorithms statement.
*/
@Getter
-public final class ShowShadowAlgorithmsStatement extends ShowRulesStatement {
+public final class ShowShadowAlgorithmsStatement extends
ShowDatabaseRulesStatement {
public ShowShadowAlgorithmsStatement(final DatabaseSegment database) {
super(database);
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 a1e6feaa93d..88aa532c69b 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,14 +18,14 @@
package org.apache.shardingsphere.shadow.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show shadow rules statement.
*/
@Getter
-public final class ShowShadowRulesStatement extends ShowRulesStatement {
+public final class ShowShadowRulesStatement extends ShowDatabaseRulesStatement
{
private final String ruleName;
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 814f968e47a..c931b9686bc 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,14 +18,14 @@
package org.apache.shardingsphere.shadow.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show shadow table rules statement.
*/
@Getter
-public final class ShowShadowTableRulesStatement extends ShowRulesStatement {
+public final class ShowShadowTableRulesStatement extends
ShowDatabaseRulesStatement {
private final String tableName;
diff --git
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java
deleted file mode 100644
index 36060c3ea30..00000000000
---
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java
+++ /dev/null
@@ -1,31 +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.sharding.distsql.statement;
-
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
-import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
-
-/**
- * Count sharding rule statement.
- */
-public final class CountShardingRuleStatement extends ShowRulesStatement {
-
- public CountShardingRuleStatement(final DatabaseSegment database) {
- super(database);
- }
-}
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 d9f36423f54..b007d75d922 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,13 +17,13 @@
package org.apache.shardingsphere.sharding.distsql.statement;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show default sharding strategy statement.
*/
-public final class ShowDefaultShardingStrategyStatement extends
ShowRulesStatement {
+public final class ShowDefaultShardingStrategyStatement extends
ShowDatabaseRulesStatement {
public ShowDefaultShardingStrategyStatement(final DatabaseSegment
database) {
super(database);
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 bf0a76e3bbf..cf91e9f9d73 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,13 +17,13 @@
package org.apache.shardingsphere.sharding.distsql.statement;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show sharding algorithms statement.
*/
-public final class ShowShardingAlgorithmsStatement extends ShowRulesStatement {
+public final class ShowShardingAlgorithmsStatement extends
ShowDatabaseRulesStatement {
public ShowShardingAlgorithmsStatement(final DatabaseSegment database) {
super(database);
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 f4ff4f2cd37..07820200f4e 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,13 +17,13 @@
package org.apache.shardingsphere.sharding.distsql.statement;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show sharding audit algorithms statement.
*/
-public final class ShowShardingAuditorsStatement extends ShowRulesStatement {
+public final class ShowShardingAuditorsStatement extends
ShowDatabaseRulesStatement {
public ShowShardingAuditorsStatement(final DatabaseSegment database) {
super(database);
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 a1ad28f059a..b4b021e967a 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,13 +17,13 @@
package org.apache.shardingsphere.sharding.distsql.statement;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show sharding key generators statement.
*/
-public final class ShowShardingKeyGeneratorsStatement extends
ShowRulesStatement {
+public final class ShowShardingKeyGeneratorsStatement extends
ShowDatabaseRulesStatement {
public ShowShardingKeyGeneratorsStatement(final DatabaseSegment database) {
super(database);
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 f4df90cf574..c92e3824823 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,14 +18,14 @@
package org.apache.shardingsphere.sharding.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show sharding table nodes statement.
*/
@Getter
-public final class ShowShardingTableNodesStatement extends ShowRulesStatement {
+public final class ShowShardingTableNodesStatement extends
ShowDatabaseRulesStatement {
private final String tableName;
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 2d0d2b64cd6..f6f219928a1 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,14 +18,14 @@
package org.apache.shardingsphere.sharding.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show sharding table reference rules statement.
*/
@Getter
-public final class ShowShardingTableReferenceRulesStatement extends
ShowRulesStatement {
+public final class ShowShardingTableReferenceRulesStatement extends
ShowDatabaseRulesStatement {
private final String ruleName;
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 6cb03f6f4e2..d3e2548c8f8 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,14 +18,14 @@
package org.apache.shardingsphere.sharding.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show sharding table rules statement.
*/
@Getter
-public final class ShowShardingTableRulesStatement extends ShowRulesStatement {
+public final class ShowShardingTableRulesStatement extends
ShowDatabaseRulesStatement {
private final String tableName;
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 58b152ad939..4ba52416bdd 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.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
import java.util.Optional;
@@ -25,7 +25,7 @@ import java.util.Optional;
/**
* Show sharding table rules used algorithm statement.
*/
-public final class ShowShardingTableRulesUsedAlgorithmStatement extends
ShowRulesStatement {
+public final class ShowShardingTableRulesUsedAlgorithmStatement extends
ShowDatabaseRulesStatement {
private final String shardingAlgorithmName;
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 a986a4398d3..77d95a32d61 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.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
import java.util.Optional;
@@ -25,7 +25,7 @@ import java.util.Optional;
/**
* Show sharding table rules used auditor statement.
*/
-public final class ShowShardingTableRulesUsedAuditorStatement extends
ShowRulesStatement {
+public final class ShowShardingTableRulesUsedAuditorStatement extends
ShowDatabaseRulesStatement {
private final String auditorName;
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 25f2eebe551..41ed82187e5 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.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
import java.util.Optional;
@@ -25,7 +25,7 @@ import java.util.Optional;
/**
* Show sharding table rules used key generator statement.
*/
-public final class ShowShardingTableRulesUsedKeyGeneratorStatement extends
ShowRulesStatement {
+public final class ShowShardingTableRulesUsedKeyGeneratorStatement extends
ShowDatabaseRulesStatement {
private final String keyGeneratorName;
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 a74040ef060..921a199bf1b 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,13 +17,13 @@
package org.apache.shardingsphere.sharding.distsql.statement;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show unused sharding algorithms statement.
*/
-public final class ShowUnusedShardingAlgorithmsStatement extends
ShowRulesStatement {
+public final class ShowUnusedShardingAlgorithmsStatement extends
ShowDatabaseRulesStatement {
public ShowUnusedShardingAlgorithmsStatement(final DatabaseSegment
database) {
super(database);
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 ce12573c547..d211110106e 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,13 +17,13 @@
package org.apache.shardingsphere.sharding.distsql.statement;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show unused sharding auditors statement.
*/
-public final class ShowUnusedShardingAuditorsStatement extends
ShowRulesStatement {
+public final class ShowUnusedShardingAuditorsStatement extends
ShowDatabaseRulesStatement {
public ShowUnusedShardingAuditorsStatement(final DatabaseSegment database)
{
super(database);
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 841f4eccea6..63a3deedb74 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,13 +17,13 @@
package org.apache.shardingsphere.sharding.distsql.statement;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show unused sharding key generators statement.
*/
-public final class ShowUnusedShardingKeyGeneratorsStatement extends
ShowRulesStatement {
+public final class ShowUnusedShardingKeyGeneratorsStatement extends
ShowDatabaseRulesStatement {
public ShowUnusedShardingKeyGeneratorsStatement(final DatabaseSegment
database) {
super(database);
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 d7e6bb0b16a..1f933d8ca7b 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,14 +18,14 @@
package org.apache.shardingsphere.single.distsql.statement.rql;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
/**
* Show default single table storage unit statement.
*/
@Getter
-public final class ShowDefaultSingleTableStorageUnitStatement extends
ShowRulesStatement {
+public final class ShowDefaultSingleTableStorageUnitStatement extends
ShowDatabaseRulesStatement {
public ShowDefaultSingleTableStorageUnitStatement(final DatabaseSegment
database) {
super(database);
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/CountRuleStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/CountRuleStatement.java
index 1ff3932769b..a570f9dcdbb 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/CountRuleStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/CountRuleStatement.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseS
* Count rule statement.
*/
@Getter
-public final class CountRuleStatement extends ShowRulesStatement {
+public final class CountRuleStatement extends ShowDatabaseRulesStatement {
private final String type;
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowDatabaseRulesStatement.java
similarity index 90%
rename from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesStatement.java
rename to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowDatabaseRulesStatement.java
index a6becff91b4..3e3f8806529 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowDatabaseRulesStatement.java
@@ -25,10 +25,10 @@ import
org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromD
import java.util.Optional;
/**
- * Show rules statement.
+ * Show database rules statement.
*/
@RequiredArgsConstructor
-public abstract class ShowRulesStatement extends RQLStatement implements
FromDatabaseAvailable {
+public abstract class ShowDatabaseRulesStatement extends RQLStatement
implements FromDatabaseAvailable {
private final DatabaseSegment database;
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesUsedStorageUnitStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesUsedStorageUnitStatement.java
index f431ba2265e..2df10d63900 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesUsedStorageUnitStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesUsedStorageUnitStatement.java
@@ -24,7 +24,7 @@ import java.util.Optional;
/**
* Show rules used storage unit statement.
*/
-public final class ShowRulesUsedStorageUnitStatement extends
ShowRulesStatement {
+public final class ShowRulesUsedStorageUnitStatement extends
ShowDatabaseRulesStatement {
private final String storageUnitName;
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 958a3f8c697..dfba31804ad 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
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.authority.distsql.statement.ShowAuthorityRuleStatement;
import org.apache.shardingsphere.distsql.statement.rql.RQLStatement;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.ShowDatabaseRulesStatement;
import
org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement;
import
org.apache.shardingsphere.distsql.statement.rql.show.ShowTablesStatement;
import
org.apache.shardingsphere.parser.distsql.statement.queryable.ShowSQLParserRuleStatement;
@@ -52,8 +52,8 @@ public final class RQLStatementAssert {
* @param expected expected RQL statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final RQLStatement actual, final SQLParserTestCase expected) {
- if (actual instanceof ShowRulesStatement) {
- ShowRulesStatementAssert.assertIs(assertContext,
(ShowRulesStatement) actual, expected);
+ if (actual instanceof ShowDatabaseRulesStatement) {
+ ShowRulesStatementAssert.assertIs(assertContext,
(ShowDatabaseRulesStatement) actual, expected);
} else if (actual instanceof ShowTablesStatement) {
ShowTablesStatementAssert.assertIs(assertContext,
(ShowTablesStatement) actual, expected);
} else if (actual instanceof ShowStorageUnitsStatement) {
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 1d8e4aa09d4..c52a0073045 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 @@ package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement;
+import
org.apache.shardingsphere.distsql.statement.rql.show.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;
@@ -43,12 +43,12 @@ public final class ShowRulesStatementAssert {
* @param actual actual show rules statement
* @param expected expected show rules statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowRulesStatement actual, final SQLParserTestCase expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowDatabaseRulesStatement actual, final SQLParserTestCase expected) {
assertThat("Expected value should be DatabaseContainedTestCase",
expected, instanceOf(DatabaseContainedTestCase.class));
assertIs(assertContext, actual, (DatabaseContainedTestCase) expected);
}
- private static void assertIs(final SQLCaseAssertContext assertContext,
final ShowRulesStatement actual, final DatabaseContainedTestCase expected) {
+ private static void assertIs(final SQLCaseAssertContext assertContext,
final ShowDatabaseRulesStatement actual, final DatabaseContainedTestCase
expected) {
if (null == expected.getDatabase()) {
assertFalse(actual.getDatabase().isPresent(),
assertContext.getText("Actual database should not exist."));
} else {
