@@ -69,6 +69,8 @@ public class ColumnDefinition {
6969 private int clusterKeyId = -1 ;
7070 private Optional <GeneratedColumnDesc > generatedColumnDesc = Optional .empty ();
7171 private Set <String > generatedColumnsThatReferToThis = new HashSet <>();
72+ // if add hidden column, must set enableAddHiddenColumn true
73+ private boolean enableAddHiddenColumn = false ;
7274
7375 public ColumnDefinition (String name , DataType type , boolean isKey , AggregateType aggType , boolean isNullable ,
7476 Optional <DefaultValue > defaultValue , String comment ) {
@@ -232,7 +234,14 @@ private void checkKeyColumnType(boolean isOlap) {
232234 public void validate (boolean isOlap , Set <String > keysSet , Set <String > clusterKeySet , boolean isEnableMergeOnWrite ,
233235 KeysType keysType ) {
234236 try {
235- FeNameFormat .checkColumnName (name );
237+ // if enableAddHiddenColumn is true, can add hidden column.
238+ // So does not check if the column name starts with __DORIS_
239+ if (enableAddHiddenColumn ) {
240+ FeNameFormat .checkColumnNameBypassHiddenColumn (name );
241+ } else {
242+ FeNameFormat .checkColumnName (name );
243+ }
244+
236245 FeNameFormat .checkColumnCommentLength (comment );
237246 } catch (Exception e ) {
238247 throw new AnalysisException (e .getMessage (), e );
@@ -689,43 +698,90 @@ public Column translateToCatalogStyle() {
689698 return column ;
690699 }
691700
692- // hidden column
701+ /**
702+ * add hidden column
703+ */
693704 public static ColumnDefinition newDeleteSignColumnDefinition () {
694- return new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , null , false ,
695- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris delete flag hidden column" , false );
705+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , null ,
706+ false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
707+ "doris delete flag hidden column" , false );
708+ columnDefinition .setEnableAddHiddenColumn (true );
709+
710+ return columnDefinition ;
696711 }
697712
713+ /**
714+ * add hidden column
715+ */
698716 public static ColumnDefinition newDeleteSignColumnDefinition (AggregateType aggregateType ) {
699- return new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , aggregateType , false ,
700- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris delete flag hidden column" , false );
717+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false ,
718+ aggregateType , false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
719+ "doris delete flag hidden column" , false );
720+ columnDefinition .setEnableAddHiddenColumn (true );
721+
722+ return columnDefinition ;
701723 }
702724
725+ /**
726+ * add hidden column
727+ */
703728 public static ColumnDefinition newSequenceColumnDefinition (DataType type ) {
704- return new ColumnDefinition (Column .SEQUENCE_COL , type , false , null , true ,
705- Optional .empty (), "sequence column hidden column" , false );
729+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SEQUENCE_COL , type , false , null ,
730+ true , Optional .empty (),
731+ "sequence column hidden column" , false );
732+ columnDefinition .setEnableAddHiddenColumn (true );
733+
734+ return columnDefinition ;
706735 }
707736
737+ /**
738+ * add hidden column
739+ */
708740 public static ColumnDefinition newSequenceColumnDefinition (DataType type , AggregateType aggregateType ) {
709- return new ColumnDefinition (Column .SEQUENCE_COL , type , false , aggregateType , true ,
710- Optional .empty (), "sequence column hidden column" , false );
741+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SEQUENCE_COL , type , false , aggregateType ,
742+ true , Optional .empty (),
743+ "sequence column hidden column" , false );
744+ columnDefinition .setEnableAddHiddenColumn (true );
745+
746+ return columnDefinition ;
711747 }
712748
749+ /**
750+ * add hidden column
751+ */
713752 public static ColumnDefinition newRowStoreColumnDefinition (AggregateType aggregateType ) {
714- return new ColumnDefinition (Column .ROW_STORE_COL , StringType .INSTANCE , false , aggregateType , false ,
715- Optional .of (new DefaultValue ("" )), "doris row store hidden column" , false );
753+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .ROW_STORE_COL , StringType .INSTANCE , false ,
754+ aggregateType , false , Optional .of (new DefaultValue ("" )),
755+ "doris row store hidden column" , false );
756+ columnDefinition .setEnableAddHiddenColumn (true );
757+
758+ return columnDefinition ;
716759 }
717760
761+ /**
762+ * add hidden column
763+ */
718764 public static ColumnDefinition newVersionColumnDefinition (AggregateType aggregateType ) {
719- return new ColumnDefinition (Column .VERSION_COL , BigIntType .INSTANCE , false , aggregateType , false ,
720- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris version hidden column" , false );
765+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .VERSION_COL , BigIntType .INSTANCE , false ,
766+ aggregateType , false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
767+ "doris version hidden column" , false );
768+ columnDefinition .setEnableAddHiddenColumn (true );
769+
770+ return columnDefinition ;
721771 }
722772
723- // used in CreateTableInfo.validate(), specify the default value as DefaultValue.NULL_DEFAULT_VALUE
724- // becasue ColumnDefinition.validate() will check that bitmap type column don't set default value
725- // and then set the default value of that column to bitmap_empty()
773+ /**
774+ * used in CreateTableInfo.validate(), specify the default value as DefaultValue.NULL_DEFAULT_VALUE
775+ * becasue ColumnDefinition.validate() will check that bitmap type column don't set default value
776+ * and then set the default value of that column to bitmap_empty()
777+ */
726778 public static ColumnDefinition newSkipBitmapColumnDef (AggregateType aggregateType ) {
727- return new ColumnDefinition (Column .SKIP_BITMAP_COL , BitmapType .INSTANCE , false , aggregateType , false ,
728- Optional .of (DefaultValue .BITMAP_EMPTY_DEFAULT_VALUE ), "doris skip bitmap hidden column" , false );
779+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SKIP_BITMAP_COL , BitmapType .INSTANCE , false ,
780+ aggregateType , false , Optional .of (DefaultValue .BITMAP_EMPTY_DEFAULT_VALUE ),
781+ "doris skip bitmap hidden column" , false );
782+ columnDefinition .setEnableAddHiddenColumn (true );
783+
784+ return columnDefinition ;
729785 }
730786
731787 public Optional <GeneratedColumnDesc > getGeneratedColumnDesc () {
@@ -740,6 +796,10 @@ public void addGeneratedColumnsThatReferToThis(List<String> list) {
740796 generatedColumnsThatReferToThis .addAll (list );
741797 }
742798
799+ public void setEnableAddHiddenColumn (boolean enableAddHiddenColumn ) {
800+ this .enableAddHiddenColumn = enableAddHiddenColumn ;
801+ }
802+
743803 private void validateGeneratedColumnInfo () {
744804 // for generated column
745805 if (generatedColumnDesc .isPresent ()) {
0 commit comments