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 63f8a4f297b Change DistSQL keyword INSTANCE to COMPUTE NODE (#21693)
63f8a4f297b is described below
commit 63f8a4f297b15910ee3d69cf167235272da010bc
Author: ChenJiaHao <[email protected]>
AuthorDate: Sun Oct 23 14:12:10 2022 +0800
Change DistSQL keyword INSTANCE to COMPUTE NODE (#21693)
* Change DistSQL keyword INSTANCE to COMPUTE NODE
* Remove unused import
* Merge master
---
distsql/parser/src/main/antlr4/imports/Keyword.g4 | 12 ++++++++
.../parser/src/main/antlr4/imports/RALStatement.g4 | 32 +++++++++++-----------
.../parser/autogen/KernelDistSQLStatement.g4 | 16 +++++------
.../core/kernel/KernelDistSQLStatementVisitor.java | 32 +++++++++++-----------
...ow_instance_list.xml => show_compute_nodes.xml} | 0
...ow_instance_list.xml => show_compute_nodes.xml} | 0
.../cases/ral/ral-integration-test-cases.xml | 4 +--
.../jaxb/cases/domain/SQLParserTestCases.java | 12 ++++----
.../src/main/resources/case/ral/queryable.xml | 6 ++--
.../src/main/resources/case/ral/updatable.xml | 20 +++++++-------
.../main/resources/sql/supported/ral/queryable.xml | 6 ++--
.../main/resources/sql/supported/ral/updatable.xml | 12 ++++----
12 files changed, 82 insertions(+), 70 deletions(-)
diff --git a/distsql/parser/src/main/antlr4/imports/Keyword.g4
b/distsql/parser/src/main/antlr4/imports/Keyword.g4
index c4c5955cee5..91377b58e16 100644
--- a/distsql/parser/src/main/antlr4/imports/Keyword.g4
+++ b/distsql/parser/src/main/antlr4/imports/Keyword.g4
@@ -335,6 +335,18 @@ WHERE
: W H E R E
;
+COMPUTE
+ : C O M P U T E
+ ;
+
+NODE
+ : N O D E
+ ;
+
+NODES
+ : N O D E S
+ ;
+
USAGE_COUNT
: U S A G E UL_ C O U N T
;
diff --git a/distsql/parser/src/main/antlr4/imports/RALStatement.g4
b/distsql/parser/src/main/antlr4/imports/RALStatement.g4
index c7eb3c9f2b4..6145ae3a514 100644
--- a/distsql/parser/src/main/antlr4/imports/RALStatement.g4
+++ b/distsql/parser/src/main/antlr4/imports/RALStatement.g4
@@ -31,20 +31,20 @@ showDistVariables
: SHOW DIST VARIABLES
;
-alterInstance
- : ALTER INSTANCE instanceId SET variableName EQ variableValues
+alterComputeNode
+ : ALTER COMPUTE NODE instanceId SET variableName EQ variableValues
;
-enableInstance
- : ENABLE INSTANCE instanceId
+enableComputeNode
+ : ENABLE COMPUTE NODE instanceId
;
-disableInstance
- : DISABLE INSTANCE instanceId
+disableComputeNode
+ : DISABLE COMPUTE NODE instanceId
;
-showInstanceList
- : SHOW INSTANCE LIST
+showComputeNodes
+ : SHOW COMPUTE NODES
;
clearHint
@@ -59,20 +59,20 @@ showTableMetadata
: SHOW TABLE METADATA tableName (COMMA tableName*)? (FROM databaseName)?
;
-showInstanceInfo
- : SHOW INSTANCE INFO
+showComputeNodeInfo
+ : SHOW COMPUTE NODE INFO
;
-showModeInfo
- : SHOW MODE INFO
+showComputeNodeMode
+ : SHOW COMPUTE NODE MODE
;
-labelInstance
- : (LABEL | RELABEL) INSTANCE instanceId WITH label (COMMA label)*
+labelComputeNode
+ : (LABEL | RELABEL) COMPUTE NODE instanceId WITH label (COMMA label)*
;
-unlabelInstance
- : UNLABEL INSTANCE instanceId (WITH label (COMMA label)*)?
+unlabelComputeNode
+ : UNLABEL COMPUTE NODE instanceId (WITH label (COMMA label)*)?
;
exportDatabaseConfiguration
diff --git
a/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
b/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
index b7ba74de6cf..184ba7ad471 100644
---
a/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
+++
b/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
@@ -28,15 +28,15 @@ execute
| showDistVariable
| showDistVariables
| clearHint
- | enableInstance
- | disableInstance
- | showInstanceList
- | showInstanceInfo
- | showModeInfo
- | labelInstance
- | unlabelInstance
+ | enableComputeNode
+ | disableComputeNode
+ | showComputeNodes
+ | showComputeNodeInfo
+ | showComputeNodeMode
+ | labelComputeNode
+ | unlabelComputeNode
| countSingleTableRule
- | alterInstance
+ | alterComputeNode
| prepareDistSQL
| applyDistSQL
| discardDistSQL
diff --git
a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
index 108d74841a6..5c97786d4a3 100644
---
a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
+++
b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
@@ -21,7 +21,7 @@ import org.antlr.v4.runtime.tree.ParseTree;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementBaseVisitor;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.AlgorithmDefinitionContext;
-import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.AlterInstanceContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.AlterComputeNodeContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.AlterMigrationProcessConfigurationContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.AlterStorageUnitContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ApplyDistSQLContext;
@@ -31,15 +31,15 @@ import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementPa
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.CountSingleTableRuleContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.CreateMigrationProcessConfigurationContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.DatabaseNameContext;
-import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.DisableInstanceContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.DisableComputeNodeContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.DiscardDistSQLContext;
-import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.EnableInstanceContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.EnableComputeNodeContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ExportDatabaseConfigurationContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.FromSegmentContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ImportDatabaseConfigurationContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.InstanceIdContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.InventoryIncrementalProcessConfigurationContext;
-import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.LabelInstanceContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.LabelComputeNodeContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.PasswordContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.PrepareDistSQLContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.PropertiesDefinitionContext;
@@ -54,18 +54,18 @@ import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementPa
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowDefaultSingleTableStorageUnitContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowDistVariableContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowDistVariablesContext;
-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.ShowComputeNodeInfoContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowComputeNodeModeContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowComputeNodesContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowMigrationProcessConfigurationContext;
-import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowModeInfoContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowRulesUsedResourceContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowSingleTableContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowStorageUnitsContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ShowTableMetadataContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.StorageUnitDefinitionContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.StreamChannelContext;
-import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.UnlabelInstanceContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.UnregisterStorageUnitContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.UnlabelComputeNodeContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.WorkerThreadContext;
import
org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.WriteDefinitionContext;
import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment;
@@ -157,38 +157,38 @@ public final class KernelDistSQLStatementVisitor extends
KernelDistSQLStatementB
}
@Override
- public ASTNode visitShowInstanceList(final ShowInstanceListContext ctx) {
+ public ASTNode visitShowComputeNodes(final ShowComputeNodesContext ctx) {
return new ShowInstanceListStatement();
}
@Override
- public ASTNode visitShowInstanceInfo(final ShowInstanceInfoContext ctx) {
+ public ASTNode visitShowComputeNodeInfo(final ShowComputeNodeInfoContext
ctx) {
return new ShowInstanceInfoStatement();
}
@Override
- public ASTNode visitShowModeInfo(final ShowModeInfoContext ctx) {
+ public ASTNode visitShowComputeNodeMode(final ShowComputeNodeModeContext
ctx) {
return new ShowModeInfoStatement();
}
@Override
- public ASTNode visitEnableInstance(final EnableInstanceContext ctx) {
+ public ASTNode visitEnableComputeNode(final EnableComputeNodeContext ctx) {
return
buildSetInstanceStatusStatement(ctx.ENABLE().getText().toUpperCase(),
ctx.instanceId());
}
@Override
- public ASTNode visitDisableInstance(final DisableInstanceContext ctx) {
+ public ASTNode visitDisableComputeNode(final DisableComputeNodeContext
ctx) {
return
buildSetInstanceStatusStatement(ctx.DISABLE().getText().toUpperCase(),
ctx.instanceId());
}
@Override
- public ASTNode visitLabelInstance(final LabelInstanceContext ctx) {
+ public ASTNode visitLabelComputeNode(final LabelComputeNodeContext ctx) {
Collection<String> labels =
ctx.label().stream().map(this::getIdentifierValue).collect(Collectors.toList());
return new LabelInstanceStatement(ctx.RELABEL() != null,
getIdentifierValue(ctx.instanceId()), labels);
}
@Override
- public ASTNode visitUnlabelInstance(final UnlabelInstanceContext ctx) {
+ public ASTNode visitUnlabelComputeNode(final UnlabelComputeNodeContext
ctx) {
Collection<String> labels =
ctx.label().stream().map(this::getIdentifierValue).collect(Collectors.toList());
return new
UnlabelInstanceStatement(getIdentifierValue(ctx.instanceId()), labels);
}
@@ -203,7 +203,7 @@ public final class KernelDistSQLStatementVisitor extends
KernelDistSQLStatementB
}
@Override
- public ASTNode visitAlterInstance(final AlterInstanceContext ctx) {
+ public ASTNode visitAlterComputeNode(final AlterComputeNodeContext ctx) {
return new
AlterInstanceStatement(getIdentifierValue(ctx.instanceId()),
getIdentifierValue(ctx.variableName()),
getIdentifierValue(ctx.variableValues()));
}
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_instance_list.xml
b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml
similarity index 100%
rename from
test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_instance_list.xml
rename to
test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_instance_list.xml
b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml
similarity index 100%
rename from
test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_instance_list.xml
rename to
test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
b/test/integration-test/test-suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
index a7291af0d71..7593a2c018e 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
@@ -74,8 +74,8 @@
<assertion expected-data-file="preview_federation_select.xml"/>
</test-case>
- <test-case sql="SHOW INSTANCE LIST">
- <assertion expected-data-file="show_instance_list.xml"/>
+ <test-case sql="SHOW COMPUTE NODES">
+ <assertion expected-data-file="show_compute_nodes.xml"/>
</test-case>
</integration-test-cases>
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
index 90a6a0ef106..db33a5e6c10 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
@@ -1137,7 +1137,7 @@ public final class SQLParserTestCases {
@XmlElement(name = "install-plugin")
private final List<InstallPluginStatementTestCase> installPluginTestCases
= new LinkedList<>();
- @XmlElement(name = "show-instance-list")
+ @XmlElement(name = "show-compute-nodes")
private final List<ShowInstanceListStatementTestCase>
showInstanceTestCases = new LinkedList<>();
@XmlElement(name = "clone")
@@ -1311,13 +1311,13 @@ public final class SQLParserTestCases {
@XmlElement(name = "drop-traffic-rule")
private final List<DropTrafficRuleStatementTestCase>
dropTrafficRuleTestCases = new LinkedList<>();
- @XmlElement(name = "label-instance")
+ @XmlElement(name = "label-compute-node")
private final List<LabelInstanceStatementTestCase> labelTestCases = new
LinkedList<>();
- @XmlElement(name = "unlabel-instance")
+ @XmlElement(name = "unlabel-compute-node")
private final List<UnlabelInstanceStatementTestCase> unlabelTestCases =
new LinkedList<>();
- @XmlElement(name = "alter-instance")
+ @XmlElement(name = "alter-compute-node")
private final List<AlterInstanceStatementTestCase> alterInstanceTestCases
= new LinkedList<>();
@XmlElement(name = "prepare-distsql")
@@ -1650,10 +1650,10 @@ public final class SQLParserTestCases {
@XmlElement(name = "create-foreign-table")
private final List<CreateForeignTableStatementTestCase>
createForeignTableStatementTestCases = new LinkedList<>();
- @XmlElement(name = "show-instance-info")
+ @XmlElement(name = "show-compute-node-info")
private final List<ShowInstanceInfoStatementTestCase>
showInstanceInfoStatementTestCases = new LinkedList<>();
- @XmlElement(name = "show-mode-info")
+ @XmlElement(name = "show-compute-node-mode")
private final List<ShowModeInfoStatementTestCase>
showModeInfoStatementTestCases = new LinkedList<>();
@XmlElement(name = "create-group")
diff --git a/test/parser/src/main/resources/case/ral/queryable.xml
b/test/parser/src/main/resources/case/ral/queryable.xml
index 330c4aaefef..8fd3266144c 100644
--- a/test/parser/src/main/resources/case/ral/queryable.xml
+++ b/test/parser/src/main/resources/case/ral/queryable.xml
@@ -33,9 +33,9 @@
<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" />
+ <show-compute-nodes sql-case-id="show-compute-nodes" />
+ <show-compute-node-info sql-case-id="show-compute-node-info" />
+ <show-compute-node-mode sql-case-id="show-compute-node-mode" />
<export-database-config sql-case-id="export-database-config">
<database name="database_name" start-index="28" stop-index="40" />
diff --git a/test/parser/src/main/resources/case/ral/updatable.xml
b/test/parser/src/main/resources/case/ral/updatable.xml
index 8da41d79639..a5f33efd1cc 100644
--- a/test/parser/src/main/resources/case/ral/updatable.xml
+++ b/test/parser/src/main/resources/case/ral/updatable.xml
@@ -68,22 +68,22 @@
<rule-name>rule_name</rule-name>
</drop-traffic-rule>
- <alter-instance sql-case-id="alter-instance-xa-recovery-nodes"
instance-id="instance_xa_recovery" key="XA_RECOVERY_NODES" value="instance_1" />
- <alter-instance
sql-case-id="alter-instance-xa-recovery-nodes-with-multiple-values"
instance-id="instance_xa_recovery_multiple" key="XA_RECOVERY_NODES"
value="instance_1,instance_2" />
+ <alter-compute-node sql-case-id="alter-compute-node-xa-recovery-nodes"
instance-id="instance_xa_recovery" key="XA_RECOVERY_NODES" value="instance_1" />
+ <alter-compute-node
sql-case-id="alter-compute-node-xa-recovery-nodes-with-multiple-values"
instance-id="instance_xa_recovery_multiple" key="XA_RECOVERY_NODES"
value="instance_1,instance_2" />
- <label-instance sql-case-id="label-instance" instance-id="instance_label"
overwrite="false">
+ <label-compute-node sql-case-id="label-compute-node"
instance-id="instance_label" overwrite="false">
<label>OLAP_1</label>
<label>OLAP_2</label>
- </label-instance>
- <label-instance sql-case-id="relabel-instance"
instance-id="instance_relabel" overwrite="true">
+ </label-compute-node>
+ <label-compute-node sql-case-id="relabel-compute-node"
instance-id="instance_relabel" overwrite="true">
<label>OLAP_1</label>
<label>OLAP_2</label>
- </label-instance>
- <unlabel-instance sql-case-id="unlabel-instance"
instance-id="instance_unlabel">
+ </label-compute-node>
+ <unlabel-compute-node sql-case-id="unlabel-compute-node"
instance-id="instance_unlabel">
<label>OLAP_1</label>
- </unlabel-instance>
- <unlabel-instance sql-case-id="unlabel-instance-without-label"
instance-id="instance_unlabel_2">
- </unlabel-instance>
+ </unlabel-compute-node>
+ <unlabel-compute-node sql-case-id="unlabel-compute-node-without-label"
instance-id="instance_unlabel_2">
+ </unlabel-compute-node>
<prepare-distsql sql-case-id="prepare-distsql" />
<apply-distsql sql-case-id="apply-distsql" />
diff --git a/test/parser/src/main/resources/sql/supported/ral/queryable.xml
b/test/parser/src/main/resources/sql/supported/ral/queryable.xml
index c7c8e3e9090..764969fd0fb 100644
--- a/test/parser/src/main/resources/sql/supported/ral/queryable.xml
+++ b/test/parser/src/main/resources/sql/supported/ral/queryable.xml
@@ -30,9 +30,9 @@
<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" />
+ <distsql-case id="show-compute-nodes" value="SHOW COMPUTE NODES" />
+ <distsql-case id="show-compute-node-info" value="SHOW COMPUTE NODE INFO" />
+ <distsql-case id="show-compute-node-mode" value="SHOW COMPUTE NODE MODE" />
<distsql-case id="export-database-config" value="EXPORT DATABASE CONFIG
FROM database_name" />
<distsql-case id="convert-yaml-config" value="CONVERT YAML CONFIG
FILE='/yaml/config-resource.yaml'" />
diff --git a/test/parser/src/main/resources/sql/supported/ral/updatable.xml
b/test/parser/src/main/resources/sql/supported/ral/updatable.xml
index a8aca45c60c..c512c6b76d7 100644
--- a/test/parser/src/main/resources/sql/supported/ral/updatable.xml
+++ b/test/parser/src/main/resources/sql/supported/ral/updatable.xml
@@ -33,13 +33,13 @@
<distsql-case id="alter-traffic-rule" value="ALTER TRAFFIC RULE
sql_match_traffic
(LABELS(OLTP),TRAFFIC_ALGORITHM(TYPE(NAME='SQL_MATCH',PROPERTIES('sql' =
'SELECT * FROM t_order WHERE order_id = ?; UPDATE t_order SET order_id =
?;'))), LOAD_BALANCER(TYPE(NAME='RANDOM', PROPERTIES('key'='value'))) )" />
<distsql-case id="drop-traffic-rule" value="DROP TRAFFIC RULE rule_name" />
- <distsql-case id="alter-instance-xa-recovery-nodes" value="ALTER INSTANCE
instance_xa_recovery SET XA_RECOVERY_NODES='instance_1'" />
- <distsql-case id="alter-instance-xa-recovery-nodes-with-multiple-values"
value="ALTER INSTANCE instance_xa_recovery_multiple SET
XA_RECOVERY_NODES='instance_1,instance_2'" />
+ <distsql-case id="alter-compute-node-xa-recovery-nodes" value="ALTER
COMPUTE NODE instance_xa_recovery SET XA_RECOVERY_NODES='instance_1'" />
+ <distsql-case
id="alter-compute-node-xa-recovery-nodes-with-multiple-values" value="ALTER
COMPUTE NODE instance_xa_recovery_multiple SET
XA_RECOVERY_NODES='instance_1,instance_2'" />
- <distsql-case id="label-instance" value="LABEL INSTANCE instance_label
WITH OLAP_1,OLAP_2" />
- <distsql-case id="relabel-instance" value="RELABEL INSTANCE
instance_relabel WITH OLAP_1,OLAP_2" />
- <distsql-case id="unlabel-instance" value="UNLABEL INSTANCE
instance_unlabel WITH OLAP_1" />
- <distsql-case id="unlabel-instance-without-label" value="UNLABEL INSTANCE
instance_unlabel_2" />
+ <distsql-case id="label-compute-node" value="LABEL COMPUTE NODE
instance_label WITH OLAP_1,OLAP_2" />
+ <distsql-case id="relabel-compute-node" value="RELABEL COMPUTE NODE
instance_relabel WITH OLAP_1,OLAP_2" />
+ <distsql-case id="unlabel-compute-node" value="UNLABEL COMPUTE NODE
instance_unlabel WITH OLAP_1" />
+ <distsql-case id="unlabel-compute-node-without-label" value="UNLABEL
COMPUTE NODE instance_unlabel_2" />
<distsql-case id="prepare-distsql" value="PREPARE DISTSQL" />
<distsql-case id="apply-distsql" value="APPLY DISTSQL" />
