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
commit d11df13ab2a7307d91b4c0b9106a15ed3c235aa0
Author: zhannngchen <48427519+zhannngc...@users.noreply.github.com>
AuthorDate: Tue Aug 22 10:53:50 2023 +0800
[fix](merge-on-write) process error of delete bitmap calculation (#23285)
---
be/src/olap/tablet.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index 78c43c80ca..e6314365ad 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -3229,8 +3229,8 @@ Status Tablet::update_delete_bitmap_without_lock(const
RowsetSharedPtr& rowset)
auto token =
StorageEngine::instance()->calc_delete_bitmap_executor()->create_token();
RETURN_IF_ERROR(calc_delete_bitmap(rowset, segments, specified_rowsets,
delete_bitmap,
cur_version - 1, token.get()));
- token->wait();
- token->get_delete_bitmap(delete_bitmap);
+ RETURN_IF_ERROR(token->wait());
+ RETURN_IF_ERROR(token->get_delete_bitmap(delete_bitmap));
size_t total_rows = std::accumulate(
segments.begin(), segments.end(), 0,
[](size_t sum, const segment_v2::SegmentSharedPtr& s) { return sum
+= s->num_rows(); });
@@ -3330,8 +3330,8 @@ Status Tablet::update_delete_bitmap(const
RowsetSharedPtr& rowset,
auto token =
StorageEngine::instance()->calc_delete_bitmap_executor()->create_token();
RETURN_IF_ERROR(calc_delete_bitmap(rowset, segments, specified_rowsets,
delete_bitmap,
cur_version - 1, token.get(),
rowset_writer));
- token->wait();
- token->get_delete_bitmap(delete_bitmap);
+ RETURN_IF_ERROR(token->wait());
+ RETURN_IF_ERROR(token->get_delete_bitmap(delete_bitmap));
size_t total_rows = std::accumulate(
segments.begin(), segments.end(), 0,
[](size_t sum, const segment_v2::SegmentSharedPtr& s) { return sum
+= s->num_rows(); });
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
