You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2023/04/14 06:07:49 UTC
[doris] branch master updated: [FIX](thrift)Fix with 1.2 version for thrift #18658
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new db5ec6f6b0 [FIX](thrift)Fix with 1.2 version for thrift #18658
db5ec6f6b0 is described below
commit db5ec6f6b0aeb798303bf7ec381e626f88619e84
Author: amory <wa...@selectdb.com>
AuthorDate: Fri Apr 14 14:07:42 2023 +0800
[FIX](thrift)Fix with 1.2 version for thrift #18658
---
.../src/main/java/org/apache/doris/catalog/ArrayType.java | 1 +
gensrc/thrift/AgentService.thrift | 4 ++--
gensrc/thrift/Types.thrift | 9 ++++++---
3 files changed, 9 insertions(+), 5 deletions(-)
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<TStructField> struct_fields
- // only used for complex types, such as array, map and etc.
- 4: optional list<bool> contains_nulls
+ // old version used for array
+ 4: optional bool contains_null
+
+ // update for map/struct type
+ 5: optional list<bool> contains_nulls
}
// A flattened representation of a tree of column types obtained by depth-first
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org