[Feature]Support add/drop field for struct column(part3)

fe/fe-core/src/main/java/com/starrocks/catalog/Column.java

@@ -228,6 +228,15 @@ public Column(Column column) {
  Preconditions.checkArgument(this.type.isComplexType() ||
  this.type.getPrimitiveType() != PrimitiveType.INVALID_TYPE);
  this.uniqueId = column.getUniqueId();
+ this.generatedColumnExpr = column.generatedColumnExpr();
+ }
+
+ public Column deepCopy() {
+ Column col = new Column(this);
+ col.setIsAutoIncrement(this.isAutoIncrement);
+ Type newType = type.clone();
+ col.setType(newType);
+ return col;
  }
 
  public ColumnDef toColumnDef() {

fe/fe-core/src/main/java/com/starrocks/catalog/StructType.java

@@ -48,9 +48,9 @@ public class StructType extends Type {
 
  private static final Logger LOG = LogManager.getLogger(StructType.class);
 
- private final HashMap<String, StructField> fieldMap = Maps.newHashMap();
+ private HashMap<String, StructField> fieldMap = Maps.newHashMap();
  @SerializedName(value = "fields")
- private final ArrayList<StructField> fields;
+ private ArrayList<StructField> fields;
 
  @SerializedName(value = "named")
  private final boolean isNamed;
@@ -180,6 +180,27 @@ public StructField getField(int pos) {
  return fields.get(pos);
  }
 
+ public void updateFields(List<StructField> structFields) {
+ Preconditions.checkNotNull(structFields);
+ Preconditions.checkArgument(structFields.size() > 0);
+ fields.clear();
+ fieldMap.clear();
+ for (StructField field : structFields) {
+ LOG.info("field name " + field.getName());
+ String lowerFieldName = field.getName().toLowerCase();
+ if (fieldMap.containsKey(lowerFieldName)) {
+ throw new SemanticException("struct contains duplicate subfield name: " + lowerFieldName);
+ } else {
+ field.setPosition(fields.size());
+ fields.add(field);
+ // Store lowercase field name in fieldMap
+ fieldMap.put(lowerFieldName, field);
+ }
+ }
+ selectedFields = new Boolean[fields.size()];
+ Arrays.fill(selectedFields, false);
+ }
+
  @Override
  public void setSelectedField(ComplexTypeAccessPath accessPath, boolean needSetChildren) {
  if (accessPath.getAccessPathType() == ComplexTypeAccessPathType.ALL_SUBFIELDS) {

fe/fe-core/src/main/java/com/starrocks/persist/EditLog.java

@@ -1139,7 +1139,7 @@ public void loadJournal(GlobalStateMgr globalStateMgr, JournalEntity journal)
  }
  case OperationType.OP_MODIFY_TABLE_ADD_OR_DROP_COLUMNS: {
  final TableAddOrDropColumnsInfo info = (TableAddOrDropColumnsInfo) journal.getData();
- globalStateMgr.getSchemaChangeHandler().replayModifyTableAddOrDropColumns(info);
+ globalStateMgr.getSchemaChangeHandler().replayModifyTableAddOrDrop(info);
  break;
  }
  case OperationType.OP_SET_DEFAULT_STORAGE_VOLUME: {
@@ -1968,7 +1968,7 @@ private void logJsonObject(short op, Object obj) {
  logEdit(op, out -> Text.writeString(out, GsonUtils.GSON.toJson(obj)));
  }
 
- public void logModifyTableAddOrDropColumns(TableAddOrDropColumnsInfo info) {
+ public void logModifyTableAddOrDrop(TableAddOrDropColumnsInfo info) {
  logEdit(OperationType.OP_MODIFY_TABLE_ADD_OR_DROP_COLUMNS, info);
  }
 

fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AlterTableClauseAnalyzer.java

@@ -746,7 +746,7 @@ public Void visitDropFieldClause(DropFieldClause clause, ConnectContext context)
  }
 
  Column baseColumn = ((OlapTable) table).getBaseColumn(columnName);
- StructFieldDesc fieldDesc = new StructFieldDesc(clause.getFieldName(), clause.getNestedFieldName(), null, null);
+ StructFieldDesc fieldDesc = new StructFieldDesc(clause.getFieldName(), clause.getNestedParentFieldNames(), null, null);
  try {
  fieldDesc.analyze(baseColumn, true);
  } catch (AnalysisException e) {

fe/fe-core/src/main/java/com/starrocks/sql/ast/AddFieldClause.java

@@ -15,9 +15,12 @@
 package com.starrocks.sql.ast;
 
 import com.starrocks.alter.AlterOpType;
+import com.starrocks.analysis.ColumnPosition;
+import com.starrocks.catalog.Type;
 import com.starrocks.sql.ast.StructFieldDesc;
 import com.starrocks.sql.parser.NodePosition;
 
+import java.util.List;
 import java.util.Map;
 
 // clause which is used to add one field to
@@ -33,6 +36,22 @@ public StructFieldDesc getFieldDesc() {
  return fieldDesc;
  }
 
+ public List<String> getNestedParentFieldNames() {
+ return fieldDesc.getNestedParentFieldNames();
+ }
+
+ public String getFieldName() {
+ return fieldDesc.getFieldName();
+ }
+
+ public Type getType() {
+ return fieldDesc.getType();
+ }
+
+ public ColumnPosition getFieldPos() {
+ return fieldDesc.getFieldPos();
+ }
+
  public AddFieldClause(String colName, StructFieldDesc fieldDesc, Map<String, String> properties) {
  super(AlterOpType.SCHEMA_CHANGE, null, properties, NodePosition.ZERO);
  this.colName = colName;

fe/fe-core/src/main/java/com/starrocks/sql/ast/DropFieldClause.java

@@ -24,7 +24,7 @@
 public class DropFieldClause extends AlterTableColumnClause {
  private final String colName;
  private final String fieldName;
- private final List<String> nestedFieldName;
+ private final List<String> nestedParentFieldNames;
 
  public String getColName() {
  return colName;
@@ -34,16 +34,16 @@ public String getFieldName() {
  return fieldName;
  }
 
- public List<String> getNestedFieldName() {
- return nestedFieldName;
+ public List<String> getNestedParentFieldNames() {
+ return nestedParentFieldNames;
  }
 
- public DropFieldClause(String colName, String fieldName, List<String> nestedFieldName, 
+ public DropFieldClause(String colName, String fieldName, List<String> nestedParentFieldNames, 
  Map<String, String> properties) {
  super(AlterOpType.SCHEMA_CHANGE, null, properties, NodePosition.ZERO);
  this.colName = colName;
  this.fieldName = fieldName;
- this.nestedFieldName = nestedFieldName;
+ this.nestedParentFieldNames = nestedParentFieldNames;
  }
 
  @Override

fe/fe-core/src/main/java/com/starrocks/sql/ast/StructFieldDesc.java

@@ -95,6 +95,22 @@ private Type getFieldType(Type type, String fieldName) {
  return null;
  }
 
+ public List<String> getNestedParentFieldNames() {
+ return nestedParentFieldNames;
+ }
+
+ public String getFieldName() {
+ return fieldName;
+ }
+
+ public Type getType() {
+ return typeDef.getType();
+ }
+
+ public ColumnPosition getFieldPos() {
+ return fieldPos;
+ }
+
  public void analyze(Column baseCol, boolean dropField) throws AnalysisException {
  if (baseCol == null) {
  throw new AnalysisException(String.format("Analyze add/drop field failed, modify column is not exist"));

fe/fe-core/src/test/java/com/starrocks/alter/SchemaChangeHandlerTest.java

@@ -375,14 +375,14 @@ public void testModifyTableAddOrDropColumns() {
 
  Assertions.assertDoesNotThrow(
  () -> ((SchemaChangeHandler) GlobalStateMgr.getCurrentState().getAlterJobMgr().getSchemaChangeHandler())
- .modifyTableAddOrDropColumns(db, tbl, indexSchemaMap, newIndexes, 100, 100,
+ .modifyTableAddOrDrop(db, tbl, indexSchemaMap, newIndexes, 100, 100,
  indexToNewSchemaId, false));
  jobSize++;
  Assertions.assertEquals(jobSize, alterJobs.size());
 
  Assertions.assertDoesNotThrow(
  () -> ((SchemaChangeHandler) GlobalStateMgr.getCurrentState().getAlterJobMgr().getSchemaChangeHandler())
- .modifyTableAddOrDropColumns(db, tbl, indexSchemaMap, newIndexes, 101, 101,
+ .modifyTableAddOrDrop(db, tbl, indexSchemaMap, newIndexes, 101, 101,
  indexToNewSchemaId, true));
  jobSize++;
  Assertions.assertEquals(jobSize, alterJobs.size());
@@ -391,7 +391,7 @@ public void testModifyTableAddOrDropColumns() {
  tbl.setState(OlapTableState.ROLLUP);
  Assertions.assertThrows(DdlException.class,
  () -> ((SchemaChangeHandler) GlobalStateMgr.getCurrentState().getAlterJobMgr().getSchemaChangeHandler())
- .modifyTableAddOrDropColumns(db, tbl, indexSchemaMap, newIndexes, 102, 102, indexToNewSchemaId,
+ .modifyTableAddOrDrop(db, tbl, indexSchemaMap, newIndexes, 102, 102, indexToNewSchemaId,
  false));
  tbl.setState(beforeState);
  }