This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a change to branch auto-pick-51615-branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
discard 77ba7256e41 [fix](load) fix concurrent read and write to runningTxnIds
(#51615)
add 0f053789fca branch-2.1: [fix](memory-leak) skip libzip and libjvm
memory leak #51628 (#51632)
add ec0af702157 [fix](regression) fix global vars in cases (#51636)
add 18d2f931200 branch-2.1: [fix](function) JSON_EXTRACT_STRING should
return NULL instead of the string 'null' when encountering a NULL value #51516
(#51566)
add 3c85740a1e5 branch-2.1: [Opt](metric) Add metrics for invalid delete
bitmap key count (#51654)
add d4a50393751 branch-2.1: [chore](dep)bump up parquet to 1.15.2 #51372
(#51602)
add bd890dfff2f [fix](load) fix concurrent read and write to runningTxnIds
(#51615)
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 (77ba7256e41)
\
N -- N -- N refs/heads/auto-pick-51615-branch-2.1 (bd890dfff2f)
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/common/config.cpp | 3 ++
be/src/common/config.h | 3 ++
be/src/common/daemon.cpp | 22 ++++++++++++
be/src/common/daemon.h | 1 +
be/src/olap/tablet.cpp | 23 +++++++++++++
be/src/olap/tablet.h | 3 ++
be/src/olap/tablet_manager.cpp | 16 +++++++++
be/src/olap/tablet_manager.h | 2 ++
be/src/olap/tablet_meta.cpp | 21 ++++++++++++
be/src/olap/tablet_meta.h | 4 +++
be/src/util/doris_metrics.cpp | 4 +++
be/src/util/doris_metrics.h | 2 ++
be/src/vec/functions/function_jsonb.cpp | 2 +-
be/test/vec/function/function_jsonb_test.cpp | 8 ++---
conf/lsan_suppr.conf | 3 ++
fe/fe-common/pom.xml | 4 +++
fe/pom.xml | 2 +-
fe/spark-dpp/pom.xml | 12 -------
.../data/json_p0/test_json_load_and_function.out | Bin 259759 -> 259751 bytes
.../test_json_load_unique_key_and_function.out | Bin 87037 -> 87033 bytes
.../data/jsonb_p0/test_jsonb_load_and_function.out | Bin 188471 -> 188467 bytes
.../test_jsonb_load_unique_key_and_function.out | Bin 124398 -> 124394 bytes
.../data/nereids_function_p0/scalar_function/J.out | Bin 160937 -> 160933 bytes
.../json_p0/test_json_load_and_function.out | Bin 136412 -> 136408 bytes
.../test_json_load_unique_key_and_function.out | Bin 87037 -> 87033 bytes
.../jsonb_p0/test_jsonb_load_and_function.out | Bin 182408 -> 182404 bytes
.../test_jsonb_load_unique_key_and_function.out | Bin 120029 -> 120025 bytes
.../json_functions/test_json_extract.out | Bin 0 -> 286 bytes
.../alter_p2/test_alter_table_property.groovy | 2 +-
.../load_p0/spark_load/test_spark_load.groovy | 10 +++---
.../json_functions/test_json_extract.groovy | 38 +++++++--------------
31 files changed, 136 insertions(+), 49 deletions(-)
create mode 100644
regression-test/data/query_p0/sql_functions/json_functions/test_json_extract.out
copy be/src/exec/schema_scanner/schema_scanner_helper.h =>
regression-test/suites/query_p0/sql_functions/json_functions/test_json_extract.groovy
(51%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
