diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/ArrayType.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/ArrayType.java index 938722528a..8ae4efdcee 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/catalog/ArrayType.java +++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/ArrayType.java @@ -165,6 +165,7 @@ public class ArrayType extends Type { container.types.add(node); Preconditions.checkNotNull(itemType); node.setType(TTypeNodeType.ARRAY); + node.setContainsNull(containsNull); node.setContainsNulls(Lists.newArrayList(containsNull)); itemType.toThrift(container); } diff --git a/gensrc/thrift/AgentService.thrift b/gensrc/thrift/AgentService.thrift index 1bc35c84ee..41a33f935c 100644 --- a/gensrc/thrift/AgentService.thrift +++ b/gensrc/thrift/AgentService.thrift @@ -39,9 +39,9 @@ struct TTabletSchema { 11: optional Types.TSortType sort_type 12: optional i32 sort_col_num 13: optional bool disable_auto_compaction - 14: optional bool store_row_column = false + 14: optional i32 version_col_idx = -1 15: optional bool is_dynamic_schema = false - 16: optional i32 version_col_idx = -1 + 16: optional bool store_row_column = false } // this enum stands for different storage format in src_backends diff --git a/gensrc/thrift/Types.thrift b/gensrc/thrift/Types.thrift index 7b3e74389b..9aa6188e22 100644 --- a/gensrc/thrift/Types.thrift +++ b/gensrc/thrift/Types.thrift @@ -91,8 +91,8 @@ enum TPrimitiveType { DECIMAL64, DECIMAL128I, JSONB, - VARIANT, UNSUPPORTED, + VARIANT, LAMBDA_FUNCTION } @@ -141,8 +141,11 @@ struct TTypeNode { // only used for structs; has struct_fields.size() corresponding child types 3: optional list struct_fields - // only used for complex types, such as array, map and etc. - 4: optional list contains_nulls + // old version used for array + 4: optional bool contains_null + + // update for map/struct type + 5: optional list contains_nulls } // A flattened representation of a tree of column types obtained by depth-first