This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new cda18b83e5 [Fix](merge-on-write) Skip to check delete bitmap
correctness in commit phase if the current tablet is converting #24675 (#24757)
cda18b83e5 is described below
commit cda18b83e51fb66344737480b5a8958f67f2564a
Author: bobhan1 <[email protected]>
AuthorDate: Thu Sep 21 23:33:01 2023 +0800
[Fix](merge-on-write) Skip to check delete bitmap correctness in commit
phase if the current tablet is converting #24675 (#24757)
---
be/src/olap/delta_writer.cpp | 4 +++-
be/src/olap/tablet.cpp | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/be/src/olap/delta_writer.cpp b/be/src/olap/delta_writer.cpp
index 22ed65e0fc..2f77c031d2 100644
--- a/be/src/olap/delta_writer.cpp
+++ b/be/src/olap/delta_writer.cpp
@@ -511,7 +511,9 @@ Status DeltaWriter::wait_calc_delete_bitmap() {
Status DeltaWriter::commit_txn(const PSlaveTabletNodes& slave_tablet_nodes,
const bool write_single_replica) {
if (_tablet->enable_unique_key_merge_on_write() &&
- config::enable_merge_on_write_correctness_check &&
_cur_rowset->num_rows() != 0) {
+ config::enable_merge_on_write_correctness_check &&
_cur_rowset->num_rows() != 0 &&
+ !(_tablet->tablet_state() == TABLET_NOTREADY &&
+ SchemaChangeHandler::tablet_in_converting(_tablet->tablet_id()))) {
auto st = _tablet->check_delete_bitmap_correctness(
_delete_bitmap, _cur_rowset->end_version() - 1, _req.txn_id,
_rowset_ids);
if (!st.ok()) {
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index 217619d414..d2362d61db 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -3788,7 +3788,7 @@ Status
Tablet::check_delete_bitmap_correctness(DeleteBitmapPtr delete_bitmap, in
missing_rowsets_arr.PushBack(miss_value,
missing_rowsets_arr.GetAllocator());
}
- root.AddMember("requied_rowsets", required_rowsets_arr,
root.GetAllocator());
+ root.AddMember("required_rowsets", required_rowsets_arr,
root.GetAllocator());
root.AddMember("missing_rowsets", missing_rowsets_arr,
root.GetAllocator());
rapidjson::StringBuffer strbuf;
rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(strbuf);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
