You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2026/07/05 11:20:28 UTC
(shardingsphere) branch master updated: Remove useless proxy labels (#39006)
This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 afe998587e7 Remove useless proxy labels (#39006)
afe998587e7 is described below
commit afe998587e779d11e18bd87c0dfaf0ab2c4747a1
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Jul 5 19:20:22 2026 +0800
Remove useless proxy labels (#39006)
* Remove useless proxy labels
* Remove useless proxy labels
* Remove useless proxy labels
* Remove useless proxy labels
* Remove useless proxy labels
---
.../content/reference/management/_index.cn.md | 3 -
.../content/reference/management/_index.en.md | 3 -
.../label-relabel-compute-node.cn.md | 56 ----------
.../label-relabel-compute-node.en.md | 57 ----------
.../ral/circuit-breaker/show-compute-nodes.cn.md | 11 +-
.../ral/circuit-breaker/show-compute-nodes.en.md | 11 +-
.../ral/circuit-breaker/unlabel-compute-node.cn.md | 49 ---------
.../ral/circuit-breaker/unlabel-compute-node.en.md | 49 ---------
.../syntax/ral/show-compute-node-info.cn.md | 11 +-
.../syntax/ral/show-compute-node-info.en.md | 11 +-
.../infra/instance/ComputeNodeInstance.java | 12 +--
.../infra/instance/ComputeNodeInstanceContext.java | 19 ----
.../instance/ComputeNodeInstanceContextTest.java | 24 +----
.../infra/instance/ComputeNodeInstanceTest.java | 6 +-
.../reachability-metadata.json | 42 --------
.../reachability-metadata.json | 7 --
.../core/datasource/ShardingSphereDataSource.java | 2 +-
.../builder/ContextManagerBuilderParameter.java | 2 -
.../mode/manager/ContextManagerTest.java | 4 +-
.../ContextManagerBuilderParameterTest.java | 4 +-
.../factory/MetaDataContextsFactoryTest.java | 2 +-
...nfigurationMetaDataContextsInitFactoryTest.java | 2 +-
...isterCenterMetaDataContextsInitFactoryTest.java | 9 +-
.../global/node/compute/label/LabelNodePath.java | 45 --------
.../node/compute/label/LabelNodePathTest.java | 38 -------
.../cluster/ClusterContextManagerBuilder.java | 2 +-
.../type/ComputeNodeLabelChangedHandler.java | 59 ----------
.../service/ClusterComputeNodePersistService.java | 20 ----
...ch.handler.global.GlobalDataChangedEventHandler | 1 -
.../cluster/ClusterContextManagerBuilderTest.java | 3 +-
.../type/ComputeNodeLabelChangedHandlerTest.java | 63 -----------
.../ClusterComputeNodePersistServiceTest.java | 9 --
.../StandaloneContextManagerBuilderTest.java | 2 +-
.../engine/src/main/antlr4/imports/RALStatement.g4 | 12 ---
.../parser/autogen/KernelDistSQLStatement.g4 | 2 -
.../core/kernel/KernelDistSQLStatementVisitor.java | 16 ---
.../ral/updatable/LabelComputeNodeStatement.java | 37 -------
.../ral/updatable/UnlabelComputeNodeStatement.java | 35 ------
.../backend/config/ProxyGlobalConfiguration.java | 2 -
.../config/yaml/YamlProxyServerConfiguration.java | 2 -
.../swapper/YamlProxyConfigurationSwapper.java | 4 +-
.../computenode/ShowComputeNodeInfoExecutor.java | 5 +-
.../computenode/ShowComputeNodesExecutor.java | 5 +-
.../updatable/label/LabelComputeNodeExecutor.java | 56 ----------
.../label/UnlabelComputeNodeExecutor.java | 59 ----------
...sql.handler.engine.update.DistSQLUpdateExecutor | 2 -
.../config/ProxyConfigurationLoaderTest.java | 1 -
.../ShowComputeNodeInfoExecutorTest.java | 9 +-
.../computenode/ShowComputeNodesExecutorTest.java | 18 ++--
.../label/LabelComputeNodeExecutorTest.java | 92 ----------------
.../label/UnlabelComputeNodeExecutorTest.java | 95 ----------------
.../proxy/initializer/BootstrapInitializer.java | 2 +-
.../initializer/BootstrapInitializerTest.java | 2 -
.../empty_rules/cluster/show_compute_node_info.xml | 3 +-
.../empty_rules/cluster/show_compute_nodes.xml | 3 +-
.../standalone/show_compute_node_info.xml | 3 +-
.../empty_rules/standalone/show_compute_nodes.xml | 3 +-
.../ral/type/UpdatableRALStatementAssert.java | 12 +--
.../updatable/LabelComputeNodeStatementAssert.java | 49 ---------
.../UnlabelComputeNodeStatementAssert.java | 48 ---------
.../cases/parser/jaxb/RootSQLParserTestCases.java | 120 ++++++++++-----------
.../ral/LabelComputeNodeStatementTestCase.java | 43 --------
.../ral/UnlabelComputeNodeStatementTestCase.java | 40 -------
.../src/main/resources/case/ral/updatable.xml | 14 ---
.../main/resources/sql/supported/ral/updatable.xml | 5 -
65 files changed, 112 insertions(+), 1325 deletions(-)
diff --git a/docs/document/content/reference/management/_index.cn.md b/docs/document/content/reference/management/_index.cn.md
index bd71e253714..f77b8012acc 100644
--- a/docs/document/content/reference/management/_index.cn.md
+++ b/docs/document/content/reference/management/_index.cn.md
@@ -85,9 +85,6 @@ namespace
├ ├ ├──show_process_list_trigger
├ ├ ├ ├──process_id:UUID
├ ├ ├ ├──....
- ├ ├ ├──labels
- ├ ├ ├ ├──UUID
- ├ ├ ├ ├──....
├ ├──qualified_data_sources
├ ├ ├──${databaseName.groupName.dataSourceName}
├ ├ ├──${databaseName.groupName.dataSourceName}
diff --git a/docs/document/content/reference/management/_index.en.md b/docs/document/content/reference/management/_index.en.md
index 6407bcaac39..936d9613f2a 100644
--- a/docs/document/content/reference/management/_index.en.md
+++ b/docs/document/content/reference/management/_index.en.md
@@ -85,9 +85,6 @@ namespace
├ ├ ├──show_process_list_trigger
├ ├ ├ ├──process_id:UUID
├ ├ ├ ├──....
- ├ ├ ├──labels
- ├ ├ ├ ├──UUID
- ├ ├ ├ ├──....
├ ├──qualified_data_sources
├ ├ ├──${databaseName.groupName.dataSourceName}
├ ├ ├──${databaseName.groupName.dataSourceName}
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/label-relabel-compute-node.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/label-relabel-compute-node.cn.md
deleted file mode 100644
index b96b9c74857..00000000000
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/label-relabel-compute-node.cn.md
+++ /dev/null
@@ -1,56 +0,0 @@
-+++
-title = "LABEL|RELABEL COMPUTE NODE"
-weight = 5
-+++
-
-### 描述
-
-`LABEL|RELABEL COMPUTE NODE` 语法用于为 `PROXY` 实例添加标签。
-
-### 语法
-
-{{< tabs >}}
-{{% tab name="语法" %}}
-```sql
-LabelRelabelComputeNode ::=
- ('LABEL' | 'RELABEL') 'COMPUTE' 'NODE' instance_id 'WITH' labelName (',' labelName)*
-
-instance_id ::=
- string
-
-labelName ::=
- identifier
-```
-{{% /tab %}}
-{{% tab name="铁路图" %}}
-<iframe frameborder="0" name="diagram" id="diagram" width="100%" height="100%"></iframe>
-{{% /tab %}}
-{{< /tabs >}}
-
-### 补充说明
-
-- `instance_id` 需要通过 [SHOW COMPUTE NODES](/cn/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes/) 语法查询获得
-
-- `RELABEL` 用于为 `PROXY` 实例修改标签
-
-### 示例
-
-- 为 `PROXY` 实例添加标签
-
-```sql
-LABEL COMPUTE NODE "0699e636-ade9-4681-b37a-65240c584bb3" WITH label_1;
-```
-
-- 为 `PROXY` 实例修改标签
-```sql
-RELABEL COMPUTE NODE "0699e636-ade9-4681-b37a-65240c584bb3" WITH label_2;
-```
-
-### 保留字
-
-`LABEL`、`RELABEL`、`COMPUTE`、`NODE` 、`WITH`
-
-### 相关链接
-
-- [保留字](/cn/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word/)
-- [SHOW COMPUTE NODES](/cn/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes/)
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/label-relabel-compute-node.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/label-relabel-compute-node.en.md
deleted file mode 100644
index be393ae1987..00000000000
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/label-relabel-compute-node.en.md
+++ /dev/null
@@ -1,57 +0,0 @@
-+++
-title = "LABEL|RELABEL COMPUTE NODE"
-weight = 5
-+++
-
-### Description
-
-The `LABEL|RELABEL COMPUTE NODE` syntax is used to label `PROXY` instance.
-
-### Syntax
-
-{{< tabs >}}
-{{% tab name="Grammar" %}}
-```sql
-LabelRelabelComputeNode ::=
- ('LABEL' | 'RELABEL') 'COMPUTE' 'NODE' instance_id 'WITH' labelName (',' labelName)*
-
-instance_id ::=
- string
-
-labelName ::=
- identifier
-```
-{{% /tab %}}
-{{% tab name="Railroad diagram" %}}
-<iframe frameborder="0" name="diagram" id="diagram" width="100%" height="100%"></iframe>
-{{% /tab %}}
-{{< /tabs >}}
-
-### Supplement
-
-- `instance_id` needs to be obtained through [SHOW COMPUTE NODES](/en/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes/) syntax query
-
-- `RELABEL` is used to relabel `PROXY` instance
-
-### Example
-
-- Label `PROXY` instance
-
-```sql
-LABEL COMPUTE NODE "0699e636-ade9-4681-b37a-65240c584bb3" WITH label_1;
-```
-
-- Relabel `PROXY` instance
-
-```sql
-RELABEL COMPUTE NODE "0699e636-ade9-4681-b37a-65240c584bb3" WITH label_2;
-```
-
-### Reserved word
-
-`LABEL`, `RELABEL`, `COMPUTE`, `NODE`, `WITH`
-
-### Related links
-
-- [Reserved word](/en/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word/)
-- [SHOW COMPUTE NODES](/en/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes/)
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes.cn.md
index 956ee425866..1f10d69645f 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes.cn.md
@@ -32,7 +32,6 @@ ShowComputeNodes ::=
| status | 实例状态 |
| mode_type | 模式类型 |
| worker_id | worker id |
-| labels | 标签 |
| version | 版本 |
| database_name | 当前连接逻辑库（仅对 JDBC 生效） |
@@ -40,11 +39,11 @@ ShowComputeNodes ::=
```sql
mysql> SHOW COMPUTE NODES;
-+--------------------------------------+---------------+------------+------+--------+------------+-----------+--------+----------+--------------+
-| instance_id | instance_type | host | port | status | mode_type | worker_id | labels | version | database_name |
-+--------------------------------------+---------------+------------+------+--------+------------+-----------+--------+----------+--------------+
-| 3e84d33e-cb97-42f2-b6ce-f78fea0ded89 | PROXY | 127.0.0.1 | 3307 | OK | Cluster | -1 | | ${latest.release.version} | logic_db |
-+--------------------------------------+---------------+------------+------+--------+------------+-----------+--------+----------+--------------+
++--------------------------------------+---------------+------------+------+--------+------------+-----------+---------------------------+--------------+
+| instance_id | instance_type | host | port | status | mode_type | worker_id | version | database_name |
++--------------------------------------+---------------+------------+------+--------+------------+-----------+---------------------------+--------------+
+| 3e84d33e-cb97-42f2-b6ce-f78fea0ded89 | PROXY | 127.0.0.1 | 3307 | OK | Cluster | -1 | ${latest.release.version} | logic_db |
++--------------------------------------+---------------+------------+------+--------+------------+-----------+---------------------------+--------------+
1 row in set (0.01 sec)
```
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes.en.md
index e2e8d5eb866..5e5e7f28533 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes.en.md
@@ -31,7 +31,6 @@ ShowComputeNodes ::=
| status | status |
| mode_type | mode type |
| worker_id | worker id |
-| labels | labels |
| version | version |
| database_name | database name (Only valid for JDBC) |
@@ -39,11 +38,11 @@ ShowComputeNodes ::=
```sql
mysql> SHOW COMPUTE NODES;
-+--------------------------------------+---------------+------------+------+--------+------------+-----------+--------+----------+--------------+
-| instance_id | instance_type | host | port | status | mode_type | worker_id | labels | version | database_name |
-+--------------------------------------+---------------+------------+------+--------+------------+-----------+--------+----------+--------------+
-| 3e84d33e-cb97-42f2-b6ce-f78fea0ded89 | PROXY | 127.0.0.1 | 3307 | OK | Cluster | -1 | | ${latest.release.version} | logic_db |
-+--------------------------------------+---------------+------------+------+--------+------------+-----------+--------+----------+--------------+
++--------------------------------------+---------------+------------+------+--------+------------+-----------+---------------------------+--------------+
+| instance_id | instance_type | host | port | status | mode_type | worker_id | version | database_name |
++--------------------------------------+---------------+------------+------+--------+------------+-----------+---------------------------+--------------+
+| 3e84d33e-cb97-42f2-b6ce-f78fea0ded89 | PROXY | 127.0.0.1 | 3307 | OK | Cluster | -1 | ${latest.release.version} | logic_db |
++--------------------------------------+---------------+------------+------+--------+------------+-----------+---------------------------+--------------+
1 row in set (0.01 sec)
```
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/unlabel-compute-node.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/unlabel-compute-node.cn.md
deleted file mode 100644
index 32968e03105..00000000000
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/unlabel-compute-node.cn.md
+++ /dev/null
@@ -1,49 +0,0 @@
-+++
-title = "UNLABEL COMPUTE NODE"
-weight = 6
-+++
-
-### 描述
-
-`UNLABEL COMPUTE NODE` 语法用于为 `PROXY` 实例去除指定标签。
-
-### 语法
-
-{{< tabs >}}
-{{% tab name="语法" %}}
-```sql
-UnlabelComputeNode ::=
- 'UNLABEL' 'COMPUTE' 'NODE' instance_id ('WITH' labelName (',' labelName)*)?
-
-instance_id ::=
- string
-
-labelName ::=
- identifier
-```
-{{% /tab %}}
-{{% tab name="铁路图" %}}
-<iframe frameborder="0" name="diagram" id="diagram" width="100%" height="100%"></iframe>
-{{% /tab %}}
-{{< /tabs >}}
-
-### 补充说明
-
-- `instance_id` 需要通过 [SHOW COMPUTE NODES](/cn/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes/) 语法查询获得
-
-### 示例
-
-- 为 `PROXY` 实例去除指定标签
-
-```sql
-UNLABEL COMPUTE NODE "0699e636-ade9-4681-b37a-65240c584bb3" WITH label_1;
-```
-
-### 保留字
-
-`UNLABEL`、`COMPUTE`、`NODE`、`WITH`
-
-### 相关链接
-
-- [保留字](/cn/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word/)
-- [SHOW COMPUTE NODES](/cn/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes/)
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/unlabel-compute-node.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/unlabel-compute-node.en.md
deleted file mode 100644
index 8ebbf629214..00000000000
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/unlabel-compute-node.en.md
+++ /dev/null
@@ -1,49 +0,0 @@
-+++
-title = "UNLABEL COMPUTE NODE"
-weight = 6
-+++
-
-### Description
-
-The `UNLABEL COMPUTE NODE` syntax is used to remove specified labels from `PROXY` instance.
-
-### Syntax
-
-{{< tabs >}}
-{{% tab name="Grammar" %}}
-```sql
-UnlabelComputeNode ::=
- 'UNLABEL' 'COMPUTE' 'NODE' instance_id ('WITH' labelName (',' labelName)*)?
-
-instance_id ::=
- string
-
-labelName ::=
- identifier
-```
-{{% /tab %}}
-{{% tab name="Railroad diagram" %}}
-<iframe frameborder="0" name="diagram" id="diagram" width="100%" height="100%"></iframe>
-{{% /tab %}}
-{{< /tabs >}}
-
-### Supplement
-
-- `instance_id` needs to be obtained through [SHOW COMPUTE NODES](/en/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes/) syntax query
-
-### Example
-
-- Remove specified label from `PROXY` instance
-
-```sql
-UNLABEL COMPUTE NODE "0699e636-ade9-4681-b37a-65240c584bb3" WITH label_1;
-```
-
-### Reserved word
-
-`UNLABEL`, `COMPUTE`, `NODE`, `WITH`
-
-### Related links
-
-- [Reserved word](/en/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word/)
-- [SHOW COMPUTE NODES](/en/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-compute-nodes/)
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-compute-node-info.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-compute-node-info.cn.md
index ca57c29b75b..f9c45d80c94 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-compute-node-info.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-compute-node-info.cn.md
@@ -31,7 +31,6 @@ ShowComputeNodeInfo ::=
| status | proxy 实例状态 |
| mode_type | proxy 实例模式 |
| worker_id | worker id |
-| labels | 标签 |
| version | 版本 |
### 示例
@@ -44,11 +43,11 @@ SHOW COMPUTE NODE INFO;
```sql
mysql> SHOW COMPUTE NODE INFO;
-+--------------------------------------+-----------+------+--------+-----------+-----------+--------+----------+
-| instance_id | host | port | status | mode_type | worker_id | labels | version |
-+--------------------------------------+-----------+------+--------+-----------+-----------+--------+----------+
-| 3e84d33e-cb97-42f2-b6ce-f78fea0ded89 | 127.0.0.1 | 3307 | OK | Cluster | -1 | | ${latest.release.version} |
-+--------------------------------------+-----------+------+--------+-----------+-----------+--------+----------+
++--------------------------------------+-----------+------+--------+-----------+-----------+---------------------------+
+| instance_id | host | port | status | mode_type | worker_id | version |
++--------------------------------------+-----------+------+--------+-----------+-----------+---------------------------+
+| 3e84d33e-cb97-42f2-b6ce-f78fea0ded89 | 127.0.0.1 | 3307 | OK | Cluster | -1 | ${latest.release.version} |
++--------------------------------------+-----------+------+--------+-----------+-----------+---------------------------+
1 row in set (0.01 sec)
```
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-compute-node-info.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-compute-node-info.en.md
index 5814b40edde..53d0fddfe59 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-compute-node-info.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-compute-node-info.en.md
@@ -30,7 +30,6 @@ ShowComputeNodeInfo ::=
| status | proxy instance status |
| mode_type | proxy instance mode |
| worker_id | worker id |
-| labels | labels |
| version | version |
### Example
@@ -43,11 +42,11 @@ SHOW COMPUTE NODE INFO;
```sql
mysql> SHOW COMPUTE NODE INFO;
-+--------------------------------------+-----------+------+--------+-----------+-----------+--------+----------+
-| instance_id | host | port | status | mode_type | worker_id | labels | version |
-+--------------------------------------+-----------+------+--------+-----------+-----------+--------+----------+
-| 3e84d33e-cb97-42f2-b6ce-f78fea0ded89 | 127.0.0.1 | 3307 | OK | Cluster | -1 | | ${latest.release.version} |
-+--------------------------------------+-----------+------+--------+-----------+-----------+--------+----------+
++--------------------------------------+-----------+------+--------+-----------+-----------+---------------------------+
+| instance_id | host | port | status | mode_type | worker_id | version |
++--------------------------------------+-----------+------+--------+-----------+-----------+---------------------------+
+| 3e84d33e-cb97-42f2-b6ce-f78fea0ded89 | 127.0.0.1 | 3307 | OK | Cluster | -1 | ${latest.release.version} |
++--------------------------------------+-----------+------+--------+-----------+-----------+---------------------------+
1 row in set (0.01 sec)
```
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstance.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstance.java
index 55c6f2205fe..59a2d946fd4 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstance.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstance.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.instance;
+import com.google.errorprone.annotations.ThreadSafe;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
@@ -24,10 +25,6 @@ import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.state.instance.InstanceState;
import org.apache.shardingsphere.infra.state.instance.InstanceStateContext;
-import com.google.errorprone.annotations.ThreadSafe;
-import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArrayList;
-
/**
* Instance of compute node.
*/
@@ -40,16 +37,9 @@ public final class ComputeNodeInstance {
private final InstanceStateContext state = new InstanceStateContext();
- private final Collection<String> labels = new CopyOnWriteArrayList<>();
-
@Setter
private volatile int workerId = -1;
- public ComputeNodeInstance(final InstanceMetaData metaData, final Collection<String> labels) {
- this.metaData = metaData;
- this.labels.addAll(labels);
- }
-
/**
* Switch state.
*
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java
index d6f81263a54..2453c6d6439 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.infra.instance.workerid.WorkerIdGenerator;
import org.apache.shardingsphere.infra.state.instance.InstanceState;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import java.util.Collection;
import java.util.Optional;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
@@ -83,24 +82,6 @@ public final class ComputeNodeInstanceContext {
clusterInstanceRegistry.find(instanceId).ifPresent(optional -> optional.switchState(instanceState.get()));
}
- /**
- * Update instance labels.
- *
- * @param instanceId instance ID
- * @param labels labels
- */
- public void updateLabels(final String instanceId, final Collection<String> labels) {
- if (instance.getMetaData().getId().equals(instanceId)) {
- updateLabels(instance, labels);
- }
- clusterInstanceRegistry.find(instanceId).ifPresent(optional -> updateLabels(optional, labels));
- }
-
- private void updateLabels(final ComputeNodeInstance computeNodeInstance, final Collection<String> labels) {
- computeNodeInstance.getLabels().clear();
- computeNodeInstance.getLabels().addAll(labels);
- }
-
/**
* Update instance worker ID.
*
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContextTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContextTest.java
index 51f9bcd6b0b..dac2138ebdc 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContextTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContextTest.java
@@ -25,12 +25,10 @@ import org.apache.shardingsphere.infra.state.instance.InstanceState;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
import java.util.Properties;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.hamcrest.Matchers.is;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -75,26 +73,6 @@ class ComputeNodeInstanceContextTest {
assertThat(instanceContext.getInstance().getState().getCurrentState(), is(InstanceState.OK));
}
- @Test
- void assertUpdateLabelsWithCurrentInstance() {
- InstanceMetaData instanceMetaData = new ProxyInstanceMetaData("foo_instance_id", 3306);
- ComputeNodeInstanceContext instanceContext = new ComputeNodeInstanceContext(new ComputeNodeInstance(instanceMetaData), mock(ModeConfiguration.class), new EventBusContext());
- instanceContext.init(mock(WorkerIdGenerator.class));
- instanceContext.updateLabels("foo_instance_id", Arrays.asList("label_1", "label_2"));
- assertThat(instanceContext.getInstance().getLabels(), is(Arrays.asList("label_1", "label_2")));
- }
-
- @Test
- void assertUpdateLabelsWithOtherInstance() {
- InstanceMetaData instanceMetaData = new ProxyInstanceMetaData("foo_instance_id", 3306);
- ComputeNodeInstanceContext instanceContext = new ComputeNodeInstanceContext(new ComputeNodeInstance(instanceMetaData), mock(ModeConfiguration.class), new EventBusContext());
- instanceContext.init(mock(WorkerIdGenerator.class));
- instanceContext.getClusterInstanceRegistry().add(new ComputeNodeInstance(new ProxyInstanceMetaData("bar_instance_id", 3307)));
- instanceContext.updateLabels("bar_instance_id", Arrays.asList("label_1", "label_2"));
- assertTrue(instanceContext.getInstance().getLabels().isEmpty());
- assertThat(instanceContext.getClusterInstanceRegistry().getAllClusterInstances().iterator().next().getLabels(), is(Arrays.asList("label_1", "label_2")));
- }
-
@Test
void assertUpdateWorkerIdWithCurrentInstance() {
ComputeNodeInstance instance = new ComputeNodeInstance(new ProxyInstanceMetaData("foo_instance_id", 3306));
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceTest.java
index a87b393725e..1a6d75820d3 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceTest.java
@@ -20,10 +20,8 @@ package org.apache.shardingsphere.infra.instance;
import org.apache.shardingsphere.infra.state.instance.InstanceState;
import org.junit.jupiter.api.Test;
-import java.util.Collections;
-
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.mockito.Mockito.mock;
class ComputeNodeInstanceTest {
@@ -37,7 +35,7 @@ class ComputeNodeInstanceTest {
@Test
void assertSwitchToOtherState() {
- ComputeNodeInstance computeNodeInstance = new ComputeNodeInstance(mock(), Collections.emptyList());
+ ComputeNodeInstance computeNodeInstance = new ComputeNodeInstance(mock());
computeNodeInstance.switchState(InstanceState.OK);
assertThat(computeNodeInstance.getState().getCurrentState(), is(InstanceState.OK));
}
diff --git a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
index 9b8cef5a22d..6625e0d8dc9 100644
--- a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
+++ b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
@@ -2696,12 +2696,6 @@
},
"type": "org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.config.type.PropertiesChangedHandler"
},
- {
- "condition": {
- "typeReached": "org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.DataChangedEventListenerRegistry"
- },
- "type": "org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.compute.type.ComputeNodeLabelChangedHandler"
- },
{
"condition": {
"typeReached": "org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.DataChangedEventListenerRegistry"
@@ -3104,18 +3098,6 @@
},
"type": "org.apache.shardingsphere.mode.node.path.type.global.config.GlobalRuleNodePath"
},
- {
- "condition": {
- "typeReached": "org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.DataChangedEventListenerRegistry"
- },
- "type": "org.apache.shardingsphere.mode.node.path.type.global.node.compute.label.LabelNodePath"
- },
- {
- "condition": {
- "typeReached": "org.apache.shardingsphere.mode.manager.cluster.persist.service.ClusterComputeNodePersistService"
- },
- "type": "org.apache.shardingsphere.mode.node.path.type.global.node.compute.label.LabelNodePath"
- },
{
"condition": {
"typeReached": "org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.DataChangedEventListenerRegistry"
@@ -3423,30 +3405,6 @@
}
]
},
- {
- "condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
- },
- "type": "org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.label.LabelComputeNodeExecutor",
- "methods": [
- {
- "name": "<init>",
- "parameterTypes": []
- }
- ]
- },
- {
- "condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
- },
- "type": "org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.label.UnlabelComputeNodeExecutor",
- "methods": [
- {
- "name": "<init>",
- "parameterTypes": []
- }
- ]
- },
{
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
diff --git a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/infra-reachability-metadata/reachability-metadata.json b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/infra-reachability-metadata/reachability-metadata.json
index fa21350c913..d741064e0a0 100644
--- a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/infra-reachability-metadata/reachability-metadata.json
+++ b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/infra-reachability-metadata/reachability-metadata.json
@@ -731,13 +731,6 @@
"type": "org.apache.shardingsphere.mode.node.path.type.global.node.compute.status.StatusNodePath",
"allDeclaredFields": true
},
- {
- "condition": {
- "typeReached": "org.apache.shardingsphere.mode.node.path.engine.generator.NodePathSegment"
- },
- "type": "org.apache.shardingsphere.mode.node.path.type.global.node.compute.label.LabelNodePath",
- "allDeclaredFields": true
- },
{
"condition": {
"typeReached": "org.apache.shardingsphere.infra.util.yaml.constructor.ShardingSphereYamlConstructor"
diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
index 35da1021ee4..90b9c356f07 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
@@ -73,7 +73,7 @@ public final class ShardingSphereDataSource extends AbstractDataSourceAdapter im
Collection<RuleConfiguration> databaseRuleConfigs = new LinkedList<>(ruleConfigs);
databaseRuleConfigs.removeAll(globalRuleConfigs);
ContextManagerBuilderParameter param = new ContextManagerBuilderParameter(modeConfig, Collections.singletonMap(databaseName,
- new DataSourceProvidedDatabaseConfiguration(dataSourceMap, databaseRuleConfigs)), Collections.emptyMap(), globalRuleConfigs, props, Collections.emptyList(), instanceMetaData);
+ new DataSourceProvidedDatabaseConfiguration(dataSourceMap, databaseRuleConfigs)), Collections.emptyMap(), globalRuleConfigs, props, instanceMetaData);
return TypedSPILoader.getService(ContextManagerBuilder.class, null == modeConfig ? null : modeConfig.getType()).build(param, new EventBusContext());
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/builder/ContextManagerBuilderParameter.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/builder/ContextManagerBuilderParameter.java
index c3be6ff0538..923487dd798 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/builder/ContextManagerBuilderParameter.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/builder/ContextManagerBuilderParameter.java
@@ -48,8 +48,6 @@ public final class ContextManagerBuilderParameter {
private final Properties props;
- private final Collection<String> labels;
-
private final InstanceMetaData instanceMetaData;
/**
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 06ce651ede5..30adc758596 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -117,7 +117,7 @@ class ContextManagerTest {
when(metaDataContexts.getMetaData().getDatabase("foo_db")).thenReturn(database);
when(metaDataContexts.getMetaData().getDatabase("bar_db")).thenReturn(null);
when(metaDataContexts.getMetaData().getAllDatabases()).thenReturn(Collections.singleton(database));
- when(computeNodeInstanceContext.getInstance()).thenReturn(new ComputeNodeInstance(new ProxyInstanceMetaData("foo_id", 3307), Collections.emptyList()));
+ when(computeNodeInstanceContext.getInstance()).thenReturn(new ComputeNodeInstance(new ProxyInstanceMetaData("foo_id", 3307)));
when(computeNodeInstanceContext.getModeConfiguration()).thenReturn(new ModeConfiguration("FIXTURE", mock()));
contextManager = new ContextManager(metaDataContexts, computeNodeInstanceContext, mock(), mock());
}
@@ -326,7 +326,7 @@ class ContextManagerTest {
@Test
void assertGetPreSelectedDatabaseNameWithJDBC() {
- when(computeNodeInstanceContext.getInstance()).thenReturn(new ComputeNodeInstance(new JDBCInstanceMetaData("foo_id", "foo_db"), Collections.emptyList()));
+ when(computeNodeInstanceContext.getInstance()).thenReturn(new ComputeNodeInstance(new JDBCInstanceMetaData("foo_id", "foo_db")));
ShardingSphereDatabase database =
new ShardingSphereDatabase("foo_db", databaseType, mock(ResourceMetaData.class), mock(RuleMetaData.class), Collections.emptyList(), new ConfigurationProperties(new Properties()));
when(metaDataContexts.getMetaData().getAllDatabases()).thenReturn(Collections.singleton(database));
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/builder/ContextManagerBuilderParameterTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/builder/ContextManagerBuilderParameterTest.java
index 0c4d258f009..aba99af224e 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/builder/ContextManagerBuilderParameterTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/builder/ContextManagerBuilderParameterTest.java
@@ -34,7 +34,7 @@ class ContextManagerBuilderParameterTest {
@Test
void assertGetDefaultModeConfiguration() {
- ContextManagerBuilderParameter param = new ContextManagerBuilderParameter(null, Collections.emptyMap(), Collections.emptyMap(), Collections.emptyList(), new Properties(), null, null);
+ ContextManagerBuilderParameter param = new ContextManagerBuilderParameter(null, Collections.emptyMap(), Collections.emptyMap(), Collections.emptyList(), new Properties(), null);
assertThat(param.getModeConfiguration().getType(), is("Standalone"));
assertNull(param.getModeConfiguration().getRepository());
}
@@ -43,7 +43,7 @@ class ContextManagerBuilderParameterTest {
void assertGetModeConfiguration() {
ModeConfiguration modeConfig = new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class));
ContextManagerBuilderParameter param =
- new ContextManagerBuilderParameter(modeConfig, Collections.emptyMap(), Collections.emptyMap(), Collections.emptyList(), new Properties(), null, null);
+ new ContextManagerBuilderParameter(modeConfig, Collections.emptyMap(), Collections.emptyMap(), Collections.emptyList(), new Properties(), null);
assertThat(param.getModeConfiguration().getType(), is("Cluster"));
assertNotNull(param.getModeConfiguration().getRepository());
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactoryTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactoryTest.java
index 73d457cc2bb..af410c059e9 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactoryTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactoryTest.java
@@ -257,7 +257,7 @@ class MetaDataContextsFactoryTest {
private ContextManagerBuilderParameter createContextManagerBuilderParameter() {
DatabaseConfiguration databaseConfig = new DataSourceProvidedDatabaseConfiguration(Collections.singletonMap("foo", new MockedDataSource()), Collections.emptyList());
return new ContextManagerBuilderParameter(null, Collections.singletonMap("foo_db", databaseConfig), Collections.emptyMap(),
- Collections.emptyList(), new Properties(), Collections.emptyList(), null);
+ Collections.emptyList(), new Properties(), null);
}
private Map<String, DataSourcePoolProperties> createDataSourcePoolPropertiesMap(final String... storageUnitNames) {
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/init/type/LocalConfigurationMetaDataContextsInitFactoryTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/init/type/LocalConfigurationMetaDataContextsInitFactoryTest.java
index 97dcaf3649b..f3e31f84f46 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/init/type/LocalConfigurationMetaDataContextsInitFactoryTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/init/type/LocalConfigurationMetaDataContextsInitFactoryTest.java
@@ -113,6 +113,6 @@ class LocalConfigurationMetaDataContextsInitFactoryTest {
}
private ContextManagerBuilderParameter createContextManagerBuilderParameter(final Map<String, DatabaseConfiguration> databaseConfigs, final Properties props) {
- return new ContextManagerBuilderParameter(null, databaseConfigs, Collections.emptyMap(), Collections.emptyList(), props, Collections.emptyList(), null);
+ return new ContextManagerBuilderParameter(null, databaseConfigs, Collections.emptyMap(), Collections.emptyList(), props, null);
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/init/type/RegisterCenterMetaDataContextsInitFactoryTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/init/type/RegisterCenterMetaDataContextsInitFactoryTest.java
index 81535d6b674..a9e156e74fe 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/init/type/RegisterCenterMetaDataContextsInitFactoryTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/init/type/RegisterCenterMetaDataContextsInitFactoryTest.java
@@ -125,13 +125,6 @@ class RegisterCenterMetaDataContextsInitFactoryTest {
return result;
}
- private Map<String, DatabaseConfiguration> createDatabaseConfigsWithoutStorageUnits() {
- Map<String, DatabaseConfiguration> result = new LinkedHashMap<>(2, 1F);
- result.put("foo_db", createDatabaseConfigWithoutStorageUnits());
- result.put("bar_db", createDatabaseConfigWithoutStorageUnits());
- return result;
- }
-
private DatabaseConfiguration createDatabaseConfigWithoutStorageUnits() {
DatabaseConfiguration result = mock(DatabaseConfiguration.class);
when(result.getStorageUnits()).thenReturn(Collections.emptyMap());
@@ -146,6 +139,6 @@ class RegisterCenterMetaDataContextsInitFactoryTest {
}
private ContextManagerBuilderParameter createContextManagerBuilderParameter(final Map<String, DatabaseConfiguration> databaseConfigs) {
- return new ContextManagerBuilderParameter(null, databaseConfigs, Collections.emptyMap(), Collections.emptyList(), new Properties(), Collections.emptyList(), null);
+ return new ContextManagerBuilderParameter(null, databaseConfigs, Collections.emptyMap(), Collections.emptyList(), new Properties(), null);
}
}
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java
deleted file mode 100644
index 7a278d06438..00000000000
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java
+++ /dev/null
@@ -1,45 +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.mode.node.path.type.global.node.compute.label;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.NodePath;
-import org.apache.shardingsphere.mode.node.path.NodePathEntity;
-import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
-import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearchCriteria;
-
-/**
- * Label node path.
- */
-@NodePathEntity("/nodes/compute_nodes/labels/${instanceId}")
-@RequiredArgsConstructor
-@Getter
-public final class LabelNodePath implements NodePath {
-
- private final String instanceId;
-
- /**
- * Create instance ID search criteria.
- *
- * @return created search criteria
- */
- public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
- return new NodePathSearchCriteria(new LabelNodePath(NodePathPattern.IDENTIFIER), false, 1);
- }
-}
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePathTest.java
deleted file mode 100644
index ba4997a589e..00000000000
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePathTest.java
+++ /dev/null
@@ -1,38 +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.mode.node.path.type.global.node.compute.label;
-
-import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-class LabelNodePathTest {
-
- @Test
- void assertToPath() {
- assertThat(NodePathGenerator.toPath(new LabelNodePath("foo_instance_id")), is("/nodes/compute_nodes/labels/foo_instance_id"));
- }
-
- @Test
- void assertCreateInstanceIdSearchCriteria() {
- assertThat(NodePathSearcher.get("/nodes/compute_nodes/labels/foo_instance_id", LabelNodePath.createInstanceIdSearchCriteria()), is("foo_instance_id"));
- }
-}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 7a674e2bfeb..c28061dfa08 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -56,7 +56,7 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
public ContextManager build(final ContextManagerBuilderParameter param, final EventBusContext eventBusContext) throws SQLException {
ModeConfiguration modeConfig = param.getModeConfiguration();
ClusterPersistRepositoryConfiguration config = (ClusterPersistRepositoryConfiguration) modeConfig.getRepository();
- ComputeNodeInstanceContext computeNodeInstanceContext = new ComputeNodeInstanceContext(new ComputeNodeInstance(param.getInstanceMetaData(), param.getLabels()), modeConfig, eventBusContext);
+ ComputeNodeInstanceContext computeNodeInstanceContext = new ComputeNodeInstanceContext(new ComputeNodeInstance(param.getInstanceMetaData()), modeConfig, eventBusContext);
ClusterPersistRepository repository = getClusterPersistRepository(config, computeNodeInstanceContext);
computeNodeInstanceContext.init(new ClusterWorkerIdGenerator(repository, param.getInstanceMetaData().getId()));
ExclusiveOperatorEngine exclusiveOperatorEngine = new ExclusiveOperatorEngine(new ClusterExclusiveOperatorContext(repository));
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeLabelChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeLabelChangedHandler.java
deleted file mode 100644
index 1767aa090a8..00000000000
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeLabelChangedHandler.java
+++ /dev/null
@@ -1,59 +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.mode.manager.cluster.dispatch.handler.global.node.compute.type;
-
-import com.google.common.base.Strings;
-import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.event.DataChangedEvent;
-import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.compute.ComputeNodeChangedHandler;
-import org.apache.shardingsphere.mode.node.path.NodePath;
-import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import org.apache.shardingsphere.mode.node.path.type.global.node.compute.label.LabelNodePath;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * Compute node label changed handler.
- */
-public final class ComputeNodeLabelChangedHandler implements ComputeNodeChangedHandler {
-
- @Override
- public NodePath getSubscribedNodePath() {
- return new LabelNodePath(null);
- }
-
- @Override
- public Collection<Type> getSubscribedTypes() {
- return Arrays.asList(Type.ADDED, Type.UPDATED);
- }
-
- @Override
- public void handle(final ContextManager contextManager, final DataChangedEvent event) {
- NodePathSearcher.find(event.getKey(), LabelNodePath.createInstanceIdSearchCriteria()).ifPresent(optional -> handle(contextManager, event, optional));
- }
-
- @SuppressWarnings("unchecked")
- private void handle(final ContextManager contextManager, final DataChangedEvent event, final String instanceId) {
- contextManager.getComputeNodeInstanceContext().updateLabels(
- instanceId, Strings.isNullOrEmpty(event.getValue()) ? new ArrayList<>() : YamlEngine.unmarshal(event.getValue(), Collection.class));
- }
-}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistService.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistService.java
index 83b009df7d7..b83cdf9f8e9 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistService.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistService.java
@@ -30,7 +30,6 @@ import org.apache.shardingsphere.infra.instance.yaml.YamlComputeNodeDataSwapper;
import org.apache.shardingsphere.infra.state.instance.InstanceState;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.type.global.node.compute.label.LabelNodePath;
import org.apache.shardingsphere.mode.node.path.type.global.node.compute.status.OnlineNodePath;
import org.apache.shardingsphere.mode.node.path.type.global.node.compute.status.StatusNodePath;
import org.apache.shardingsphere.mode.node.path.type.global.node.compute.workerid.ComputeNodeWorkerIDNodePath;
@@ -39,7 +38,6 @@ import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.LinkedList;
import java.util.Objects;
import java.util.Optional;
@@ -62,7 +60,6 @@ public final class ClusterComputeNodePersistService implements ComputeNodePersis
public void registerOnline(final ComputeNodeInstance computeNodeInstance) {
persistOnline(computeNodeInstance);
updateState(computeNodeInstance.getMetaData().getId(), computeNodeInstance.getState().getCurrentState());
- persistLabels(computeNodeInstance.getMetaData().getId(), computeNodeInstance.getLabels());
}
private void persistOnline(final ComputeNodeInstance computeNodeInstance) {
@@ -90,7 +87,6 @@ public final class ClusterComputeNodePersistService implements ComputeNodePersis
public ComputeNodeInstance loadInstance(final InstanceMetaData instanceMetaData) {
ComputeNodeInstance result = new ComputeNodeInstance(instanceMetaData);
InstanceState.get(loadState(instanceMetaData.getId())).ifPresent(result::switchState);
- result.getLabels().addAll(loadLabels(instanceMetaData.getId()));
loadWorkerId(instanceMetaData.getId()).ifPresent(result::setWorkerId);
return result;
}
@@ -99,12 +95,6 @@ public final class ClusterComputeNodePersistService implements ComputeNodePersis
return repository.query(NodePathGenerator.toPath(new StatusNodePath(instanceId)));
}
- @SuppressWarnings("unchecked")
- private Collection<String> loadLabels(final String instanceId) {
- String yamlContent = repository.query(NodePathGenerator.toPath(new LabelNodePath(instanceId)));
- return Strings.isNullOrEmpty(yamlContent) ? Collections.emptyList() : YamlEngine.unmarshal(yamlContent, Collection.class);
- }
-
/**
* Update state.
*
@@ -115,16 +105,6 @@ public final class ClusterComputeNodePersistService implements ComputeNodePersis
repository.persistEphemeral(NodePathGenerator.toPath(new StatusNodePath(instanceId)), instanceState.name());
}
- /**
- * Persist labels.
- *
- * @param instanceId instance ID
- * @param labels instance labels
- */
- public void persistLabels(final String instanceId, final Collection<String> labels) {
- repository.persistEphemeral(NodePathGenerator.toPath(new LabelNodePath(instanceId)), YamlEngine.marshal(labels));
- }
-
/**
* Persist worker ID.
*
diff --git a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler
index e2a914f6404..db7f6c5ebaf 100644
--- a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler
+++ b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler
@@ -24,7 +24,6 @@ org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.stor
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.compute.type.ComputeNodeOnlineHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.compute.type.ComputeNodeStateChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.compute.type.ComputeNodeWorkerIdChangedHandler
-org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.compute.type.ComputeNodeLabelChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.statistics.StatisticsChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.process.ShowProcessListHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.process.KillProcessHandler
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java
index 05ec7803a67..ae0c679be29 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java
@@ -56,7 +56,6 @@ class ClusterContextManagerBuilderTest {
void assertBuildWithNullRepositoryConfiguration() {
ContextManagerBuilderParameter param = mock(ContextManagerBuilderParameter.class, RETURNS_DEEP_STUBS);
when(param.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
- when(param.getLabels()).thenReturn(Collections.emptyList());
assertThrows(MissingRequiredClusterRepositoryConfigurationException.class, () -> builder.build(param, mock(EventBusContext.class)));
}
@@ -72,7 +71,7 @@ class ClusterContextManagerBuilderTest {
private void assertBuild(final InstanceMetaData instanceMetaData) throws SQLException {
ContextManager actual = builder.build(new ContextManagerBuilderParameter(createModeConfiguration(),
- Collections.emptyMap(), Collections.emptyMap(), Collections.emptyList(), new Properties(), Collections.emptyList(), instanceMetaData), mock(EventBusContext.class));
+ Collections.emptyMap(), Collections.emptyMap(), Collections.emptyList(), new Properties(), instanceMetaData), mock(EventBusContext.class));
assertThat(actual.getComputeNodeInstanceContext().getInstance().getMetaData(), is(instanceMetaData));
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeLabelChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeLabelChangedHandlerTest.java
deleted file mode 100644
index 7aa9178e215..00000000000
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeLabelChangedHandlerTest.java
+++ /dev/null
@@ -1,63 +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.mode.manager.cluster.dispatch.handler.global.node.compute.type;
-
-import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.mode.event.DataChangedEvent;
-import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler;
-import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Collections;
-
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-@ExtendWith(MockitoExtension.class)
-class ComputeNodeLabelChangedHandlerTest {
-
- private GlobalDataChangedEventHandler handler;
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private ContextManager contextManager;
-
- @BeforeEach
- void setUp() {
- handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream()
- .filter(each -> "/nodes/compute_nodes/labels".equals(NodePathGenerator.toPath(each.getSubscribedNodePath()))).findFirst().orElse(null);
- }
-
- @Test
- void assertHandleWithEmptyInstanceId() {
- handler.handle(contextManager, new DataChangedEvent("/nodes/compute_nodes/labels", "", Type.ADDED));
- verify(contextManager, never()).getComputeNodeInstanceContext();
- }
-
- @Test
- void assertHandleWithLabelsEvent() {
- handler.handle(contextManager, new DataChangedEvent("/nodes/compute_nodes/labels/foo_instance_id", "", Type.ADDED));
- verify(contextManager.getComputeNodeInstanceContext()).updateLabels("foo_instance_id", Collections.emptyList());
- }
-}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistServiceTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistServiceTest.java
index 9e44848cdf6..aac2285a378 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistServiceTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistServiceTest.java
@@ -63,11 +63,9 @@ class ClusterComputeNodePersistServiceTest {
@Test
void assertRegisterOnline() {
ComputeNodeInstance computeNodeInstance = new ComputeNodeInstance(new ProxyInstanceMetaData("foo_instance_id", 3307));
- computeNodeInstance.getLabels().add("test");
computeNodePersistService.registerOnline(computeNodeInstance);
verify(repository).persistEphemeral(eq("/nodes/compute_nodes/online/proxy/foo_instance_id"), anyString());
verify(repository).persistEphemeral("/nodes/compute_nodes/status/foo_instance_id", InstanceState.OK.name());
- verify(repository).persistEphemeral("/nodes/compute_nodes/labels/foo_instance_id", YamlEngine.marshal(Collections.singletonList("test")));
}
@Test
@@ -110,13 +108,6 @@ class ClusterComputeNodePersistServiceTest {
assertThrows(ClusterRepositoryPersistException.class, () -> computeNodePersistService.updateState("foo_instance_id", InstanceState.OK));
}
- @Test
- void assertPersistLabels() {
- String instanceId = new ProxyInstanceMetaData("foo_instance_id", 3307).getId();
- computeNodePersistService.persistLabels(instanceId, Collections.singletonList("test"));
- verify(repository).persistEphemeral("/nodes/compute_nodes/labels/foo_instance_id", YamlEngine.marshal(Collections.singletonList("test")));
- }
-
@Test
void assertPersistWorkerId() {
String instanceId = new ProxyInstanceMetaData("foo_instance_id", 3307).getId();
diff --git a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTest.java b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTest.java
index aa0251233ec..6e362c76659 100644
--- a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTest.java
+++ b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTest.java
@@ -52,7 +52,7 @@ class StandaloneContextManagerBuilderTest {
void assertBuild(final ContextManagerBuilder builder) throws SQLException {
InstanceMetaData instanceMetaData = new JDBCInstanceMetaData("foo", "foo_db");
ContextManager actual = builder.build(new ContextManagerBuilderParameter(createModeConfiguration(),
- Collections.emptyMap(), Collections.emptyMap(), Collections.emptyList(), new Properties(), Collections.emptyList(), instanceMetaData), mock(EventBusContext.class));
+ Collections.emptyMap(), Collections.emptyMap(), Collections.emptyList(), new Properties(), instanceMetaData), mock(EventBusContext.class));
assertThat(actual.getComputeNodeInstanceContext().getInstance().getMetaData(), is(instanceMetaData));
}
diff --git a/parser/distsql/engine/src/main/antlr4/imports/RALStatement.g4 b/parser/distsql/engine/src/main/antlr4/imports/RALStatement.g4
index 47b6cb55325..4c2fd51ea9e 100644
--- a/parser/distsql/engine/src/main/antlr4/imports/RALStatement.g4
+++ b/parser/distsql/engine/src/main/antlr4/imports/RALStatement.g4
@@ -67,14 +67,6 @@ showComputeNodeMode
: SHOW COMPUTE NODE MODE
;
-labelComputeNode
- : (LABEL | RELABEL) COMPUTE NODE instanceId WITH label (COMMA_ label)*
- ;
-
-unlabelComputeNode
- : UNLABEL COMPUTE NODE instanceId (WITH label (COMMA_ label)*)?
- ;
-
exportDatabaseConfiguration
: EXPORT DATABASE CONFIGURATION (FROM databaseName)? (TO FILE filePath)?
;
@@ -159,10 +151,6 @@ lockStrategy
: LOCK_STRATEGY LP_ algorithmDefinition RP_
;
-label
- : IDENTIFIER_
- ;
-
showLike
: LIKE likePattern
;
diff --git a/parser/distsql/engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4 b/parser/distsql/engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
index ea54423a6ad..d2a08738c34 100644
--- a/parser/distsql/engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
+++ b/parser/distsql/engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/KernelDistSQLStatement.g4
@@ -33,8 +33,6 @@ execute
| showComputeNodes
| showComputeNodeInfo
| showComputeNodeMode
- | labelComputeNode
- | unlabelComputeNode
| alterComputeNode
| showLogicalTables
| refreshDatabaseMetadata
diff --git a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
index 9f46b76bb38..0567c36c026 100644
--- a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
+++ b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
@@ -39,7 +39,6 @@ import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementPa
import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ImportDatabaseConfigurationContext;
import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.ImportMetaDataContext;
import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.InstanceIdContext;
-import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.LabelComputeNodeContext;
import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.LockClusterContext;
import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.PropertiesDefinitionContext;
import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.PropertyContext;
@@ -61,7 +60,6 @@ import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementPa
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.StorageUnitsDefinitionContext;
-import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.UnlabelComputeNodeContext;
import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.UnlockClusterContext;
import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.UnregisterStorageUnitContext;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
@@ -82,13 +80,11 @@ import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowT
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.AlterComputeNodeStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.ImportDatabaseConfigurationStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.ImportMetaDataStatement;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LabelComputeNodeStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LockClusterStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.RefreshDatabaseMetaDataStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.SetComputeNodeStateStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.SetDistVariableStatement;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.UnlabelComputeNodeStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.UnlockClusterStatement;
import org.apache.shardingsphere.distsql.statement.type.rdl.resource.unit.type.AlterStorageUnitStatement;
import org.apache.shardingsphere.distsql.statement.type.rdl.resource.unit.type.RegisterStorageUnitStatement;
@@ -178,18 +174,6 @@ public final class KernelDistSQLStatementVisitor extends KernelDistSQLStatementB
return buildSetComputeNodeStateStatement(ctx.DISABLE().getText().toUpperCase(), ctx.instanceId());
}
- @Override
- public ASTNode visitLabelComputeNode(final LabelComputeNodeContext ctx) {
- Collection<String> labels = ctx.label().stream().map(IdentifierValueUtils::getValue).collect(Collectors.toList());
- return new LabelComputeNodeStatement(null != ctx.RELABEL(), IdentifierValueUtils.getValue(ctx.instanceId()), labels);
- }
-
- @Override
- public ASTNode visitUnlabelComputeNode(final UnlabelComputeNodeContext ctx) {
- Collection<String> labels = ctx.label().stream().map(IdentifierValueUtils::getValue).collect(Collectors.toList());
- return new UnlabelComputeNodeStatement(IdentifierValueUtils.getValue(ctx.instanceId()), labels);
- }
-
private SetComputeNodeStateStatement buildSetComputeNodeStateStatement(final String status, final InstanceIdContext instanceIdContext) {
return new SetComputeNodeStateStatement(status, IdentifierValueUtils.getValue(instanceIdContext));
}
diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/updatable/LabelComputeNodeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/updatable/LabelComputeNodeStatement.java
deleted file mode 100644
index 230e10d3bd0..00000000000
--- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/updatable/LabelComputeNodeStatement.java
+++ /dev/null
@@ -1,37 +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.distsql.statement.type.ral.updatable;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import java.util.Collection;
-
-/**
- * Label compute node statement.
- */
-@RequiredArgsConstructor
-@Getter
-public final class LabelComputeNodeStatement extends UpdatableRALStatement {
-
- private final boolean overwrite;
-
- private final String instanceId;
-
- private final Collection<String> labels;
-}
diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/updatable/UnlabelComputeNodeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/updatable/UnlabelComputeNodeStatement.java
deleted file mode 100644
index 46bbee90a5e..00000000000
--- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/updatable/UnlabelComputeNodeStatement.java
+++ /dev/null
@@ -1,35 +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.distsql.statement.type.ral.updatable;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import java.util.Collection;
-
-/**
- * Unlabel compute node statement.
- */
-@RequiredArgsConstructor
-@Getter
-public final class UnlabelComputeNodeStatement extends UpdatableRALStatement {
-
- private final String instanceId;
-
- private final Collection<String> labels;
-}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyGlobalConfiguration.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyGlobalConfiguration.java
index 1f3b27c1130..c315f6e9d4a 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyGlobalConfiguration.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyGlobalConfiguration.java
@@ -38,6 +38,4 @@ public final class ProxyGlobalConfiguration {
private final Collection<RuleConfiguration> rules;
private final Properties properties;
-
- private final Collection<String> labels;
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyServerConfiguration.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyServerConfiguration.java
index b89e506498e..954081a1265 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyServerConfiguration.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyServerConfiguration.java
@@ -62,8 +62,6 @@ public final class YamlProxyServerConfiguration implements YamlConfiguration {
private Properties props = new Properties();
- private Collection<String> labels;
-
/**
* Set rules if the param rules is not null.
*
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
index c564187623a..eb3a592b857 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
@@ -35,7 +35,6 @@ import org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyServerConfig
import javax.sql.DataSource;
import java.util.Collection;
-import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -68,8 +67,7 @@ public final class YamlProxyConfigurationSwapper {
private ProxyGlobalConfiguration swapGlobalConfiguration(final YamlProxyServerConfiguration yamlConfig) {
Map<String, DataSource> dataSources = swapDataSources(yamlConfig.getDataSources());
Collection<RuleConfiguration> ruleConfigs = ruleConfigSwapperEngine.swapToRuleConfigurations(yamlConfig.getRules());
- return new ProxyGlobalConfiguration(dataSources, ruleConfigs,
- null == yamlConfig.getProps() ? new Properties() : yamlConfig.getProps(), null == yamlConfig.getLabels() ? Collections.emptyList() : yamlConfig.getLabels());
+ return new ProxyGlobalConfiguration(dataSources, ruleConfigs, null == yamlConfig.getProps() ? new Properties() : yamlConfig.getProps());
}
private Map<String, DataSource> swapDataSources(final Map<String, YamlProxyDataSourceConfiguration> yamlDataSourceConfigs) {
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutor.java
index 1fd069f2f2a..6d8d5338656 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutor.java
@@ -36,7 +36,7 @@ public final class ShowComputeNodeInfoExecutor implements DistSQLQueryExecutor<S
@Override
public Collection<String> getColumnNames(final ShowComputeNodeInfoStatement sqlStatement) {
- return Arrays.asList("instance_id", "host", "port", "status", "mode_type", "worker_id", "labels", "version");
+ return Arrays.asList("instance_id", "host", "port", "status", "mode_type", "worker_id", "version");
}
@Override
@@ -46,8 +46,7 @@ public final class ShowComputeNodeInfoExecutor implements DistSQLQueryExecutor<S
String modeType = contextManager.getComputeNodeInstanceContext().getModeConfiguration().getType();
return Collections.singletonList(new LocalDataQueryResultRow(instanceMetaData.getId(), instanceMetaData.getIp(),
instanceMetaData instanceof ProxyInstanceMetaData ? ((ProxyInstanceMetaData) instanceMetaData).getPort() : -1,
- instance.getState().getCurrentState(), modeType, instance.getWorkerId(), String.join(",", instance.getLabels()),
- instanceMetaData.getVersion()));
+ instance.getState().getCurrentState(), modeType, instance.getWorkerId(), instanceMetaData.getVersion()));
}
@Override
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutor.java
index e4c889653c3..ffadeb5621d 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutor.java
@@ -36,7 +36,7 @@ public final class ShowComputeNodesExecutor implements DistSQLQueryExecutor<Show
@Override
public Collection<String> getColumnNames(final ShowComputeNodesStatement sqlStatement) {
- return Arrays.asList("instance_id", "instance_type", "host", "port", "status", "mode_type", "worker_id", "labels", "version", "database_name");
+ return Arrays.asList("instance_id", "instance_type", "host", "port", "status", "mode_type", "worker_id", "version", "database_name");
}
@Override
@@ -47,11 +47,10 @@ public final class ShowComputeNodesExecutor implements DistSQLQueryExecutor<Show
}
private LocalDataQueryResultRow buildRow(final ComputeNodeInstance instance, final String modeType) {
- String labels = String.join(",", instance.getLabels());
InstanceMetaData instanceMetaData = instance.getMetaData();
return new LocalDataQueryResultRow(instanceMetaData.getId(), instanceMetaData.getType(), instanceMetaData.getIp(),
instanceMetaData instanceof ProxyInstanceMetaData ? ((ProxyInstanceMetaData) instanceMetaData).getPort() : -1,
- instance.getState().getCurrentState(), modeType, instance.getWorkerId(), labels, instanceMetaData.getVersion(), instanceMetaData.getDatabaseName());
+ instance.getState().getCurrentState(), modeType, instance.getWorkerId(), instanceMetaData.getVersion(), instanceMetaData.getDatabaseName());
}
@Override
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutor.java
deleted file mode 100644
index 6895025a2c5..00000000000
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutor.java
+++ /dev/null
@@ -1,56 +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.proxy.backend.handler.distsql.ral.updatable.label;
-
-import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LabelComputeNodeStatement;
-import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
-import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.persist.facade.ClusterPersistServiceFacade;
-
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.Optional;
-
-/**
- * Label compute node executor.
- */
-@DistSQLExecutorClusterModeRequired
-public final class LabelComputeNodeExecutor implements DistSQLUpdateExecutor<LabelComputeNodeStatement> {
-
- @Override
- public void executeUpdate(final LabelComputeNodeStatement sqlStatement, final ContextManager contextManager) {
- String instanceId = sqlStatement.getInstanceId();
- Optional<ComputeNodeInstance> computeNodeInstance = contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry().find(instanceId);
- if (computeNodeInstance.isPresent()) {
- Collection<String> labels = new LinkedHashSet<>(sqlStatement.getLabels());
- if (!sqlStatement.isOverwrite()) {
- labels.addAll(computeNodeInstance.get().getLabels());
- }
- ClusterPersistServiceFacade clusterPersistServiceFacade = (ClusterPersistServiceFacade) contextManager.getPersistServiceFacade().getModeFacade();
- clusterPersistServiceFacade.getComputeNodeService().persistLabels(instanceId, new LinkedList<>(labels));
- }
- }
-
- @Override
- public Class<LabelComputeNodeStatement> getType() {
- return LabelComputeNodeStatement.class;
- }
-}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutor.java
deleted file mode 100644
index 091005a4bd5..00000000000
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutor.java
+++ /dev/null
@@ -1,59 +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.proxy.backend.handler.distsql.ral.updatable.label;
-
-import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.UnlabelComputeNodeStatement;
-import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
-import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.persist.facade.ClusterPersistServiceFacade;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Optional;
-
-/**
- * Unlabel compute node executor.
- */
-@DistSQLExecutorClusterModeRequired
-public final class UnlabelComputeNodeExecutor implements DistSQLUpdateExecutor<UnlabelComputeNodeStatement> {
-
- @Override
- public void executeUpdate(final UnlabelComputeNodeStatement sqlStatement, final ContextManager contextManager) {
- String instanceId = sqlStatement.getInstanceId();
- Optional<ComputeNodeInstance> computeNodeInstance = contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry().find(instanceId);
- if (computeNodeInstance.isPresent()) {
- ClusterPersistServiceFacade clusterPersistServiceFacade = (ClusterPersistServiceFacade) contextManager.getPersistServiceFacade().getModeFacade();
- Collection<String> labels = new LinkedHashSet<>(computeNodeInstance.get().getLabels());
- if (sqlStatement.getLabels().isEmpty()) {
- clusterPersistServiceFacade.getComputeNodeService().persistLabels(instanceId, Collections.emptyList());
- } else {
- labels.removeAll(sqlStatement.getLabels());
- clusterPersistServiceFacade.getComputeNodeService().persistLabels(instanceId, new ArrayList<>(labels));
- }
- }
- }
-
- @Override
- public Class<UnlabelComputeNodeStatement> getType() {
- return UnlabelComputeNodeStatement.class;
- }
-}
diff --git a/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor b/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor
index 43025d61774..6bded2ed8f2 100644
--- a/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor
+++ b/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor
@@ -15,8 +15,6 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.label.LabelComputeNodeExecutor
-org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.label.UnlabelComputeNodeExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.computenode.SetComputeNodeStateExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.imports.ImportDatabaseConfigurationExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.imports.ImportMetaDataExecutor
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
index 3f0c5c76962..418bc7b0569 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
@@ -69,7 +69,6 @@ class ProxyConfigurationLoaderTest {
YamlProxyServerConfiguration serverConfig = actual.getServerConfiguration();
assertNull(serverConfig.getMode());
assertNull(serverConfig.getAuthority());
- assertNull(serverConfig.getLabels());
assertTrue(serverConfig.getProps().isEmpty());
assertTrue(serverConfig.getRules().isEmpty());
assertTrue(actual.getDatabaseConfigurations().isEmpty());
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutorTest.java
index 4d352a1beac..fe5778a5640 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutorTest.java
@@ -49,7 +49,7 @@ class ShowComputeNodeInfoExecutorTest {
@Test
void assertGetColumnNames() {
ShowComputeNodeInfoStatement sqlStatement = mock(ShowComputeNodeInfoStatement.class);
- assertThat(executor.getColumnNames(sqlStatement), is(Arrays.asList("instance_id", "host", "port", "status", "mode_type", "worker_id", "labels", "version")));
+ assertThat(executor.getColumnNames(sqlStatement), is(Arrays.asList("instance_id", "host", "port", "status", "mode_type", "worker_id", "version")));
}
@Test
@@ -66,15 +66,13 @@ class ShowComputeNodeInfoExecutorTest {
assertThat(row.getCell(4), is("OK"));
assertThat(row.getCell(5), is("Standalone"));
assertThat(row.getCell(6), is("0"));
- assertThat(row.getCell(7), is(""));
- assertThat(row.getCell(8), is("foo_version"));
+ assertThat(row.getCell(7), is("foo_version"));
}
@Test
void assertExecuteWithJdbcInstance() {
ComputeNodeInstance computeNodeInstance = new ComputeNodeInstance(new JDBCInstanceMetaData("jdbc_instance", "10.0.0.1", "jdbc_version", "logic_db"));
computeNodeInstance.setWorkerId(5);
- computeNodeInstance.getLabels().add("blue");
ContextManager contextManager = mock(ContextManager.class);
when(contextManager.getComputeNodeInstanceContext()).thenReturn(new ComputeNodeInstanceContext(computeNodeInstance, new ModeConfiguration("Cluster", null), new EventBusContext()));
Collection<LocalDataQueryResultRow> actual = executor.getRows(mock(ShowComputeNodeInfoStatement.class), contextManager);
@@ -85,8 +83,7 @@ class ShowComputeNodeInfoExecutorTest {
assertThat(row.getCell(4), is("OK"));
assertThat(row.getCell(5), is("Cluster"));
assertThat(row.getCell(6), is("5"));
- assertThat(row.getCell(7), is("blue"));
- assertThat(row.getCell(8), is("jdbc_version"));
+ assertThat(row.getCell(7), is("jdbc_version"));
}
private ComputeNodeInstanceContext createInstanceContext() {
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
index a181e108830..d0dea9b5b6f 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
@@ -54,7 +54,7 @@ class ShowComputeNodesExecutorTest {
@Test
void assertGetColumnNames() {
assertThat(executor.getColumnNames(mock(ShowComputeNodesStatement.class)),
- is(Arrays.asList("instance_id", "instance_type", "host", "port", "status", "mode_type", "worker_id", "labels", "version", "database_name")));
+ is(Arrays.asList("instance_id", "instance_type", "host", "port", "status", "mode_type", "worker_id", "version", "database_name")));
}
@Test
@@ -76,9 +76,8 @@ class ShowComputeNodesExecutorTest {
assertThat(row.getCell(5), is("OK"));
assertThat(row.getCell(6), is("Standalone"));
assertThat(row.getCell(7), is("0"));
- assertThat(row.getCell(8), is(""));
- assertThat(row.getCell(9), is("foo_version"));
- assertThat(row.getCell(10), is(""));
+ assertThat(row.getCell(8), is("foo_version"));
+ assertThat(row.getCell(9), is(""));
}
private ComputeNodeInstanceContext createStandaloneInstanceContext() {
@@ -105,9 +104,8 @@ class ShowComputeNodesExecutorTest {
assertThat(row.getCell(5), is("OK"));
assertThat(row.getCell(6), is("Cluster"));
assertThat(row.getCell(7), is("1"));
- assertThat(row.getCell(8), is(""));
- assertThat(row.getCell(9), is("foo_version"));
- assertThat(row.getCell(10), is(""));
+ assertThat(row.getCell(8), is("foo_version"));
+ assertThat(row.getCell(9), is(""));
}
private ComputeNodeInstanceContext createClusterInstanceContext(final ContextManager contextManager) {
@@ -129,7 +127,6 @@ class ShowComputeNodesExecutorTest {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
ComputeNodeInstance computeNodeInstance = new ComputeNodeInstance(new JDBCInstanceMetaData("jdbc_instance", "192.168.0.1", "jdbc_version", "logic_db"));
computeNodeInstance.setWorkerId(2);
- computeNodeInstance.getLabels().add("prod");
ComputeNodeInstanceContext computeNodeInstanceContext = new ComputeNodeInstanceContext(computeNodeInstance, new ModeConfiguration("Cluster", mock()), new EventBusContext());
when(contextManager.getComputeNodeInstanceContext()).thenReturn(computeNodeInstanceContext);
when(contextManager.getPersistServiceFacade().getModeFacade().getComputeNodeService().loadAllInstances()).thenReturn(Collections.singleton(computeNodeInstance));
@@ -142,8 +139,7 @@ class ShowComputeNodesExecutorTest {
assertThat(row.getCell(5), is("OK"));
assertThat(row.getCell(6), is("Cluster"));
assertThat(row.getCell(7), is("2"));
- assertThat(row.getCell(8), is("prod"));
- assertThat(row.getCell(9), is("jdbc_version"));
- assertThat(row.getCell(10), is("logic_db"));
+ assertThat(row.getCell(8), is("jdbc_version"));
+ assertThat(row.getCell(9), is("logic_db"));
}
}
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutorTest.java
deleted file mode 100644
index 0822cb1dcc4..00000000000
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutorTest.java
+++ /dev/null
@@ -1,92 +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.proxy.backend.handler.distsql.ral.updatable.label;
-
-import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LabelComputeNodeStatement;
-import org.apache.shardingsphere.infra.instance.ClusterInstanceRegistry;
-import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
-import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.persist.facade.ClusterPersistServiceFacade;
-import org.apache.shardingsphere.mode.manager.cluster.persist.service.ClusterComputeNodePersistService;
-import org.apache.shardingsphere.mode.persist.PersistServiceFacade;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-class LabelComputeNodeExecutorTest {
-
- private final LabelComputeNodeExecutor executor = (LabelComputeNodeExecutor) TypedSPILoader.getService(DistSQLUpdateExecutor.class, LabelComputeNodeStatement.class);
-
- @Test
- void assertExecuteUpdateWhenInstanceAbsent() {
- ContextManager contextManager = mock(ContextManager.class);
- ComputeNodeInstanceContext instanceContext = mock(ComputeNodeInstanceContext.class);
- ClusterInstanceRegistry clusterInstanceRegistry = mock(ClusterInstanceRegistry.class);
- when(contextManager.getComputeNodeInstanceContext()).thenReturn(instanceContext);
- when(instanceContext.getClusterInstanceRegistry()).thenReturn(clusterInstanceRegistry);
- when(clusterInstanceRegistry.find("instance-id")).thenReturn(Optional.empty());
- assertDoesNotThrow(() -> executor.executeUpdate(new LabelComputeNodeStatement(true, "instance-id", Collections.singletonList("label_a")), contextManager));
- }
-
- @Test
- void assertExecuteUpdateWhenOverwriteLabels() {
- ContextManager contextManager = mock(ContextManager.class);
- ComputeNodeInstance computeNodeInstance = mock(ComputeNodeInstance.class);
- ClusterComputeNodePersistService computeNodeService = mockContextManager(contextManager, computeNodeInstance);
- ComputeNodeInstanceContext instanceContext = contextManager.getComputeNodeInstanceContext();
- when(instanceContext.getClusterInstanceRegistry().find("instance-id")).thenReturn(Optional.of(computeNodeInstance));
- executor.executeUpdate(new LabelComputeNodeStatement(true, "instance-id", Arrays.asList("label_a", "label_b")), contextManager);
- verify(computeNodeService).persistLabels("instance-id", Arrays.asList("label_a", "label_b"));
- }
-
- @Test
- void assertExecuteUpdateWhenNotOverwriteLabels() {
- ContextManager contextManager = mock(ContextManager.class);
- ComputeNodeInstance computeNodeInstance = mock(ComputeNodeInstance.class);
- when(computeNodeInstance.getLabels()).thenReturn(Collections.singletonList("origin_label"));
- ClusterComputeNodePersistService computeNodeService = mockContextManager(contextManager, computeNodeInstance);
- ComputeNodeInstanceContext instanceContext = contextManager.getComputeNodeInstanceContext();
- when(instanceContext.getClusterInstanceRegistry().find("instance-id")).thenReturn(Optional.of(computeNodeInstance));
- executor.executeUpdate(new LabelComputeNodeStatement(false, "instance-id", Collections.singletonList("new_label")), contextManager);
- verify(computeNodeService).persistLabels("instance-id", Arrays.asList("new_label", "origin_label"));
- }
-
- private ClusterComputeNodePersistService mockContextManager(final ContextManager contextManager, final ComputeNodeInstance computeNodeInstance) {
- ComputeNodeInstanceContext instanceContext = mock(ComputeNodeInstanceContext.class, RETURNS_DEEP_STUBS);
- when(instanceContext.getClusterInstanceRegistry().find("instance-id")).thenReturn(Optional.of(computeNodeInstance));
- when(contextManager.getComputeNodeInstanceContext()).thenReturn(instanceContext);
- PersistServiceFacade persistServiceFacade = mock(PersistServiceFacade.class);
- ClusterPersistServiceFacade clusterPersistServiceFacade = mock(ClusterPersistServiceFacade.class);
- ClusterComputeNodePersistService result = mock(ClusterComputeNodePersistService.class);
- when(clusterPersistServiceFacade.getComputeNodeService()).thenReturn(result);
- when(persistServiceFacade.getModeFacade()).thenReturn(clusterPersistServiceFacade);
- when(contextManager.getPersistServiceFacade()).thenReturn(persistServiceFacade);
- return result;
- }
-}
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutorTest.java
deleted file mode 100644
index 120f37f2816..00000000000
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutorTest.java
+++ /dev/null
@@ -1,95 +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.proxy.backend.handler.distsql.ral.updatable.label;
-
-import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.UnlabelComputeNodeStatement;
-import org.apache.shardingsphere.infra.instance.ClusterInstanceRegistry;
-import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
-import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.persist.facade.ClusterPersistServiceFacade;
-import org.apache.shardingsphere.mode.manager.cluster.persist.service.ClusterComputeNodePersistService;
-import org.apache.shardingsphere.mode.persist.PersistServiceFacade;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Optional;
-
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-import static org.mockito.Mockito.when;
-
-class UnlabelComputeNodeExecutorTest {
-
- private final UnlabelComputeNodeExecutor executor = (UnlabelComputeNodeExecutor) TypedSPILoader.getService(DistSQLUpdateExecutor.class, UnlabelComputeNodeStatement.class);
-
- @Test
- void assertDoNothingWhenInstanceAbsent() {
- ContextManager contextManager = mock(ContextManager.class);
- ComputeNodeInstanceContext instanceContext = mock(ComputeNodeInstanceContext.class);
- ClusterInstanceRegistry clusterInstanceRegistry = mock(ClusterInstanceRegistry.class);
- when(contextManager.getComputeNodeInstanceContext()).thenReturn(instanceContext);
- when(instanceContext.getClusterInstanceRegistry()).thenReturn(clusterInstanceRegistry);
- when(clusterInstanceRegistry.find("instance-id")).thenReturn(Optional.empty());
- PersistServiceFacade persistServiceFacade = mock(PersistServiceFacade.class);
- when(contextManager.getPersistServiceFacade()).thenReturn(persistServiceFacade);
- executor.executeUpdate(new UnlabelComputeNodeStatement("instance-id", Collections.singletonList("label_a")), contextManager);
- verifyNoInteractions(persistServiceFacade);
- }
-
- @Test
- void assertClearLabelsWhenStatementLabelsEmpty() {
- ContextManager contextManager = mock(ContextManager.class);
- ComputeNodeInstance computeNodeInstance = mock(ComputeNodeInstance.class);
- ClusterComputeNodePersistService computeNodeService = mockContextManager(contextManager, computeNodeInstance);
- ComputeNodeInstanceContext instanceContext = contextManager.getComputeNodeInstanceContext();
- when(instanceContext.getClusterInstanceRegistry().find("instance-id")).thenReturn(Optional.of(computeNodeInstance));
- executor.executeUpdate(new UnlabelComputeNodeStatement("instance-id", Collections.emptyList()), contextManager);
- verify(computeNodeService).persistLabels("instance-id", Collections.emptyList());
- }
-
- @Test
- void assertRemoveSpecifiedLabels() {
- ContextManager contextManager = mock(ContextManager.class);
- ComputeNodeInstance computeNodeInstance = mock(ComputeNodeInstance.class);
- when(computeNodeInstance.getLabels()).thenReturn(Arrays.asList("label_a", "label_b"));
- ClusterComputeNodePersistService computeNodeService = mockContextManager(contextManager, computeNodeInstance);
- ComputeNodeInstanceContext instanceContext = contextManager.getComputeNodeInstanceContext();
- when(instanceContext.getClusterInstanceRegistry().find("instance-id")).thenReturn(Optional.of(computeNodeInstance));
- executor.executeUpdate(new UnlabelComputeNodeStatement("instance-id", Collections.singletonList("label_b")), contextManager);
- verify(computeNodeService).persistLabels("instance-id", Collections.singletonList("label_a"));
- }
-
- private ClusterComputeNodePersistService mockContextManager(final ContextManager contextManager, final ComputeNodeInstance computeNodeInstance) {
- ComputeNodeInstanceContext instanceContext = mock(ComputeNodeInstanceContext.class, RETURNS_DEEP_STUBS);
- when(instanceContext.getClusterInstanceRegistry().find("instance-id")).thenReturn(Optional.of(computeNodeInstance));
- when(contextManager.getComputeNodeInstanceContext()).thenReturn(instanceContext);
- PersistServiceFacade persistServiceFacade = mock(PersistServiceFacade.class);
- ClusterPersistServiceFacade clusterPersistServiceFacade = mock(ClusterPersistServiceFacade.class);
- when(persistServiceFacade.getModeFacade()).thenReturn(clusterPersistServiceFacade);
- when(contextManager.getPersistServiceFacade()).thenReturn(persistServiceFacade);
- ClusterComputeNodePersistService result = mock(ClusterComputeNodePersistService.class);
- when(clusterPersistServiceFacade.getComputeNodeService()).thenReturn(result);
- return result;
- }
-}
diff --git a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
index 7567cc43e5e..a966ec2e974 100644
--- a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
+++ b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
@@ -59,7 +59,7 @@ public final class BootstrapInitializer {
private ContextManager createContextManager(final ProxyConfiguration proxyConfig, final ModeConfiguration modeConfig, final int port) throws SQLException {
InstanceMetaData instanceMetaData = TypedSPILoader.getService(InstanceMetaDataBuilder.class, "Proxy").build(port, "");
ContextManagerBuilderParameter param = new ContextManagerBuilderParameter(modeConfig, proxyConfig.getDatabaseConfigurations(), proxyConfig.getGlobalConfiguration().getDataSources(),
- proxyConfig.getGlobalConfiguration().getRules(), proxyConfig.getGlobalConfiguration().getProperties(), proxyConfig.getGlobalConfiguration().getLabels(), instanceMetaData);
+ proxyConfig.getGlobalConfiguration().getRules(), proxyConfig.getGlobalConfiguration().getProperties(), instanceMetaData);
return TypedSPILoader.getService(ContextManagerBuilder.class, null == modeConfig ? null : modeConfig.getType()).build(param, new EventBusContext());
}
}
diff --git a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializerTest.java b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializerTest.java
index 317cdfb90ac..fd513c3c804 100644
--- a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializerTest.java
+++ b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializerTest.java
@@ -100,7 +100,6 @@ class BootstrapInitializerTest {
assertTrue(actualParameter.getGlobalDataSources().isEmpty());
assertTrue(actualParameter.getGlobalRuleConfigs().isEmpty());
assertTrue(actualParameter.getProps().isEmpty());
- assertTrue(actualParameter.getLabels().isEmpty());
assertThat(actualParameter.getInstanceMetaData(), is(instanceMetaData));
}
@@ -128,7 +127,6 @@ class BootstrapInitializerTest {
assertTrue(actualParameter.getGlobalDataSources().isEmpty());
assertTrue(actualParameter.getGlobalRuleConfigs().isEmpty());
assertTrue(actualParameter.getProps().isEmpty());
- assertTrue(actualParameter.getLabels().isEmpty());
assertThat(actualParameter.getInstanceMetaData(), is(instanceMetaData));
}
diff --git a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_node_info.xml b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_node_info.xml
index 9171e4b2eab..156ce267612 100644
--- a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_node_info.xml
+++ b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_node_info.xml
@@ -23,8 +23,7 @@
<column name="status" />
<column name="mode_type" />
<column name="worker_id" />
- <column name="labels" />
<column name="version" ignore-assert-data="true" />
</metadata>
- <row values=" | | 3307| OK| Cluster| 0| |" />
+ <row values=" | | 3307| OK| Cluster| 0| " />
</dataset>
diff --git a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml
index 45f44d37159..6c573234222 100644
--- a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml
+++ b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml
@@ -24,9 +24,8 @@
<column name="status" />
<column name="mode_type" />
<column name="worker_id" />
- <column name="labels" />
<column name="version" ignore-assert-data="true" />
<column name="database_name" />
</metadata>
- <row values=" | PROXY| | 3307| OK| Cluster| 0| | |" />
+ <row values=" | PROXY| | 3307| OK| Cluster| 0| | " />
</dataset>
diff --git a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_node_info.xml b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_node_info.xml
index 8c7f25dc6f7..55858fe1507 100644
--- a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_node_info.xml
+++ b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_node_info.xml
@@ -23,8 +23,7 @@
<column name="status" />
<column name="mode_type" />
<column name="worker_id" />
- <column name="labels" />
<column name="version" ignore-assert-data="true" />
</metadata>
- <row values=" | | 3307| OK| Standalone| 1| |" />
+ <row values=" | | 3307| OK| Standalone| 1| " />
</dataset>
diff --git a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml
index 8176ae868d7..42668494b9e 100644
--- a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml
+++ b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml
@@ -24,9 +24,8 @@
<column name="status" />
<column name="mode_type" />
<column name="worker_id" />
- <column name="labels" />
<column name="version" ignore-assert-data="true" />
<column name="database_name" />
</metadata>
- <row values=" | PROXY| | 3307| OK| Standalone| 1| | |" />
+ <row values=" | PROXY| | 3307| OK| Standalone| 1| | " />
</dataset>
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/UpdatableRALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/UpdatableRALStatementAssert.java
index 6ec0d22baf7..1fbd4775983 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/UpdatableRALStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/UpdatableRALStatementAssert.java
@@ -22,11 +22,9 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.AlterComputeNodeStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.ImportDatabaseConfigurationStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.ImportMetaDataStatement;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LabelComputeNodeStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LockClusterStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.SetDistVariableStatement;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.UnlabelComputeNodeStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.UpdatableRALStatement;
import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingStorageUnitStatusStatement;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
@@ -34,21 +32,17 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.r
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.type.updatable.AlterReadwriteSplittingStorageUnitStatusStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.type.updatable.ImportDatabaseConfigurationStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.type.updatable.ImportMetaDataStatementAssert;
-import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.type.updatable.LabelComputeNodeStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.type.updatable.LockClusterStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.type.updatable.RefreshTableMetaDataStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.type.updatable.SetDistVariableStatementAssert;
-import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.type.updatable.UnlabelComputeNodeStatementAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterComputeNodeStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterReadwriteSplittingStorageUnitStatusStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportDatabaseConfigurationStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportMetaDataStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.LabelComputeNodeStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.LockClusterStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetaDataStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.SetDistVariableStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.UnlabelComputeNodeStatementTestCase;
/**
* Updatable RAL statement assert.
@@ -64,11 +58,7 @@ public final class UpdatableRALStatementAssert {
* @param expected expected updatable RAL statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final UpdatableRALStatement actual, final SQLParserTestCase expected) {
- if (actual instanceof LabelComputeNodeStatement) {
- LabelComputeNodeStatementAssert.assertIs(assertContext, (LabelComputeNodeStatement) actual, (LabelComputeNodeStatementTestCase) expected);
- } else if (actual instanceof UnlabelComputeNodeStatement) {
- UnlabelComputeNodeStatementAssert.assertIs(assertContext, (UnlabelComputeNodeStatement) actual, (UnlabelComputeNodeStatementTestCase) expected);
- } else if (actual instanceof AlterComputeNodeStatement) {
+ if (actual instanceof AlterComputeNodeStatement) {
AlterComputeNodeStatementAssert.assertIs(assertContext, (AlterComputeNodeStatement) actual, (AlterComputeNodeStatementTestCase) expected);
} else if (actual instanceof SetDistVariableStatement) {
SetDistVariableStatementAssert.assertIs(assertContext, (SetDistVariableStatement) actual, (SetDistVariableStatementTestCase) expected);
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/updatable/LabelComputeNodeStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/updatable/LabelComputeNodeStatementAssert.java
deleted file mode 100644
index 86719f7ce67..00000000000
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/updatable/LabelComputeNodeStatementAssert.java
+++ /dev/null
@@ -1,49 +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.test.it.sql.parser.internal.asserts.statement.ral.type.updatable;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LabelComputeNodeStatement;
-import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.LabelComputeNodeStatementTestCase;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-/**
- * Label compute node statement assert.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class LabelComputeNodeStatementAssert {
-
- /**
- * Assert label compute node statement is correct with expected parser result.
- *
- * @param assertContext assert context
- * @param actual actual label compute node statement
- * @param expected expected label compute node statement test case
- */
- public static void assertIs(final SQLCaseAssertContext assertContext, final LabelComputeNodeStatement actual, final LabelComputeNodeStatementTestCase expected) {
- if (ExistingAssert.assertIs(assertContext, actual, expected)) {
- assertThat(actual.isOverwrite(), is(expected.isOverwrite()));
- assertThat(actual.getInstanceId(), is(expected.getInstanceId()));
- }
- }
-}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/updatable/UnlabelComputeNodeStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/updatable/UnlabelComputeNodeStatementAssert.java
deleted file mode 100644
index 1b1099ef258..00000000000
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/updatable/UnlabelComputeNodeStatementAssert.java
+++ /dev/null
@@ -1,48 +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.test.it.sql.parser.internal.asserts.statement.ral.type.updatable;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.statement.type.ral.updatable.UnlabelComputeNodeStatement;
-import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.UnlabelComputeNodeStatementTestCase;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-/**
- * Unlabel compute node statement assert.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class UnlabelComputeNodeStatementAssert {
-
- /**
- * Assert unlabel instance compute node is correct with expected parser result.
- *
- * @param assertContext assert context
- * @param actual actual unlabel compute node statement
- * @param expected expected unlabel compute node statement test case
- */
- public static void assertIs(final SQLCaseAssertContext assertContext, final UnlabelComputeNodeStatement actual, final UnlabelComputeNodeStatementTestCase expected) {
- if (ExistingAssert.assertIs(assertContext, actual, expected)) {
- assertThat(actual.getInstanceId(), is(expected.getInstanceId()));
- }
- }
-}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
index 145d887a3c9..7cf51cdbfdd 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
@@ -21,62 +21,49 @@ import com.google.common.base.Preconditions;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.CommonStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.DorisRefreshStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.ShowAlterTableStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.ShowBuildIndexStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisAdminCleanTrashStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisCleanAllProfileStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisPlanReplayerPlayStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisAdminCopyTabletStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisAdminSetReplicaStatusStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisAdminSetReplicaVersionStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisAlterResourceStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisAlterSqlBlockRuleStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisAlterSystemStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisCreateSqlBlockRuleStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisBackupStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisCancelBackupStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisCancelLoadStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisCleanAllProfileStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisCreateRepositoryStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisCreateSqlBlockRuleStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisDescFunctionStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisDropRepositoryStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisSwitchStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.CreateEncryptKeyStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisAlterColocateGroupStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisAlterStoragePolicyStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisDropFunctionStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisAlterJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisDropJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisPauseJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisResumeJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisResumeSyncJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisPauseSyncJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisStopSyncJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCreateJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCancelMaterializedViewTaskStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCancelTaskStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCreateStreamingJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCreateSyncJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisAlterSqlBlockRuleStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisDropSqlBlockRuleStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisPlanReplayerPlayStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowCreateLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowResourcesStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowLoadWarningsStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowStreamLoadStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowCreateRoutineLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisStopRoutineLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowDatabaseStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowTableStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowProcStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowDataTypesStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowTrashStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowDataStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowDataTypesStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowDatabaseStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowEncryptKeysStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowFileStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowSyncJobStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowSqlBlockRuleStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowRoutineLoadTaskStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowFunctionsStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowLoadStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowLoadWarningsStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowProcStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowResourcesStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowRoutineLoadStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowRoutineLoadTaskStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowSqlBlockRuleStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowStreamLoadStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowSyncJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowTableStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowTrashStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisSwitchStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisSyncStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisUnsetVariableStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.catalog.AlterCatalogStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisAlterRoutineLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisBrokerLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisCreateRoutineLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisPauseRoutineLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisResumeRoutineLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.tcl.HiveAbortStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.show.DorisShowQueryStatsStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.mysql.MySQLCloneStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.mysql.MySQLCreateLoadableFunctionTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.mysql.MySQLDelimiterStatementTestCase;
@@ -128,21 +115,12 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.mysql.table.MySQLChecksumTableStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.mysql.table.MySQLOptimizeTableStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.mysql.table.MySQLRepairTableStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisAlterResourceStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisBackupStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisCancelBackupStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisCancelLoadStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisSyncStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisDescFunctionStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.DorisShowFunctionsStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.doris.show.DorisShowQueryStatsStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.oracle.OracleSpoolStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.dialect.postgresql.PostgreSQLResetParameterStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.standard.EmptyStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.standard.ExplainStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.standard.SetParameterStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.standard.ShowStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.DorisRefreshStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dcl.dialect.mysql.MySQLRenameUserStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dcl.dialect.mysql.MySQLSetDefaultRoleStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dcl.dialect.mysql.MySQLSetPasswordStatementTestCase;
@@ -163,8 +141,25 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dcl.standard.RevertStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dcl.standard.RevokeStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dcl.standard.SetRoleStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.CreateEncryptKeyStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.CreateFileStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropEncryptKeyStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropFileStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisAlterColocateGroupStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisAlterJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisAlterStoragePolicyStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCancelMaterializedViewTaskStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCancelTaskStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCreateJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCreateStreamingJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisCreateSyncJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisDropFunctionStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisDropJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisPauseJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisPauseSyncJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisResumeJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisResumeSyncJobStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.doris.DorisStopSyncJobStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.opengauss.OpengaussAlterDirectoryStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.oracle.OracleAlterAuditPolicyStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.dialect.oracle.OracleAlterHierarchyStatementTestCase;
@@ -315,6 +310,8 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.PreparedStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.RenameStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.TruncateStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.alter.CancelAlterTableStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.catalog.AlterCatalogStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.database.AlterDatabaseStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.database.CreateDatabaseStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.database.DropDatabaseStatementTestCase;
@@ -327,15 +324,12 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.function.DropFunctionStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.function.ReloadFunctionStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.index.AlterIndexStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.index.BuildIndexStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.index.CancelBuildIndexStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.index.CreateIndexStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.index.DropIndexStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.index.CancelBuildIndexStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.index.BuildIndexStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.alter.CancelAlterTableStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.macro.CreateMacroStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.macro.DropMacroStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.ShowBuildIndexStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dal.ShowAlterTableStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.operator.AlterOperatorStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.operator.CreateOperatorStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.operator.DropOperatorStatementTestCase;
@@ -356,7 +350,6 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.table.AlterTableStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.table.CreateTableStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.table.DropTableStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropEncryptKeyStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.table.RenameTableStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.tablespace.AlterTablespaceStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.tablespace.CreateTablespaceStatementTestCase;
@@ -372,6 +365,12 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.view.DropMaterializedViewStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.view.DropViewStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.standard.view.RefreshMatViewStmtStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisAlterRoutineLoadStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisBrokerLoadStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisCreateRoutineLoadStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisPauseRoutineLoadStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisResumeRoutineLoadStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.doris.DorisStopRoutineLoadStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.mysql.MySQLHandlerStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.mysql.MySQLImportStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dml.dialect.mysql.MySQLLoadDataStatementTestCase;
@@ -403,7 +402,6 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ExportStorageNodesStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportDatabaseConfigurationStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportMetaDataStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.LabelComputeNodeStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.PrepareDistSQLStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetaDataStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.SetDistVariableStatementTestCase;
@@ -415,7 +413,6 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowMigrationListStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowStatusFromReadwriteSplittingRulesStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTableMetaDataStatementTestCase;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.UnlabelComputeNodeStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.cdc.DropStreamingStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.cdc.ShowStreamingListStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.cdc.ShowStreamingRuleStatementTestCase;
@@ -515,6 +512,7 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.PreviewStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.tcl.BeginTransactionStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.tcl.CommitStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.tcl.HiveAbortStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.tcl.LockStatementTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.tcl.PrepareTransactionTestCase;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.tcl.ReleaseSavepointStatementTestCase;
@@ -1601,12 +1599,6 @@ public final class RootSQLParserTestCases {
@XmlElement(name = "alter-xa-transaction-rule")
private final List<AlterXATransactionRuleStatementTestCase> alterXATransactionRuleTestCases = new LinkedList<>();
- @XmlElement(name = "label-compute-node")
- private final List<LabelComputeNodeStatementTestCase> labelTestCases = new LinkedList<>();
-
- @XmlElement(name = "unlabel-compute-node")
- private final List<UnlabelComputeNodeStatementTestCase> unlabelTestCases = new LinkedList<>();
-
@XmlElement(name = "alter-compute-node")
private final List<AlterComputeNodeStatementTestCase> alterInstanceTestCases = new LinkedList<>();
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/LabelComputeNodeStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/LabelComputeNodeStatementTestCase.java
deleted file mode 100644
index 87e51f452e1..00000000000
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/LabelComputeNodeStatementTestCase.java
+++ /dev/null
@@ -1,43 +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.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import java.util.Collection;
-
-/**
- * Label compute node statement test case.
- */
-@Getter
-@Setter
-public final class LabelComputeNodeStatementTestCase extends SQLParserTestCase {
-
- @XmlAttribute
- private boolean overwrite;
-
- @XmlAttribute(name = "instance-id")
- private String instanceId;
-
- @XmlElement(name = "label")
- private Collection<String> labels;
-}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/UnlabelComputeNodeStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/UnlabelComputeNodeStatementTestCase.java
deleted file mode 100644
index 5abcc664e5c..00000000000
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/UnlabelComputeNodeStatementTestCase.java
+++ /dev/null
@@ -1,40 +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.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import java.util.Collection;
-
-/**
- * Unlabel compute node statement test case.
- */
-@Getter
-@Setter
-public final class UnlabelComputeNodeStatementTestCase extends SQLParserTestCase {
-
- @XmlAttribute(name = "instance-id")
- private String instanceId;
-
- @XmlElement(name = "label")
- private Collection<String> labels;
-}
diff --git a/test/it/parser/src/main/resources/case/ral/updatable.xml b/test/it/parser/src/main/resources/case/ral/updatable.xml
index 9dd3adc6ff4..c68574bc27e 100644
--- a/test/it/parser/src/main/resources/case/ral/updatable.xml
+++ b/test/it/parser/src/main/resources/case/ral/updatable.xml
@@ -75,20 +75,6 @@
<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-compute-node sql-case-id="label-compute-node" instance-id="instance_label" overwrite="false">
- <label>OLAP_1</label>
- <label>OLAP_2</label>
- </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-compute-node>
- <unlabel-compute-node sql-case-id="unlabel-compute-node" instance-id="instance_unlabel">
- <label>OLAP_1</label>
- </unlabel-compute-node>
- <unlabel-compute-node sql-case-id="unlabel-compute-node-without-label" instance-id="instance_unlabel_2">
- </unlabel-compute-node>
-
<import-database-config sql-case-id="import-database-config">
<file-path>/yaml/database-sharding.yaml</file-path>
</import-database-config>
diff --git a/test/it/parser/src/main/resources/sql/supported/ral/updatable.xml b/test/it/parser/src/main/resources/sql/supported/ral/updatable.xml
index 30a4cf6d2e9..86d8eb3b1e3 100644
--- a/test/it/parser/src/main/resources/sql/supported/ral/updatable.xml
+++ b/test/it/parser/src/main/resources/sql/supported/ral/updatable.xml
@@ -40,11 +40,6 @@
<sql-case id="alter-compute-node-xa-recovery-nodes" value="ALTER COMPUTE NODE instance_xa_recovery SET XA_RECOVERY_NODES='instance_1'" db-types="ShardingSphere" />
<sql-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'" db-types="ShardingSphere" />
- <sql-case id="label-compute-node" value="LABEL COMPUTE NODE instance_label WITH OLAP_1,OLAP_2" db-types="ShardingSphere" />
- <sql-case id="relabel-compute-node" value="RELABEL COMPUTE NODE instance_relabel WITH OLAP_1,OLAP_2" db-types="ShardingSphere" />
- <sql-case id="unlabel-compute-node" value="UNLABEL COMPUTE NODE instance_unlabel WITH OLAP_1" db-types="ShardingSphere" />
- <sql-case id="unlabel-compute-node-without-label" value="UNLABEL COMPUTE NODE instance_unlabel_2" db-types="ShardingSphere" />
-
<sql-case id="import-database-config" value="IMPORT DATABASE CONFIGURATION FROM FILE '/yaml/database-sharding.yaml'" db-types="ShardingSphere" />
<sql-case id="import-metadata" value="IMPORT METADATA FROM FILE '/json/exported-metadata.json'" db-types="ShardingSphere" />