@@ -65,6 +65,8 @@ public class ColumnDefinition {
6565 private boolean aggTypeImplicit = false ;
6666 private long autoIncInitValue = -1 ;
6767 private int clusterKeyId = -1 ;
68+ // if add hidden column, must set enableAddHiddenColumn true
69+ private boolean enableAddHiddenColumn = false ;
6870
6971 public ColumnDefinition (String name , DataType type , boolean isKey , AggregateType aggType , boolean isNullable ,
7072 Optional <DefaultValue > defaultValue , String comment ) {
@@ -131,6 +133,10 @@ public AggregateType getAggType() {
131133 return aggType ;
132134 }
133135
136+ public void setEnableAddHiddenColumn (boolean enableAddHiddenColumn ) {
137+ this .enableAddHiddenColumn = enableAddHiddenColumn ;
138+ }
139+
134140 public void setAggType (AggregateType aggType ) {
135141 this .aggType = aggType ;
136142 }
@@ -180,7 +186,13 @@ private DataType updateCharacterTypeLength(DataType dataType) {
180186 */
181187 public void validate (boolean isOlap , Set <String > keysSet , boolean isEnableMergeOnWrite , KeysType keysType ) {
182188 try {
183- FeNameFormat .checkColumnName (name );
189+ // if enableAddHiddenColumn is true, can add hidden column.
190+ // So does not check if the column name starts with __DORIS_
191+ if (enableAddHiddenColumn ) {
192+ FeNameFormat .checkColumnNameBypassHiddenColumn (name );
193+ } else {
194+ FeNameFormat .checkColumnName (name );
195+ }
184196 } catch (Exception e ) {
185197 throw new AnalysisException (e .getMessage (), e );
186198 }
@@ -639,35 +651,79 @@ public Column translateToCatalogStyle() {
639651 return column ;
640652 }
641653
642- // hidden column
654+ /**
655+ * add hidden column
656+ */
643657 public static ColumnDefinition newDeleteSignColumnDefinition () {
644- return new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , null , false ,
645- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris delete flag hidden column" , false );
658+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , null ,
659+ false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
660+ "doris delete flag hidden column" , false );
661+ columnDefinition .setEnableAddHiddenColumn (true );
662+
663+ return columnDefinition ;
646664 }
647665
666+ /**
667+ * add hidden column
668+ */
648669 public static ColumnDefinition newDeleteSignColumnDefinition (AggregateType aggregateType ) {
649- return new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false , aggregateType , false ,
650- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris delete flag hidden column" , false );
670+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .DELETE_SIGN , TinyIntType .INSTANCE , false ,
671+ aggregateType , false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
672+ "doris delete flag hidden column" , false );
673+ columnDefinition .setEnableAddHiddenColumn (true );
674+
675+ return columnDefinition ;
651676 }
652677
678+ /**
679+ * add hidden column
680+ */
653681 public static ColumnDefinition newSequenceColumnDefinition (DataType type ) {
654- return new ColumnDefinition (Column .SEQUENCE_COL , type , false , null , true ,
655- Optional .empty (), "sequence column hidden column" , false );
682+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SEQUENCE_COL , type , false , null ,
683+ true , Optional .empty (),
684+ "sequence column hidden column" , false );
685+ columnDefinition .setEnableAddHiddenColumn (true );
686+
687+ return columnDefinition ;
656688 }
657689
690+ /**
691+ * add hidden column
692+ */
658693 public static ColumnDefinition newSequenceColumnDefinition (DataType type , AggregateType aggregateType ) {
659- return new ColumnDefinition (Column .SEQUENCE_COL , type , false , aggregateType , true ,
660- Optional .empty (), "sequence column hidden column" , false );
694+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .SEQUENCE_COL , type , false , aggregateType ,
695+ true , Optional .empty (),
696+ "sequence column hidden column" , false );
697+ columnDefinition .setEnableAddHiddenColumn (true );
698+
699+ return columnDefinition ;
661700 }
662701
702+ /**
703+ * add hidden column
704+ */
663705 public static ColumnDefinition newRowStoreColumnDefinition (AggregateType aggregateType ) {
664- return new ColumnDefinition (Column .ROW_STORE_COL , StringType .INSTANCE , false , aggregateType , false ,
665- Optional .of (new DefaultValue ("" )), "doris row store hidden column" , false );
706+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .ROW_STORE_COL , StringType .INSTANCE , false ,
707+ aggregateType , false , Optional .of (new DefaultValue ("" )),
708+ "doris row store hidden column" , false );
709+ columnDefinition .setEnableAddHiddenColumn (true );
710+
711+ return columnDefinition ;
666712 }
667713
714+ /**
715+ * add hidden column
716+ */
668717 public static ColumnDefinition newVersionColumnDefinition (AggregateType aggregateType ) {
669- return new ColumnDefinition (Column .VERSION_COL , BigIntType .INSTANCE , false , aggregateType , false ,
670- Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )), "doris version hidden column" , false );
718+ ColumnDefinition columnDefinition = new ColumnDefinition (Column .VERSION_COL , BigIntType .INSTANCE , false ,
719+ aggregateType , false , Optional .of (new DefaultValue (DefaultValue .ZERO_NUMBER )),
720+ "doris version hidden column" , false );
721+ columnDefinition .setEnableAddHiddenColumn (true );
722+
723+ return columnDefinition ;
671724 }
672725
726+ public long getAutoIncInitValue () {
727+ return autoIncInitValue ;
728+ }
673729}
0 commit comments