From d4e66ba48eb2867395497e904bc631e5beeca9c3 Mon Sep 17 00:00:00 2001 From: Chen Zhang Date: Fri, 31 May 2024 19:43:10 +0800 Subject: [PATCH] fix --- be/src/olap/base_tablet.cpp | 4 +++- be/src/olap/base_tablet.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/be/src/olap/base_tablet.cpp b/be/src/olap/base_tablet.cpp index 12352058f8aad6..be5aeeb4e4c8ee 100644 --- a/be/src/olap/base_tablet.cpp +++ b/be/src/olap/base_tablet.cpp @@ -1114,7 +1114,7 @@ void BaseTablet::_remove_sentinel_mark_from_delete_bitmap(DeleteBitmapPtr delete } } -Status BaseTablet::update_delete_bitmap(const BaseTabletSPtr& self, const TabletTxnInfo* txn_info, +Status BaseTablet::update_delete_bitmap(const BaseTabletSPtr& self, TabletTxnInfo* txn_info, int64_t txn_id, int64_t txn_expiration) { SCOPED_BVAR_LATENCY(g_tablet_update_delete_bitmap_latency); RowsetIdUnorderedSet cur_rowset_ids; @@ -1222,6 +1222,8 @@ Status BaseTablet::update_delete_bitmap(const BaseTabletSPtr& self, const Tablet RowsetSharedPtr transient_rowset; RETURN_IF_ERROR(transient_rs_writer->build(transient_rowset)); rowset->rowset_meta()->merge_rowset_meta(*transient_rowset->rowset_meta()); + // update the shared_ptr to new bitmap, which is consistent with current rowset. + txn_info->delete_bitmap = delete_bitmap; // erase segment cache cause we will add a segment to rowset SegmentLoader::instance()->erase_segments(rowset->rowset_id(), rowset->num_segments()); diff --git a/be/src/olap/base_tablet.h b/be/src/olap/base_tablet.h index 7043df6a25af2d..20560165dd9786 100644 --- a/be/src/olap/base_tablet.h +++ b/be/src/olap/base_tablet.h @@ -210,7 +210,7 @@ class BaseTablet { const Rowset& rowset, std::shared_ptr partial_update_info, int64_t txn_expiration = 0) = 0; - static Status update_delete_bitmap(const BaseTabletSPtr& self, const TabletTxnInfo* txn_info, + static Status update_delete_bitmap(const BaseTabletSPtr& self, TabletTxnInfo* txn_info, int64_t txn_id, int64_t txn_expiration = 0); virtual Status save_delete_bitmap(const TabletTxnInfo* txn_info, int64_t txn_id,