(iotdb) branch master updated: [remove datanode] Delete the SQL of removing multiple datanodes at the same time #14862

[tanxinyu]

This is an automated email from the ASF dual-hosted git repository.

tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new b4cec03c26f [remove datanode] Delete the SQL of removing multiple 
datanodes at the same time #14862
b4cec03c26f is described below

commit b4cec03c26ff741e37f2c588163db7cb23fa769d
Author: Xiangpeng Hu <65238551+hxpser...@users.noreply.github.com>
AuthorDate: Tue Feb 18 12:57:48 2025 +0800

    [remove datanode] Delete the SQL of removing multiple datanodes at the same 
time #14862
---
 .../main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4   |  2 +-
 .../apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java    | 10 +++-------
 .../db/queryengine/plan/relational/sql/parser/AstBuilder.java  |  5 +----
 .../apache/iotdb/db/relational/grammar/sql/RelationalSql.g4    |  2 +-
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git 
a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 
b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
index 1b96d651c3f..d7bc94cd50a 100644
--- 
a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
+++ 
b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
@@ -552,7 +552,7 @@ verifyConnection
 
 // ---- Remove DataNode
 removeDataNode
-    : REMOVE DATANODE dataNodeId=INTEGER_LITERAL (COMMA 
dataNodeId=INTEGER_LITERAL)*
+    : REMOVE DATANODE dataNodeId=INTEGER_LITERAL
     ;
 
 // ---- Remove ConfigNode
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
index b5d3a5ec62a..b3d896d8b98 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
@@ -239,7 +239,6 @@ import org.apache.iotdb.trigger.api.enums.TriggerType;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.BaseEncoding;
 import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tsfile.common.conf.TSFileDescriptor;
@@ -4226,12 +4225,9 @@ public class ASTVisitor extends 
IoTDBSqlParserBaseVisitor<Statement> {
 
   @Override
   public Statement visitRemoveDataNode(IoTDBSqlParser.RemoveDataNodeContext 
ctx) {
-    List<Integer> dataNodeIDs =
-        ctx.INTEGER_LITERAL().stream()
-            .map(ParseTree::getText)
-            .map(Integer::parseInt)
-            .collect(Collectors.toList());
-    return new RemoveDataNodeStatement(dataNodeIDs);
+    List<Integer> nodeIds =
+        
Collections.singletonList(Integer.parseInt(ctx.INTEGER_LITERAL().getText()));
+    return new RemoveDataNodeStatement(nodeIds);
   }
 
   @Override
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
index d56293b4c80..ecc21d0c7ee 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
@@ -1185,10 +1185,7 @@ public class AstBuilder extends 
RelationalSqlBaseVisitor<Node> {
   @Override
   public Node 
visitRemoveDataNodeStatement(RelationalSqlParser.RemoveDataNodeStatementContext 
ctx) {
     List<Integer> nodeIds =
-        ctx.INTEGER_VALUE().stream()
-            .map(TerminalNode::getText)
-            .map(Integer::valueOf)
-            .collect(Collectors.toList());
+        
Collections.singletonList(Integer.parseInt(ctx.INTEGER_VALUE().getText()));
     return new RemoveDataNode(nodeIds);
   }
 
diff --git 
a/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4
 
b/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4
index 50d43cece17..3ddc754e87a 100644
--- 
a/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4
+++ 
b/iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/RelationalSql.g4
@@ -497,7 +497,7 @@ removeRegionStatement
     ;
 
 removeDataNodeStatement
-    : REMOVE DATANODE dataNodeId=INTEGER_VALUE (',' dataNodeId=INTEGER_VALUE)*
+    : REMOVE DATANODE dataNodeId=INTEGER_VALUE
     ;
 
 removeConfigNodeStatement