update

Signed-off-by: zhangqiang <[email protected]>
StarRocks · Jun 13, 2024 · 093955b · 093955b
1 parent f9945bb
commit 093955b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AlterTableClauseVisitor.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AlterTableClauseVisitor.java
@@ -61,8 +61,8 @@
 import com.starrocks.sql.ast.CreateIndexClause;
 import com.starrocks.sql.ast.DistributionDesc;
 import com.starrocks.sql.ast.DropColumnClause;
-import com.starrocks.sql.ast.DropPartitionClause;
 import com.starrocks.sql.ast.DropFieldClause;
+import com.starrocks.sql.ast.DropPartitionClause;
 import com.starrocks.sql.ast.DropRollupClause;
 import com.starrocks.sql.ast.HashDistributionDesc;
 import com.starrocks.sql.ast.IndexDef;

diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/ast/StructFieldDesc.java b/fe/fe-core/src/main/java/com/starrocks/sql/ast/StructFieldDesc.java
@@ -97,7 +97,7 @@ private Type getFieldType(Type type, String fieldName) {
 
  public void analyze(Column baseCol, boolean dropField) throws AnalysisException {
  if (baseCol == null) {
- throw new AnalysisException(String.format("Analyze add/drop field failed, modifyc column is not exist"));
+ throw new AnalysisException(String.format("Analyze add/drop field failed, modify column is not exist"));
  }
 
  Type targetFieldType = baseCol.getType();

diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/parser/AstBuilder.java b/fe/fe-core/src/main/java/com/starrocks/sql/parser/AstBuilder.java
@@ -4083,7 +4083,6 @@ public ParseNode visitDropColumnClause(StarRocksParser.DropColumnClauseContext c
  @Override
  public ParseNode visitAddFieldClause(StarRocksParser.AddFieldClauseContext context) {
  String columnName = getIdentifierName(context.identifier(0));
- String rollupName = null;
  StarRocksParser.SubfieldDescContext subFieldDescContext = context.subfieldDesc();
  List<String> parts = new ArrayList<>();
  if (subFieldDescContext.nestedFieldName() != null) {
@@ -4107,7 +4106,7 @@ public ParseNode visitAddFieldClause(StarRocksParser.AddFieldClauseContext conte
  throw new ParsingException("add field clause name is null");
  }
  StructFieldDesc fieldDesc = new StructFieldDesc(fieldName, parts, typeDef, fieldPosition);
- return new AddFieldClause(columnName, fieldDesc, rollupName, getProperties(context.properties()));
+ return new AddFieldClause(columnName, fieldDesc, null, getProperties(context.properties()));
  }
 
  @Override
@@ -7418,8 +7417,8 @@ private List<String> getFieldName(StarRocksParser.NestedFieldNameContext context
  for (ParseTree c : context.children) {
  if (c instanceof StarRocksParser.SubfieldNameContext) {
  StarRocksParser.SubfieldNameContext subfieldNameContext = (StarRocksParser.SubfieldNameContext) c;
- if (subfieldNameContext.ARRAR_ELEMENT() != null) {
- TerminalNode t = subfieldNameContext.ARRAR_ELEMENT();
+ if (subfieldNameContext.ARRAY_ELEMENT() != null) {
+ TerminalNode t = subfieldNameContext.ARRAY_ELEMENT();
  parts.add(t.getText());
  } else {
  StarRocksParser.IdentifierContext identifierContext = subfieldNameContext.identifier();

diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/parser/StarRocks.g4 b/fe/fe-core/src/main/java/com/starrocks/sql/parser/StarRocks.g4
@@ -1009,7 +1009,7 @@ compactionClause
  ;
 
 subfieldName
- : identifier | '[*]'
+ : identifier | ARRAY_ELEMENT
  ;
 
 nestedFieldName
@@ -2694,4 +2694,5 @@ nonReserved
  | YEAR
  | DOTDOTDOT | NGRAMBF
  | FIELD
- ;
+ | ARRAY_ELEMENT
+ ;
diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/parser/StarRocksLex.g4 b/fe/fe-core/src/main/java/com/starrocks/sql/parser/StarRocksLex.g4
@@ -487,7 +487,7 @@ LTE : '<=';
 GT : '>';
 GTE : '>=';
 EQ_FOR_NULL: '<=>';
-ARRAR_ELEMENT: '[*]';
+ARRAY_ELEMENT: '[*]';
 
 PLUS_SYMBOL: '+';
 MINUS_SYMBOL: '-';