commit 3c52267a7b18b57a4c889e1f1264334fe5bb786e
author Boris <geniuspig@apache.org> Fri Jan 15 14:00:29 2021 +0800
committer GitHub <noreply@github.com> Fri Jan 15 14:00:29 2021 +0800
tree d14775716b980e1a5e67a11c2ecec375994bd256
parent 7975dbd76b642f09f9e08afb038ff1294521ef0d

support only left bracket (#2491)

antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4

diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4
index aa5e874..c902a67 100644
--- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4
+++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4
@@ -418,16 +418,14 @@
     ;
 
 nodeName
-    : ID
+    : ID STAR?
     | STAR
     | DOUBLE_QUOTE_STRING_LITERAL
-    | ID STAR
     | DURATION
     | encoding
     | dataType
     | dateExpression
-    | MINUS? EXPONENT
-    | MINUS? INT
+    | MINUS? (EXPONENT | INT)
     | booleanClause
     | CREATE
     | INSERT
@@ -523,7 +521,7 @@
     | SCHEMA
     | TRACING
     | OFF
-    | (ID | OPERATOR_IN)? LS_BRACKET ID? RS_BRACKET ID?
+    | (ID | OPERATOR_IN)? LS_BRACKET ID? RS_BRACKET? ID?
     | compressor
     | GLOBAL
     | PARTITION
@@ -538,8 +536,7 @@
     | encoding
     | dataType
     | dateExpression
-    | MINUS? EXPONENT
-    | MINUS? INT
+    | MINUS? ( EXPONENT | INT)
     | booleanClause
     | CREATE
     | INSERT
@@ -635,7 +632,7 @@
     | SCHEMA
     | TRACING
     | OFF
-    | (ID | OPERATOR_IN)? LS_BRACKET ID? RS_BRACKET ID?
+    | (ID | OPERATOR_IN)? LS_BRACKET ID? RS_BRACKET? ID?
     | compressor
     | GLOBAL
     | PARTITION

server/src/test/java/org/apache/iotdb/db/qp/physical/PhysicalPlanTest.java

diff --git a/server/src/test/java/org/apache/iotdb/db/qp/physical/PhysicalPlanTest.java b/server/src/test/java/org/apache/iotdb/db/qp/physical/PhysicalPlanTest.java
index 4dd9297..3e17d00 100644
--- a/server/src/test/java/org/apache/iotdb/db/qp/physical/PhysicalPlanTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/qp/physical/PhysicalPlanTest.java
@@ -1041,7 +1041,7 @@
 
   @Test
   public void testSpecialCharacters() throws QueryProcessException {
-    String sqlStr1 = "create timeseries root.3e-3.-1.1/2.SNAPPY.RLE.81+12.+2.s/io.in[jack].desc with "
+    String sqlStr1 = "create timeseries root.3e-3.-1.1/2.SNAPPY.RLE.81+12.+2.s/io.in[jack].hel[jjj.desc with "
         + "datatype=FLOAT, encoding=RLE, compression=SNAPPY tags(tag1=v1, tag2=v2)"
         + " attributes(attr1=v1, attr2=v2)";
     PhysicalPlan plan1 = processor.parseSQLToPhysicalPlan(sqlStr1);