From 406a79f08ceaa9b97d270d28d4ab210303fa4715 Mon Sep 17 00:00:00 2001
From: Liao Lanyu <48237151+Plutooooooo@users.noreply.github.com>
Date: Wed, 18 May 2022 23:56:11 +0800
Subject: [PATCH] [IOTDB-3101] definition of attributekey and attributevalue
 (#5888)

---
 .../antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4   | 2 +-
 .../org/apache/iotdb/db/integration/IoTDBTagAlterIT.java  | 4 ++--
 .../org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java   | 8 +++-----
 .../java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java  | 8 +++-----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
index d1b1565ceca8..f513a4da7a7f 100644
--- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
+++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
@@ -161,7 +161,7 @@ alterTimeseries
 alterClause
     : RENAME beforeName=attributeKey TO currentName=attributeKey
     | SET attributePair (COMMA attributePair)*
-    | DROP STRING_LITERAL (COMMA STRING_LITERAL)*
+    | DROP attributeKey (COMMA attributeKey)*
     | ADD TAGS attributePair (COMMA attributePair)*
     | ADD ATTRIBUTES attributePair (COMMA attributePair)*
     | UPSERT aliasClause? tagClause? attributeClause?
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTagAlterIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTagAlterIT.java
index 0132ea28aba3..4bee6635c829 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTagAlterIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTagAlterIT.java
@@ -98,7 +98,7 @@ public void renameTest() {
       assertEquals(ret1.length, count);
 
       try {
-        statement.execute("ALTER timeseries root.turbine.d1.s1 RENAME 'tag3' TO 'tagNew3'");
+        statement.execute("ALTER timeseries root.turbine.d1.s1 RENAME tag3 TO 'tagNew3'");
         fail();
       } catch (Exception e) {
         assertTrue(
@@ -290,7 +290,7 @@ public void dropTest() {
       }
       assertEquals(ret.length, count);
 
-      statement.execute("ALTER timeseries root.turbine.d1.s1 DROP 'attr1','tag1'");
+      statement.execute("ALTER timeseries root.turbine.d1.s1 DROP attr1,'tag1'");
       hasResult = statement.execute("show timeseries");
       assertTrue(hasResult);
       resultSet = statement.getResultSet();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
index 8f9db1267fe5..8d826f98f2d3 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
@@ -309,9 +309,7 @@ private void parseAlterClause(
     // rename
     if (ctx.RENAME() != null) {
       alterTimeSeriesStatement.setAlterType(AlterTimeSeriesStatement.AlterType.RENAME);
-      alterMap.put(
-          parseStringLiteral(ctx.beforeName.getText()),
-          parseStringLiteral(ctx.currentName.getText()));
+      alterMap.put(parseAttributeKey(ctx.beforeName), parseAttributeKey(ctx.currentName));
     } else if (ctx.SET() != null) {
       // set
       alterTimeSeriesStatement.setAlterType(AlterTimeSeriesStatement.AlterType.SET);
@@ -319,8 +317,8 @@ private void parseAlterClause(
     } else if (ctx.DROP() != null) {
       // drop
       alterTimeSeriesStatement.setAlterType(AlterTimeSeriesStatement.AlterType.DROP);
-      for (int i = 0; i < ctx.STRING_LITERAL().size(); i++) {
-        alterMap.put(parseStringLiteral(ctx.STRING_LITERAL(i).getText()), null);
+      for (int i = 0; i < ctx.attributeKey().size(); i++) {
+        alterMap.put(parseAttributeKey(ctx.attributeKey().get(i)), null);
       }
     } else if (ctx.TAGS() != null) {
       // add tag
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java b/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java
index da67a66f7ed4..a81179f435aa 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java
@@ -655,9 +655,7 @@ private void parseAlterClause(
     // rename
     if (ctx.RENAME() != null) {
       alterTimeSeriesOperator.setAlterType(AlterType.RENAME);
-      alterMap.put(
-          parseStringLiteral(ctx.beforeName.getText()),
-          parseStringLiteral(ctx.currentName.getText()));
+      alterMap.put(parseAttributeKey(ctx.beforeName), parseAttributeKey(ctx.currentName));
     } else if (ctx.SET() != null) {
       // set
       alterTimeSeriesOperator.setAlterType(AlterType.SET);
@@ -665,8 +663,8 @@ private void parseAlterClause(
     } else if (ctx.DROP() != null) {
       // drop
       alterTimeSeriesOperator.setAlterType(AlterType.DROP);
-      for (int i = 0; i < ctx.STRING_LITERAL().size(); i++) {
-        alterMap.put(parseStringLiteral(ctx.STRING_LITERAL(i).getText()), null);
+      for (int i = 0; i < ctx.attributeKey().size(); i++) {
+        alterMap.put(parseAttributeKey(ctx.attributeKey().get(i)), null);
       }
     } else if (ctx.TAGS() != null) {
       // add tag