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
omit 852cdbcc280 fix conflict with inverted_index (#53738)
add 8bd80370ec4 fix conflict with inverted_index
add c46cc633bdb fix
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (852cdbcc280)
\
N -- N -- N refs/heads/variant-sparse-merge (c46cc633bdb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
be/src/olap/compaction.cpp | 6 +--
.../rowset/segment_v2/inverted_index_iterator.cpp | 12 +++---
.../rowset/segment_v2/inverted_index_iterator.h | 28 +-------------
.../rowset/segment_v2/inverted_index_reader.cpp | 19 +++++++---
be/src/olap/rowset/segment_v2/segment_iterator.cpp | 20 +++++-----
.../variant/variant_column_writer_impl.cpp | 8 ++--
.../rowset/segment_v2/vertical_segment_writer.cpp | 2 +-
be/src/olap/task/index_builder.cpp | 4 +-
be/src/vec/columns/column_array.cpp | 21 ++++++-----
be/src/vec/columns/column_map.h | 1 +
be/src/vec/columns/column_variant.cpp | 26 +++++++------
be/src/vec/data_types/data_type_array.cpp | 16 +++++++-
be/src/vec/data_types/data_type_variant.cpp | 4 +-
be/src/vec/functions/function_variant_type.cpp | 4 +-
be/src/vec/functions/round.h | 6 +--
regression-test/data/variant_p0/load.out | Bin 16311 -> 16320 bytes
regression-test/data/variant_p0/nested2.out | Bin 4088 -> 4042 bytes
regression-test/data/variant_p0/predefine/load.out | Bin 9736 -> 9739 bytes
.../predefine/test_prdefine_insert_into_select.out | Bin 4837 -> 4833 bytes
regression-test/data/variant_p0/rqg/rqg7.out | Bin 5167 -> 7784 bytes
.../data/variant_p0/test_sub_path_pruning.out | Bin 5873 -> 5777 bytes
.../data/variant_p0/variant_with_rowstore.out | Bin 1344 -> 1348 bytes
.../variant_github_events_new_p0/load.groovy | 2 +-
regression-test/suites/variant_p0/desc.groovy | 12 ------
.../suites/variant_p0/predefine/load.groovy | 1 +
.../test_prdefine_insert_into_select.groovy | 10 ++---
...test_prdefine_typed_column_sparse_column.groovy | 4 +-
.../predefine/test_predefine_schema_change.groovy | 4 +-
.../suites/variant_p0/test_sub_path_pruning.groovy | 6 +--
.../test_variant_float_double_index.groovy | 42 ++++++++++-----------
.../variant_p0/test_variant_is_null_expr.groovy | 12 +++---
31 files changed, 130 insertions(+), 140 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
