This is an automated email from the ASF dual-hosted git repository. jianglongtao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push: new a4c7e303b37 ShowInstanceXxx renamed to ShowInstanceListXxx. (#19916) a4c7e303b37 is described below commit a4c7e303b37f4ae33d3d381b3008382ddc1d1969 Author: yx9o <yangx_s...@163.com> AuthorDate: Sat Aug 6 11:02:28 2022 +0800 ShowInstanceXxx renamed to ShowInstanceListXxx. (#19916) --- .../src/main/antlr4/imports/RALStatement.g4 | 2 +- .../distsql/parser/autogen/KernelDistSQLStatement.g4 | 2 +- .../core/kernel/KernelDistSQLStatementVisitor.java | 8 ++++---- ...anceStatement.java => ShowInstanceListStatement.java} | 4 ++-- .../handler/distsql/ral/RALBackendHandlerFactory.java | 6 +++--- ...InstanceHandler.java => ShowInstanceListHandler.java} | 6 +++--- .../distsql/ral/impl/QueryableRALStatementAssert.java | 10 +++++----- ...tAssert.java => ShowInstanceListStatementAssert.java} | 16 ++++++++-------- .../jaxb/cases/domain/SQLParserTestCases.java | 6 +++--- ...tCase.java => ShowInstanceListStatementTestCase.java} | 4 ++-- .../src/main/resources/case/ral/queryable.xml | 4 ++-- .../src/main/resources/sql/supported/ral/queryable.xml | 4 ++-- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RALStatement.g4 b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RALStatement.g4 index 583025b80c3..2068c2201a8 100644 --- a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RALStatement.g4 +++ b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/imports/RALStatement.g4 @@ -43,7 +43,7 @@ disableInstance : DISABLE INSTANCE instanceId ; -showInstance +showInstanceList : SHOW INSTANCE LIST ; diff --git a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4 b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4 index fcf85274ac5..c6a2435e415 100644 --- a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4 +++ b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4 @@ -31,7 +31,7 @@ execute | clearHint | enableInstance | disableInstance - | showInstance + | showInstanceList | showInstanceInfo | showModeInfo | labelInstance diff --git a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java index 5148116d66c..c7fd337f03d 100644 --- a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java +++ b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java @@ -61,8 +61,8 @@ import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementPa import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.SetVariableContext; import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowAllVariablesContext; import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowAuthorityRuleContext; -import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowInstanceContext; import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowInstanceInfoContext; +import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowInstanceListContext; import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowModeInfoContext; import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowResourcesContext; import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowRulesUsedResourceContext; @@ -92,7 +92,7 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportDa import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowAllVariableStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowAuthorityRuleStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceInfoStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceStatement; +import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceListStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowModeInfoStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowSQLParserRuleStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowSQLTranslatorRuleStatement; @@ -180,8 +180,8 @@ public final class KernelDistSQLStatementVisitor extends KernelDistSQLStatementB } @Override - public ASTNode visitShowInstance(final ShowInstanceContext ctx) { - return new ShowInstanceStatement(); + public ASTNode visitShowInstanceList(final ShowInstanceListContext ctx) { + return new ShowInstanceListStatement(); } @Override diff --git a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowInstanceStatement.java b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowInstanceListStatement.java similarity index 89% rename from shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowInstanceStatement.java rename to shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowInstanceListStatement.java index 333a77094ef..97a9cc67b04 100644 --- a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowInstanceStatement.java +++ b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowInstanceListStatement.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; /** - * Show instance statement. + * Show instance list statement. */ -public final class ShowInstanceStatement extends QueryableRALStatement { +public final class ShowInstanceListStatement extends QueryableRALStatement { } diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java index 925477d5d5b..2d913cce683 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java +++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportDa import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowAllVariableStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowAuthorityRuleStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceInfoStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceStatement; +import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceListStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowModeInfoStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowSQLParserRuleStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowSQLTranslatorRuleStatement; @@ -56,7 +56,7 @@ import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.Con import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ExportDatabaseConfigurationHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowAllVariableHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowAuthorityRuleHandler; -import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowInstanceHandler; +import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowInstanceListHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowInstanceInfoHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowModeInfoHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowReadwriteSplittingReadResourcesHandler; @@ -116,7 +116,7 @@ public final class RALBackendHandlerFactory { HANDLERS.put(ApplyDistSQLStatement.class, ApplyDistSQLHandler.class); HANDLERS.put(DiscardDistSQLStatement.class, DiscardDistSQLHandler.class); HANDLERS.put(ImportDatabaseConfigurationStatement.class, ImportDatabaseConfigurationHandler.class); - HANDLERS.put(ShowInstanceStatement.class, ShowInstanceHandler.class); + HANDLERS.put(ShowInstanceListStatement.class, ShowInstanceListHandler.class); HANDLERS.put(ShowVariableStatement.class, ShowVariableHandler.class); HANDLERS.put(ShowAllVariableStatement.class, ShowAllVariableHandler.class); HANDLERS.put(ShowReadwriteSplittingReadResourcesStatement.class, ShowReadwriteSplittingReadResourcesHandler.class); diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandler.java similarity index 95% rename from shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceHandler.java rename to shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandler.java index c90ca67157c..d89a60f9a06 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceHandler.java +++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandler.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceStatement; +import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceListStatement; import org.apache.shardingsphere.infra.instance.ComputeNodeInstance; import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData; import org.apache.shardingsphere.infra.instance.metadata.InstanceType; @@ -33,9 +33,9 @@ import java.util.Objects; import java.util.stream.Collectors; /** - * Show instance handler. + * Show instance list handler. */ -public final class ShowInstanceHandler extends QueryableRALBackendHandler<ShowInstanceStatement> { +public final class ShowInstanceListHandler extends QueryableRALBackendHandler<ShowInstanceListStatement> { private static final String ID = "instance_id"; diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/QueryableRALStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/QueryableRALStatementAssert.java index 7a6971a1349..b5bb1b8ca26 100644 --- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/QueryableRALStatementAssert.java +++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/QueryableRALStatementAssert.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportDa import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowAllVariableStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowAuthorityRuleStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceInfoStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceStatement; +import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceListStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowModeInfoStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowSQLParserRuleStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowSQLTranslatorRuleStatement; @@ -38,7 +38,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.queryable.ShowAllVariableStatementAssert; import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.queryable.ShowAuthorityRuleStatementAssert; import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.queryable.ShowInstanceInfoStatementAssert; -import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.queryable.ShowInstanceStatementAssert; +import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.queryable.ShowInstanceListStatementAssert; import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.queryable.ShowModeInfoStatementAssert; import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.queryable.ShowReadwriteSplittingReadResourcesStatementAssert; import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.queryable.ShowSQLParserRuleStatementAssert; @@ -52,7 +52,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowAllVariableStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowAuthorityRuleStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowInstanceInfoStatementTestCase; -import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowInstanceStatementTestCase; +import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowInstanceListStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowModeInfoStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowReadwriteSplittingReadResourcesStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowSQLParserRuleStatementTestCase; @@ -80,8 +80,8 @@ public final class QueryableRALStatementAssert { ShowVariableStatementAssert.assertIs(assertContext, (ShowVariableStatement) actual, (ShowVariableStatementTestCase) expected); } else if (actual instanceof ShowAllVariableStatement) { ShowAllVariableStatementAssert.assertIs(assertContext, (ShowAllVariableStatement) actual, (ShowAllVariableStatementTestCase) expected); - } else if (actual instanceof ShowInstanceStatement) { - ShowInstanceStatementAssert.assertIs(assertContext, (ShowInstanceStatement) actual, (ShowInstanceStatementTestCase) expected); + } else if (actual instanceof ShowInstanceListStatement) { + ShowInstanceListStatementAssert.assertIs(assertContext, (ShowInstanceListStatement) actual, (ShowInstanceListStatementTestCase) expected); } else if (actual instanceof ShowReadwriteSplittingReadResourcesStatement) { ShowReadwriteSplittingReadResourcesStatementAssert.assertIs(assertContext, (ShowReadwriteSplittingReadResourcesStatement) actual, (ShowReadwriteSplittingReadResourcesStatementTestCase) expected); diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/queryable/ShowInstanceStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/queryable/ShowInstanceListStatementAssert.java similarity index 75% rename from shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/queryable/ShowInstanceStatementAssert.java rename to shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/queryable/ShowInstanceListStatementAssert.java index 7b50a5e86b0..7635f991344 100644 --- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/queryable/ShowInstanceStatementAssert.java +++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/queryable/ShowInstanceListStatementAssert.java @@ -17,26 +17,26 @@ package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceStatement; +import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowInstanceListStatement; import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext; -import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowInstanceStatementTestCase; +import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowInstanceListStatementTestCase; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; /** - * Show instance statement assert. + * Show instance list statement assert. */ -public final class ShowInstanceStatementAssert { +public final class ShowInstanceListStatementAssert { /** - * Assert show instance statement is correct with expected parser result. + * Assert show instance list statement is correct with expected parser result. * * @param assertContext assert context - * @param actual actual show instance statement - * @param expected expected show instance statement test case + * @param actual actual show instance list statement + * @param expected expected show instance list statement test case */ - public static void assertIs(final SQLCaseAssertContext assertContext, final ShowInstanceStatement actual, final ShowInstanceStatementTestCase expected) { + public static void assertIs(final SQLCaseAssertContext assertContext, final ShowInstanceListStatement actual, final ShowInstanceListStatementTestCase expected) { if (null == expected) { assertNull(assertContext.getText("Actual statement should not exist."), actual); } else { diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java index efd7375c9f7..6ea3dea23f4 100644 --- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java +++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java @@ -290,7 +290,7 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowAllVariableStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowAuthorityRuleStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowInstanceInfoStatementTestCase; -import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowInstanceStatementTestCase; +import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowInstanceListStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowModeInfoStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowReadwriteSplittingHintStatusStatementTestCase; import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ShowReadwriteSplittingReadResourcesStatementTestCase; @@ -1134,8 +1134,8 @@ public final class SQLParserTestCases { @XmlElement(name = "install-plugin") private final List<InstallPluginStatementTestCase> installPluginTestCases = new LinkedList<>(); - @XmlElement(name = "show-instance") - private final List<ShowInstanceStatementTestCase> showInstanceTestCases = new LinkedList<>(); + @XmlElement(name = "show-instance-list") + private final List<ShowInstanceListStatementTestCase> showInstanceTestCases = new LinkedList<>(); @XmlElement(name = "clone") private final List<CloneStatementTestCase> cloneTestCases = new LinkedList<>(); diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowInstanceStatementTestCase.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowInstanceListStatementTestCase.java similarity index 89% rename from shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowInstanceStatementTestCase.java rename to shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowInstanceListStatementTestCase.java index a41747fa098..eae20137e14 100644 --- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowInstanceStatementTestCase.java +++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/ShowInstanceListStatementTestCase.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domai import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase; /** - * Show instance statement test case. + * Show instance list statement test case. */ -public final class ShowInstanceStatementTestCase extends SQLParserTestCase { +public final class ShowInstanceListStatementTestCase extends SQLParserTestCase { } diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/queryable.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/queryable.xml index b8931dfdeb2..07d76fcbceb 100644 --- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/queryable.xml +++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ral/queryable.xml @@ -20,8 +20,6 @@ <show-variable sql-case-id="show-variable" name="CACHED_CONNECTIONS" /> <show-all-variable sql-case-id="show-all-variables" /> - <show-instance sql-case-id="show-instance" /> - <show-readwrite-splitting-read-resources sql-case-id="show-readwrite-splitting-read-resources" /> <show-table-metadata sql-case-id="show-table-metadata"> @@ -34,6 +32,8 @@ <show-sql-parser-rule sql-case-id="show-sql-parser-rule" /> <show-traffic-rules sql-case-id="show-traffic-rules" rule-name="rule_name" /> <show-sql-translator-rule sql-case-id="show-sql-translator-rule" /> + + <show-instance-list sql-case-id="show-instance-list" /> <show-instance-info sql-case-id="show-instance-info" /> <show-mode-info sql-case-id="show-mode-info" /> diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/queryable.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/queryable.xml index 17cbdbcaa69..124fc6354a3 100644 --- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/queryable.xml +++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ral/queryable.xml @@ -20,8 +20,6 @@ <distsql-case id="show-variable" value="SHOW VARIABLE CACHED_CONNECTIONS" /> <distsql-case id="show-all-variables" value="SHOW ALL VARIABLES" /> - <distsql-case id="show-instance" value="SHOW INSTANCE LIST" /> - <distsql-case id="show-readwrite-splitting-read-resources" value="SHOW READWRITE_SPLITTING READ RESOURCES" /> <distsql-case id="show-table-metadata" value="SHOW TABLE METADATA t_order FROM database_name" /> @@ -31,6 +29,8 @@ <distsql-case id="show-sql-parser-rule" value="SHOW SQL_PARSER RULE" /> <distsql-case id="show-traffic-rules" value="SHOW TRAFFIC RULE rule_name" /> <distsql-case id="show-sql-translator-rule" value="SHOW SQL_TRANSLATOR RULE" /> + + <distsql-case id="show-instance-list" value="SHOW INSTANCE LIST" /> <distsql-case id="show-instance-info" value="SHOW INSTANCE INFO" /> <distsql-case id="show-mode-info" value="SHOW MODE INFO" />