@@ -199,6 +199,8 @@ public String getValue() {
199199 private int clusterKeyId = -1 ;
200200 private Optional <GeneratedColumnInfo > generatedColumnInfo = Optional .empty ();
201201 private Set <String > generatedColumnsThatReferToThis = new HashSet <>();
202+ // if add hidden column, must set enableAddHiddenColumn true
203+ private boolean enableAddHiddenColumn = false ;
202204
203205
204206 public ColumnDef (String name , TypeDef typeDef ) {
@@ -262,57 +264,83 @@ public ColumnDef(String name, TypeDef typeDef, boolean isKey, AggregateType aggr
262264 this .visible = visible ;
263265 }
264266
267+ public void setEnableAddHiddenColumn (boolean enableAddHiddenColumn ) {
268+ this .enableAddHiddenColumn = enableAddHiddenColumn ;
269+ }
270+
265271 public ColumnDef (String name , TypeDef typeDef , boolean isKey , ColumnNullableType nullableType , String comment ,
266272 Optional <GeneratedColumnInfo > generatedColumnInfo ) {
267273 this (name , typeDef , isKey , null , nullableType , -1 , DefaultValue .NOT_SET ,
268274 comment , true , generatedColumnInfo );
269275 }
270276
271277 public static ColumnDef newDeleteSignColumnDef () {
272- return new ColumnDef (Column .DELETE_SIGN , TypeDef .create (PrimitiveType .TINYINT ), false , null ,
273- ColumnNullableType .NOT_NULLABLE , -1 , new ColumnDef . DefaultValue (true , "0" ),
278+ ColumnDef columnDef = new ColumnDef (Column .DELETE_SIGN , TypeDef .create (PrimitiveType .TINYINT ), false , null ,
279+ ColumnNullableType .NOT_NULLABLE , -1 , new DefaultValue (true , "0" ),
274280 "doris delete flag hidden column" , false , Optional .empty ());
281+ columnDef .setEnableAddHiddenColumn (true );
282+ return columnDef ;
275283 }
276284
277285 public static ColumnDef newDeleteSignColumnDef (AggregateType aggregateType ) {
278- return new ColumnDef (Column .DELETE_SIGN , TypeDef .create (PrimitiveType .TINYINT ), false , aggregateType ,
279- ColumnNullableType .NOT_NULLABLE , -1 , new ColumnDef .DefaultValue (true , "0" ),
286+ ColumnDef columnDef = new ColumnDef (Column .DELETE_SIGN , TypeDef .create (PrimitiveType .TINYINT ), false ,
287+ aggregateType ,
288+ ColumnNullableType .NOT_NULLABLE , -1 , new DefaultValue (true , "0" ),
280289 "doris delete flag hidden column" , false , Optional .empty ());
290+ columnDef .setEnableAddHiddenColumn (true );
291+ return columnDef ;
281292 }
282293
283294 public static ColumnDef newSequenceColumnDef (Type type ) {
284- return new ColumnDef (Column .SEQUENCE_COL , new TypeDef (type ), false , null , ColumnNullableType .NULLABLE , -1 ,
295+ ColumnDef columnDef = new ColumnDef (Column .SEQUENCE_COL , new TypeDef (type ),
296+ false , null , ColumnNullableType .NULLABLE , -1 ,
285297 DefaultValue .NULL_DEFAULT_VALUE , "sequence column hidden column" , false , Optional .empty ());
298+ columnDef .setEnableAddHiddenColumn (true );
299+ return columnDef ;
286300 }
287301
288302 public static ColumnDef newSequenceColumnDef (Type type , AggregateType aggregateType ) {
289- return new ColumnDef (Column .SEQUENCE_COL , new TypeDef (type ), false , aggregateType , ColumnNullableType .NULLABLE ,
303+ ColumnDef columnDef = new ColumnDef (Column .SEQUENCE_COL , new TypeDef (type ),
304+ false , aggregateType , ColumnNullableType .NULLABLE ,
290305 -1 , DefaultValue .NULL_DEFAULT_VALUE , "sequence column hidden column" , false ,
291306 Optional .empty ());
307+ columnDef .setEnableAddHiddenColumn (true );
308+ return columnDef ;
292309 }
293310
294311 public static ColumnDef newRowStoreColumnDef (AggregateType aggregateType ) {
295- return new ColumnDef (Column .ROW_STORE_COL , TypeDef .create (PrimitiveType .STRING ), false , aggregateType ,
312+ ColumnDef columnDef = new ColumnDef (Column .ROW_STORE_COL , TypeDef .create (PrimitiveType .STRING ),
313+ false , aggregateType ,
296314 ColumnNullableType .NOT_NULLABLE , -1 , new ColumnDef .DefaultValue (true , "" ),
297315 "doris row store hidden column" , false , Optional .empty ());
316+ columnDef .setEnableAddHiddenColumn (true );
317+ return columnDef ;
298318 }
299319
300320 public static ColumnDef newVersionColumnDef () {
301- return new ColumnDef (Column .VERSION_COL , TypeDef .create (PrimitiveType .BIGINT ), false , null ,
321+ ColumnDef columnDef = new ColumnDef (Column .VERSION_COL , TypeDef .create (PrimitiveType .BIGINT ), false , null ,
302322 ColumnNullableType .NOT_NULLABLE , -1 , new ColumnDef .DefaultValue (true , "0" ),
303323 "doris version hidden column" , false , Optional .empty ());
324+ columnDef .setEnableAddHiddenColumn (true );
325+ return columnDef ;
304326 }
305327
306328 public static ColumnDef newVersionColumnDef (AggregateType aggregateType ) {
307- return new ColumnDef (Column .VERSION_COL , TypeDef .create (PrimitiveType .BIGINT ), false , aggregateType ,
329+ ColumnDef columnDef = new ColumnDef (Column .VERSION_COL , TypeDef .create (PrimitiveType .BIGINT ),
330+ false , aggregateType ,
308331 ColumnNullableType .NOT_NULLABLE , -1 , new ColumnDef .DefaultValue (true , "0" ),
309332 "doris version hidden column" , false , Optional .empty ());
333+ columnDef .setEnableAddHiddenColumn (true );
334+ return columnDef ;
310335 }
311336
312337 public static ColumnDef newSkipBitmapColumnDef (AggregateType aggregateType ) {
313- return new ColumnDef (Column .SKIP_BITMAP_COL , TypeDef .create (PrimitiveType .BITMAP ), false , aggregateType ,
338+ ColumnDef columnDef = new ColumnDef (Column .SKIP_BITMAP_COL , TypeDef .create (PrimitiveType .BITMAP ),
339+ false , aggregateType ,
314340 ColumnNullableType .NOT_NULLABLE , -1 , DefaultValue .BITMAP_EMPTY_DEFAULT_VALUE ,
315341 "doris skip bitmap hidden column" , false , Optional .empty ());
342+ columnDef .setEnableAddHiddenColumn (true );
343+ return columnDef ;
316344 }
317345
318346 public boolean isAllowNull () {
@@ -375,7 +403,13 @@ public void analyze(boolean isOlap) throws AnalysisException {
375403 if (name == null || typeDef == null ) {
376404 throw new AnalysisException ("No column name or column type in column definition." );
377405 }
378- FeNameFormat .checkColumnName (name );
406+
407+ if (enableAddHiddenColumn ) {
408+ FeNameFormat .checkColumnNameBypassHiddenColumn (name );
409+ } else {
410+ FeNameFormat .checkColumnName (name );
411+ }
412+
379413 FeNameFormat .checkColumnCommentLength (comment );
380414
381415 typeDef .analyze (null );
0 commit comments