This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a change to branch variant-sparse-merge
in repository https://gitbox.apache.org/repos/asf/doris.git
from c2686372830 pick some PRs from branch-3.1 (#53975)
add 2d718b7bf66 [enhance](variant) typed_paths_to sparse column (#54078)
No new revisions were added by this update.
Summary of changes:
be/src/olap/rowset/segment_v2/segment.cpp | 26 +-
be/src/olap/rowset/segment_v2/segment_writer.cpp | 10 +-
.../segment_v2/variant/variant_column_reader.cpp | 36 +-
.../segment_v2/variant/variant_column_reader.h | 2 +
.../variant/variant_column_writer_impl.cpp | 62 +-
be/src/olap/tablet_meta.cpp | 4 +
be/src/olap/tablet_schema.cpp | 77 +
be/src/olap/tablet_schema.h | 10 +
be/src/util/types.h | 13 +
be/src/vec/columns/column_variant.cpp | 216 ++-
be/src/vec/columns/column_variant.h | 4 +
be/src/vec/common/schema_util.cpp | 26 +-
be/src/vec/common/schema_util.h | 28 +-
be/src/vec/core/field.h | 7 +
be/src/vec/data_types/data_type_variant.cpp | 7 +-
.../vec/data_types/serde/data_type_array_serde.cpp | 2 +-
.../serde/data_type_datetimev2_serde.cpp | 20 +-
.../data_types/serde/data_type_datetimev2_serde.h | 3 +
.../data_types/serde/data_type_datev2_serde.cpp | 15 +
.../vec/data_types/serde/data_type_datev2_serde.h | 3 +
.../data_types/serde/data_type_decimal_serde.cpp | 26 +
.../vec/data_types/serde/data_type_decimal_serde.h | 3 +
.../vec/data_types/serde/data_type_ipv4_serde.cpp | 15 +
be/src/vec/data_types/serde/data_type_ipv4_serde.h | 3 +
.../vec/data_types/serde/data_type_ipv6_serde.cpp | 14 +
be/src/vec/data_types/serde/data_type_ipv6_serde.h | 3 +
.../vec/data_types/serde/data_type_jsonb_serde.cpp | 2 +-
.../data_types/serde/data_type_nullable_serde.cpp | 2 +-
.../data_types/serde/data_type_number_serde.cpp | 3 +-
.../vec/data_types/serde/data_type_string_serde.h | 2 +-
be/src/vec/exprs/vmatch_predicate.cpp | 1 +
.../vec/data_types/column_object_to_string.out | Bin 1849 -> 1839 bytes
.../data_types/column_object_to_string_batch.out | Bin 1849 -> 1839 bytes
.../column_object_to_string_with_buffer.out | Bin 1849 -> 1839 bytes
.../variant_column_writer_reader_test.cpp | 7 +-
be/test/vec/columns/column_object_test.cpp | 1495 ++++++++++++++++++++
be/test/vec/columns/column_variant_test.cpp | 62 +-
be/test/vec/common/schema_util_rowset_test.cpp | 121 ++
be/test/vec/common/schema_util_test.cpp | 100 +-
.../java/org/apache/doris/catalog/ScalarType.java | 14 +
.../org/apache/doris/catalog/VariantField.java | 16 +-
.../java/org/apache/doris/catalog/VariantType.java | 86 +-
.../antlr4/org/apache/doris/nereids/DorisParser.g4 | 10 +-
fe/fe-core/src/main/cup/sql_parser.cup | 15 +-
.../apache/doris/alter/SchemaChangeHandler.java | 23 +-
.../apache/doris/analysis/InvertedIndexUtil.java | 10 +
.../org/apache/doris/analysis/MVColumnItem.java | 7 -
.../java/org/apache/doris/analysis/TypeDef.java | 29 +
.../main/java/org/apache/doris/catalog/Column.java | 24 +-
.../main/java/org/apache/doris/catalog/Env.java | 6 -
.../main/java/org/apache/doris/catalog/Index.java | 9 +-
.../java/org/apache/doris/catalog/OlapTable.java | 93 +-
.../apache/doris/common/util/PropertyAnalyzer.java | 17 +
.../apache/doris/datasource/InternalCatalog.java | 14 -
.../glue/translator/ExpressionTranslator.java | 16 +-
.../doris/nereids/parser/LogicalPlanBuilder.java | 48 +-
.../trees/plans/commands/info/CreateTableInfo.java | 24 +-
.../org/apache/doris/nereids/types/DataType.java | 5 +-
.../apache/doris/nereids/types/VariantField.java | 17 +-
.../apache/doris/nereids/types/VariantType.java | 48 +-
.../java/org/apache/doris/qe/SessionVariable.java | 31 +-
.../{StorageInfoTest.java => ScalarTypeTest.java} | 34 +-
gensrc/proto/olap_file.proto | 1 +
gensrc/thrift/Descriptors.thrift | 1 +
regression-test/data/variant_p0/load.out | Bin 16320 -> 16319 bytes
regression-test/data/variant_p0/nested2.out | Bin 4042 -> 4250 bytes
regression-test/data/variant_p0/predefine/load.out | Bin 9739 -> 6007 bytes
.../predefine/predefined_typed_to_sparse.out | Bin 0 -> 34967 bytes
.../data/variant_p0/predefine/sql/q01.out | Bin 2184 -> 1866 bytes
.../predefine/test_all_prdefine_type_to_sparse.out | Bin 0 -> 332757 bytes
.../predefine}/test_custom_analyzer.out | Bin 1217 -> 1180 bytes
.../variant_p0/predefine/test_predefine_ddl.out | Bin 0 -> 495 bytes
.../test_add_multi_var_mulit_indexes.out | Bin 0 -> 739 bytes
.../data/variant_p0/tpch/sql/q01_trans.out | Bin 666 -> 650 bytes
.../data/variant_p0/tpch/sql/q05_trans.out | Bin 231 -> 226 bytes
.../data/variant_p0/tpch/sql/q06_trans.out | Bin 134 -> 134 bytes
.../data/variant_p0/tpch/sql/q08_trans.out | Bin 164 -> 165 bytes
.../data/variant_p0/tpch/sql/q09_trans.out | Bin 5472 -> 5359 bytes
.../data/variant_p0/tpch/sql/q10_trans.out | Bin 3545 -> 3511 bytes
.../data/variant_p0/tpch/sql/q14_trans.out | Bin 131 -> 131 bytes
.../test_array_inverted_index_profile.out | Bin 2004 -> 1820 bytes
.../compaction/compaction_sparse_column.out | Bin 1079 -> 1079 bytes
.../compaction/test_compaction_extract_root.out | Bin 291 -> 266 bytes
.../create_nestedtypes_with_schemachange.groovy | 2 +-
.../test_variant_bloom_filter.groovy | 6 +-
...est_variant_compaction_with_sparse_limit.groovy | 8 +-
.../suites/function_p0/test_array_agg.groovy | 7 +-
.../variant_github_events_new_p0/load.groovy | 53 +-
.../load.groovy | 13 +-
.../suites/variant_log_data_p2/load.groovy | 8 +-
regression-test/suites/variant_p0/agg.groovy | 8 +-
.../suites/variant_p0/column_name.groovy | 4 +-
.../suites/variant_p0/column_size_limit.groovy | 4 +-
regression-test/suites/variant_p0/desc.groovy | 18 +-
regression-test/suites/variant_p0/nested.groovy | 2 +-
regression-test/suites/variant_p0/nested2.groovy | 3 +-
.../variant_p0/predefine/delete_update.groovy | 8 +-
.../variant_p0/predefine/insert_into_select.groovy | 2 +
.../suites/variant_p0/predefine/load.groovy | 37 +-
.../suites/variant_p0/predefine/multi_var.groovy | 16 +-
.../predefine/predefined_typed_to_sparse.groovy | 217 +++
.../test_all_prdefine_type_to_sparse.groovy | 391 +++++
.../predefine}/test_custom_analyzer.groovy | 57 +-
.../predefine/test_multi_index_file.groovy | 2 +-
.../predefine/test_multi_index_nonCurrent.groovy | 14 +-
.../test_prdefine_insert_into_select.groovy | 18 +-
...test_prdefine_typed_column_sparse_column.groovy | 6 +-
.../variant_p0/predefine/test_predefine_ddl.groovy | 206 ++-
.../predefine/test_predefine_pattern.groovy | 11 +-
.../predefine/test_predefine_schema_change.groovy | 6 +-
.../predefine/test_predefine_type_index.groovy | 10 +-
.../test_predefine_type_multi_index.groovy | 6 +-
.../test_types_with_indexes_profile.groovy | 6 +-
...est_variant_compaction_with_sparse_limit.groovy | 6 +-
.../predefine/test_variant_is_null_expr.groovy | 9 +-
.../variant_p0/predefine/variant_hirachinal.groovy | 3 +-
.../variant_p0/predefine/variant_with_mow.groovy | 5 +-
.../suites/variant_p0/rqg/fix_rqg1.groovy | 1 -
regression-test/suites/variant_p0/rqg/rqg7.sql | 12 +-
.../variant_p0/schema_change/schema_change.groovy | 1 +
.../test_add_multi_var_mulit_indexes.groovy | 98 ++
.../suites/variant_p0/test_sub_path_pruning.groovy | 5 +-
.../test_variant_float_double_index.groovy | 10 +-
.../variant_p0/test_variant_is_null_expr.groovy | 5 +-
regression-test/suites/variant_p0/tpch/load.groovy | 6 +-
.../suites/variant_p0/variant_with_mow.groovy | 3 +-
.../variant_p0/with_index/bloom_filter.groovy | 4 +-
.../test_array_contains_with_inverted_index.groovy | 6 +-
.../with_index/test_array_index_write.groovy | 4 +-
.../test_array_inverted_index_profile.groovy | 3 +-
.../suites/variant_p0/with_index/var_index.groovy | 1 +
.../compaction/compaction_sparse_column.groovy | 5 +-
.../compaction/test_compaction_extract_root.groovy | 5 +-
.../suites/variant_p1/predefine/load.groovy | 9 +-
regression-test/suites/variant_p2/load.groovy | 8 +-
135 files changed, 3832 insertions(+), 554 deletions(-)
create mode 100644 be/test/vec/columns/column_object_test.cpp
copy fe/fe-core/src/test/java/org/apache/doris/persist/{StorageInfoTest.java
=> ScalarTypeTest.java} (52%)
create mode 100644
regression-test/data/variant_p0/predefine/predefined_typed_to_sparse.out
create mode 100644
regression-test/data/variant_p0/predefine/test_all_prdefine_type_to_sparse.out
copy regression-test/data/{inverted_index_p0/analyzer =>
variant_p0/predefine}/test_custom_analyzer.out (91%)
create mode 100644
regression-test/data/variant_p0/predefine/test_predefine_ddl.out
create mode 100644
regression-test/data/variant_p0/schema_change/test_add_multi_var_mulit_indexes.out
create mode 100644
regression-test/suites/variant_p0/predefine/predefined_typed_to_sparse.groovy
create mode 100644
regression-test/suites/variant_p0/predefine/test_all_prdefine_type_to_sparse.groovy
copy regression-test/suites/{inverted_index_p0/analyzer =>
variant_p0/predefine}/test_custom_analyzer.groovy (61%)
create mode 100644
regression-test/suites/variant_p0/schema_change/test_add_multi_var_mulit_indexes.groovy
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
