@@ -68,6 +68,8 @@ public class ColumnDefinition {
6868 private int clusterKeyId = -1 ;
6969 private Optional <GeneratedColumnDesc > generatedColumnDesc = Optional .empty ();
7070 private Set <String > generatedColumnsThatReferToThis = new HashSet <>();
71+ // if add hidden column, must set enableAddHiddenColumn true
72+ private boolean enableAddHiddenColumn = false ;
7173
7274 public ColumnDefinition (String name , DataType type , boolean isKey , AggregateType aggType , boolean isNullable ,
7375 Optional <DefaultValue > defaultValue , String comment ) {
@@ -231,7 +233,14 @@ private void checkKeyColumnType(boolean isOlap) {
231233 public void validate (boolean isOlap , Set <String > keysSet , Set <String > clusterKeySet , boolean isEnableMergeOnWrite ,
232234 KeysType keysType ) {
233235 try {
234- FeNameFormat .checkColumnName (name );
236+ // if enableAddHiddenColumn is true, can add hidden column.
237+ // So does not check if the column name starts with __DORIS_
238+ if (enableAddHiddenColumn ) {
239+ FeNameFormat .checkColumnNameBypassHiddenColumn (name );
240+ } else {
241+ FeNameFormat .checkColumnName (name );
242+ }
243+
235244 FeNameFormat .checkColumnCommentLength (comment );
236245 } catch (Exception e ) {
237246 throw new AnalysisException (e .getMessage (), e );
@@ -674,35 +683,76 @@ public Column translateToCatalogStyle() {
674683 return column ;
675684 }
676685
677- // hidden column
686+ /**
687+ * add hidden column
688+ */
678689 public static ColumnDefinition newDeleteSignColumnDefinition () {
679- return new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , null , false ,
680- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris delete flag hidden column" , false );
690+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , null ,
691+ false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
692+ "doris delete flag hidden column" , false );
693+ columnDefinition .setEnableAddHiddenColumn (true );
694+
695+ return columnDefinition ;
681696 }
682697
698+ /**
699+ * add hidden column
700+ */
683701 public static ColumnDefinition newDeleteSignColumnDefinition (AggregateType aggregateType ) {
684- return new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , aggregateType , false ,
685- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris delete flag hidden column" , false );
702+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false ,
703+ aggregateType , false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
704+ "doris delete flag hidden column" , false );
705+ columnDefinition .setEnableAddHiddenColumn (true );
706+
707+ return columnDefinition ;
686708 }
687709
710+ /**
711+ * add hidden column
712+ */
688713 public static ColumnDefinition newSequenceColumnDefinition (DataType type ) {
689- return new ColumnDefinition (Column .SEQUENCE_COL , type , false , null , true ,
690- Optional .empty (), "sequence column hidden column" , false );
714+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SEQUENCE_COL , type , false , null ,
715+ true , Optional .empty (),
716+ "sequence column hidden column" , false );
717+ columnDefinition .setEnableAddHiddenColumn (true );
718+
719+ return columnDefinition ;
691720 }
692721
722+ /**
723+ * add hidden column
724+ */
693725 public static ColumnDefinition newSequenceColumnDefinition (DataType type , AggregateType aggregateType ) {
694- return new ColumnDefinition (Column .SEQUENCE_COL , type , false , aggregateType , true ,
695- Optional .empty (), "sequence column hidden column" , false );
726+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SEQUENCE_COL , type , false , aggregateType ,
727+ true , Optional .empty (),
728+ "sequence column hidden column" , false );
729+ columnDefinition .setEnableAddHiddenColumn (true );
730+
731+ return columnDefinition ;
696732 }
697733
734+ /**
735+ * add hidden column
736+ */
698737 public static ColumnDefinition newRowStoreColumnDefinition (AggregateType aggregateType ) {
699- return new ColumnDefinition (Column .ROW_STORE_COL , StringType .INSTANCE , false , aggregateType , false ,
700- Optional .of (new DefaultValue ("" )), "doris row store hidden column" , false );
738+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .ROW_STORE_COL , StringType .INSTANCE , false ,
739+ aggregateType , false , Optional .of (new DefaultValue ("" )),
740+ "doris row store hidden column" , false );
741+ columnDefinition .setEnableAddHiddenColumn (true );
742+
743+ return columnDefinition ;
701744 }
702745
746+ /**
747+ * add hidden column
748+ */
703749 public static ColumnDefinition newVersionColumnDefinition (AggregateType aggregateType ) {
704- return new ColumnDefinition (Column .VERSION_COL , BigIntType .INSTANCE , false , aggregateType , false ,
705- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris version hidden column" , false );
750+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .VERSION_COL , BigIntType .INSTANCE , false ,
751+ aggregateType , false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
752+ "doris version hidden column" , false );
753+ columnDefinition .setEnableAddHiddenColumn (true );
754+
755+ return columnDefinition ;
706756 }
707757
708758 public Optional <GeneratedColumnDesc > getGeneratedColumnDesc () {
@@ -717,6 +767,10 @@ public void addGeneratedColumnsThatReferToThis(List<String> list) {
717767 generatedColumnsThatReferToThis .addAll (list );
718768 }
719769
770+ public void setEnableAddHiddenColumn (boolean enableAddHiddenColumn ) {
771+ this .enableAddHiddenColumn = enableAddHiddenColumn ;
772+ }
773+
720774 private void validateGeneratedColumnInfo () {
721775 // for generated column
722776 if (generatedColumnDesc .isPresent ()) {
0 commit comments