@@ -67,6 +67,8 @@ public class ColumnDefinition {
6767 private int clusterKeyId = -1 ;
6868 private Optional <GeneratedColumnDesc > generatedColumnDesc = Optional .empty ();
6969 private Set <String > generatedColumnsThatReferToThis = new HashSet <>();
70+ // if add hidden column, must set enableAddHiddenColumn true
71+ private boolean enableAddHiddenColumn = false ;
7072
7173 public ColumnDefinition (String name , DataType type , boolean isKey , AggregateType aggType , boolean isNullable ,
7274 Optional <DefaultValue > defaultValue , String comment ) {
@@ -286,7 +288,14 @@ private void checkKeyColumnType(boolean isOlap) {
286288 public void validate (boolean isOlap , Set <String > keysSet , Set <String > clusterKeySet , boolean isEnableMergeOnWrite ,
287289 KeysType keysType ) {
288290 try {
289- FeNameFormat .checkColumnName (name );
291+ // if enableAddHiddenColumn is true, can add hidden column.
292+ // So does not check if the column name starts with __DORIS_
293+ if (enableAddHiddenColumn ) {
294+ FeNameFormat .checkColumnNameBypassHiddenColumn (name );
295+ } else {
296+ FeNameFormat .checkColumnName (name );
297+ }
298+
290299 FeNameFormat .checkColumnCommentLength (comment );
291300 } catch (Exception e ) {
292301 throw new AnalysisException (e .getMessage (), e );
@@ -523,43 +532,90 @@ public Column translateToCatalogStyleForSchemaChange() {
523532 return column ;
524533 }
525534
526- // hidden column
535+ /**
536+ * add hidden column
537+ */
527538 public static ColumnDefinition newDeleteSignColumnDefinition () {
528- return new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , null , false ,
529- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris delete flag hidden column" , false );
539+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , null ,
540+ false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
541+ "doris delete flag hidden column" , false );
542+ columnDefinition .setEnableAddHiddenColumn (true );
543+
544+ return columnDefinition ;
530545 }
531546
547+ /**
548+ * add hidden column
549+ */
532550 public static ColumnDefinition newDeleteSignColumnDefinition (AggregateType aggregateType ) {
533- return new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , aggregateType , false ,
534- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris delete flag hidden column" , false );
551+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false ,
552+ aggregateType , false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
553+ "doris delete flag hidden column" , false );
554+ columnDefinition .setEnableAddHiddenColumn (true );
555+
556+ return columnDefinition ;
535557 }
536558
559+ /**
560+ * add hidden column
561+ */
537562 public static ColumnDefinition newSequenceColumnDefinition (DataType type ) {
538- return new ColumnDefinition (Column .SEQUENCE_COL , type , false , null , true ,
539- Optional .empty (), "sequence column hidden column" , false );
563+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SEQUENCE_COL , type , false , null ,
564+ true , Optional .empty (),
565+ "sequence column hidden column" , false );
566+ columnDefinition .setEnableAddHiddenColumn (true );
567+
568+ return columnDefinition ;
540569 }
541570
571+ /**
572+ * add hidden column
573+ */
542574 public static ColumnDefinition newSequenceColumnDefinition (DataType type , AggregateType aggregateType ) {
543- return new ColumnDefinition (Column .SEQUENCE_COL , type , false , aggregateType , true ,
544- Optional .empty (), "sequence column hidden column" , false );
575+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SEQUENCE_COL , type , false , aggregateType ,
576+ true , Optional .empty (),
577+ "sequence column hidden column" , false );
578+ columnDefinition .setEnableAddHiddenColumn (true );
579+
580+ return columnDefinition ;
545581 }
546582
583+ /**
584+ * add hidden column
585+ */
547586 public static ColumnDefinition newRowStoreColumnDefinition (AggregateType aggregateType ) {
548- return new ColumnDefinition (Column .ROW_STORE_COL , StringType .INSTANCE , false , aggregateType , false ,
549- Optional .of (new DefaultValue ("" )), "doris row store hidden column" , false );
587+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .ROW_STORE_COL , StringType .INSTANCE , false ,
588+ aggregateType , false , Optional .of (new DefaultValue ("" )),
589+ "doris row store hidden column" , false );
590+ columnDefinition .setEnableAddHiddenColumn (true );
591+
592+ return columnDefinition ;
550593 }
551594
595+ /**
596+ * add hidden column
597+ */
552598 public static ColumnDefinition newVersionColumnDefinition (AggregateType aggregateType ) {
553- return new ColumnDefinition (Column .VERSION_COL , BigIntType .INSTANCE , false , aggregateType , false ,
554- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris version hidden column" , false );
599+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .VERSION_COL , BigIntType .INSTANCE , false ,
600+ aggregateType , false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
601+ "doris version hidden column" , false );
602+ columnDefinition .setEnableAddHiddenColumn (true );
603+
604+ return columnDefinition ;
555605 }
556606
557- // used in CreateTableInfo.validate(), specify the default value as DefaultValue.NULL_DEFAULT_VALUE
558- // becasue ColumnDefinition.validate() will check that bitmap type column don't set default value
559- // and then set the default value of that column to bitmap_empty()
607+ /**
608+ * used in CreateTableInfo.validate(), specify the default value as DefaultValue.NULL_DEFAULT_VALUE
609+ * becasue ColumnDefinition.validate() will check that bitmap type column don't set default value
610+ * and then set the default value of that column to bitmap_empty()
611+ */
560612 public static ColumnDefinition newSkipBitmapColumnDef (AggregateType aggregateType ) {
561- return new ColumnDefinition (Column .SKIP_BITMAP_COL , BitmapType .INSTANCE , false , aggregateType , false ,
562- Optional .of (DefaultValue .BITMAP_EMPTY_DEFAULT_VALUE ), "doris skip bitmap hidden column" , false );
613+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SKIP_BITMAP_COL , BitmapType .INSTANCE , false ,
614+ aggregateType , false , Optional .of (DefaultValue .BITMAP_EMPTY_DEFAULT_VALUE ),
615+ "doris skip bitmap hidden column" , false );
616+ columnDefinition .setEnableAddHiddenColumn (true );
617+
618+ return columnDefinition ;
563619 }
564620
565621 public Optional <GeneratedColumnDesc > getGeneratedColumnDesc () {
@@ -574,6 +630,10 @@ public void addGeneratedColumnsThatReferToThis(List<String> list) {
574630 generatedColumnsThatReferToThis .addAll (list );
575631 }
576632
633+ public void setEnableAddHiddenColumn (boolean enableAddHiddenColumn ) {
634+ this .enableAddHiddenColumn = enableAddHiddenColumn ;
635+ }
636+
577637 private void validateGeneratedColumnInfo () {
578638 // for generated column
579639 if (generatedColumnDesc .isPresent ()) {
0 commit comments