This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a change to branch hello-stephen-patch-1
in repository https://gitbox.apache.org/repos/asf/doris.git
from 42a03e192d1 Update Config.java
add bb7e075158d [feature](variant) support sub schema for variant type
(#49768)
add 5bc15c779d3 [refactor](predefine) get type info by visitor and fix
compaction (#49867)
add 1d4e8bafa91 [feature](predifine) modify syntax and add patternType
field (#49895)
add f7c19d49806 [feature](function) implement variant_type to get inner
types in variant columns (#49909)
add 62045d1ea05 Merge branch 'variant-sparse' into hello-stephen-patch-1
No new revisions were added by this update.
Summary of changes:
be/src/olap/rowset/segment_v2/column_reader.cpp | 1 -
be/src/olap/rowset/segment_v2/segment.cpp | 7 +-
.../rowset/segment_v2/vertical_segment_writer.cpp | 32 +-
be/src/olap/tablet_reader.cpp | 2 +
be/src/olap/tablet_schema.cpp | 8 +-
be/src/olap/tablet_schema.h | 8 +
be/src/runtime/types.cpp | 1 +
be/src/vec/columns/column_object.cpp | 289 ++++--------------
be/src/vec/columns/column_object.h | 11 +-
be/src/vec/columns/subcolumn_tree.h | 1 +
be/src/vec/common/field_visitors.h | 7 +
be/src/vec/common/schema_util.cpp | 301 +++++++++++++++++-
be/src/vec/common/schema_util.h | 2 +
be/src/vec/core/field.cpp | 20 ++
be/src/vec/core/field.h | 56 +++-
be/src/vec/data_types/convert_field_to_type.cpp | 25 +-
be/src/vec/data_types/data_type.h | 8 +
be/src/vec/data_types/data_type_array.cpp | 22 ++
be/src/vec/data_types/data_type_array.h | 2 +
be/src/vec/data_types/data_type_bitmap.h | 5 +
be/src/vec/data_types/data_type_date_time.h | 1 +
be/src/vec/data_types/data_type_decimal.h | 7 +
be/src/vec/data_types/data_type_factory.cpp | 28 +-
be/src/vec/data_types/data_type_factory.hpp | 6 +-
be/src/vec/data_types/data_type_jsonb.h | 6 +
be/src/vec/data_types/data_type_nullable.h | 8 +
be/src/vec/data_types/data_type_number_base.h | 7 +
be/src/vec/data_types/data_type_object.cpp | 5 +
be/src/vec/data_types/data_type_object.h | 2 +
be/src/vec/data_types/data_type_string.h | 7 +
be/src/vec/data_types/data_type_time.h | 6 +
be/src/vec/data_types/data_type_time_v2.h | 10 +
be/src/vec/data_types/get_least_supertype.cpp | 4 +
.../vec/data_types/serde/data_type_array_serde.cpp | 40 +--
.../vec/data_types/serde/data_type_array_serde.h | 8 +-
.../data_types/serde/data_type_date64_serde.cpp | 6 +
.../vec/data_types/serde/data_type_date64_serde.h | 1 +
.../vec/data_types/serde/data_type_jsonb_serde.cpp | 36 ---
.../vec/data_types/serde/data_type_jsonb_serde.h | 5 +-
.../vec/data_types/serde/data_type_nothing_serde.h | 13 -
.../data_types/serde/data_type_nullable_serde.cpp | 29 --
.../data_types/serde/data_type_nullable_serde.h | 9 +-
.../vec/data_types/serde/data_type_number_serde.h | 64 +---
be/src/vec/data_types/serde/data_type_serde.cpp | 84 -----
be/src/vec/data_types/serde/data_type_serde.h | 14 -
.../vec/data_types/serde/data_type_string_serde.h | 20 --
be/src/vec/data_types/serde/data_type_time_serde.h | 1 +
be/src/vec/functions/function_cast.h | 35 ++-
be/src/vec/functions/function_variant_type.cpp | 105 +++++++
be/src/vec/functions/simple_function_factory.h | 2 +
be/src/vec/json/parse2column.cpp | 2 +-
.../serde/data_type_serde_mysql_test.cpp | 2 +-
.../java/org/apache/doris/catalog/ScalarType.java | 30 +-
.../java/org/apache/doris/catalog/StructField.java | 2 +-
.../main/java/org/apache/doris/catalog/Type.java | 29 ++
.../{StructField.java => VariantField.java} | 101 ++----
.../java/org/apache/doris/catalog/VariantType.java | 93 +++++-
.../antlr4/org/apache/doris/nereids/DorisLexer.g4 | 2 +
.../antlr4/org/apache/doris/nereids/DorisParser.g4 | 10 +
fe/fe-core/src/main/cup/sql_parser.cup | 23 ++
.../apache/doris/alter/SchemaChangeHandler.java | 6 +-
.../org/apache/doris/analysis/MVColumnItem.java | 3 +-
.../doris/catalog/BuiltinScalarFunctions.java | 4 +-
.../main/java/org/apache/doris/catalog/Column.java | 54 +++-
.../java/org/apache/doris/catalog/OlapTable.java | 2 +-
.../doris/nereids/parser/LogicalPlanBuilder.java | 39 ++-
.../scalar/{JsonbType.java => GetVariantType.java} | 20 +-
.../expressions/visitor/ScalarFunctionVisitor.java | 5 +
.../org/apache/doris/nereids/types/DataType.java | 15 +-
.../apache/doris/nereids/types/StructField.java | 17 +-
.../types/{StructField.java => VariantField.java} | 73 ++---
.../apache/doris/nereids/types/VariantType.java | 58 +++-
gensrc/thrift/Descriptors.thrift | 6 +
regression-test/conf/regression-conf.groovy | 16 -
regression-test/data/variant_p0/desc.out | Bin 5397 -> 5529 bytes
regression-test/data/variant_p0/predefine/load.out | Bin 0 -> 7526 bytes
.../data/variant_p0/predefine/sql/q01.out | Bin 0 -> 2108 bytes
.../data/variant_p0/predefine/sql/q02.out | Bin 0 -> 39420 bytes
.../schema_change/test_alter_add_drop_column.out} | Bin 127 -> 187 bytes
.../load.groovy | 7 +
regression-test/suites/variant_p0/desc.groovy | 10 +-
regression-test/suites/variant_p0/load.groovy | 8 +-
regression-test/suites/variant_p0/nested.groovy | 333 ++++++++++----------
.../suites/variant_p0/predefine/load.groovy | 340 +++++++++++++++++++++
.../suites/variant_p0/predefine/sql/q01.sql | 2 +
.../suites/variant_p0/predefine/sql/q02.sql | 24 ++
.../schema_change_with_txn_conflict.groovy | 3 +
.../test_alter_add_drop_column.groovy | 26 +-
88 files changed, 1745 insertions(+), 997 deletions(-)
create mode 100644 be/src/vec/functions/function_variant_type.cpp
copy fe/fe-common/src/main/java/org/apache/doris/catalog/{StructField.java =>
VariantField.java} (50%)
copy
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/{JsonbType.java
=> GetVariantType.java} (76%)
copy fe/fe-core/src/main/java/org/apache/doris/nereids/types/{StructField.java
=> VariantField.java} (54%)
create mode 100644 regression-test/data/variant_p0/predefine/load.out
create mode 100644 regression-test/data/variant_p0/predefine/sql/q01.out
create mode 100644 regression-test/data/variant_p0/predefine/sql/q02.out
copy regression-test/data/{delete_p0/test_struct_column_delete.out =>
variant_p0/schema_change/test_alter_add_drop_column.out} (67%)
create mode 100644 regression-test/suites/variant_p0/predefine/load.groovy
create mode 100644 regression-test/suites/variant_p0/predefine/sql/q01.sql
create mode 100644 regression-test/suites/variant_p0/predefine/sql/q02.sql
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
