diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp index 555e149f5b..219f0f7e11 100644 --- a/be/src/olap/tablet.cpp +++ b/be/src/olap/tablet.cpp @@ -2410,15 +2410,14 @@ Status Tablet::calc_delete_bitmap(RowsetId rowset_id, RowLocation loc; // first check if exist in pre segment if (check_pre_segments) { - auto st = _check_pk_in_pre_segments(rowset_id, pre_segments, key, dummy_version, - delete_bitmap, &loc); + auto st = _check_pk_in_pre_segments(rowset_id, pre_segments, key, delete_bitmap, + &loc); if (st.ok()) { - delete_bitmap->add({rowset_id, loc.segment_id, dummy_version.first}, - loc.row_id); + delete_bitmap->add({rowset_id, loc.segment_id, 0}, loc.row_id); ++row_id; continue; } else if (st.is()) { - delete_bitmap->add({rowset_id, seg->id(), dummy_version.first}, row_id); + delete_bitmap->add({rowset_id, seg->id(), 0}, row_id); ++row_id; continue; } @@ -2467,15 +2466,14 @@ Status Tablet::calc_delete_bitmap(RowsetId rowset_id, Status Tablet::_check_pk_in_pre_segments( RowsetId rowset_id, const std::vector& pre_segments, - const Slice& key, const Version& version, DeleteBitmapPtr delete_bitmap, RowLocation* loc) { + const Slice& key, DeleteBitmapPtr delete_bitmap, RowLocation* loc) { for (auto it = pre_segments.rbegin(); it != pre_segments.rend(); ++it) { auto st = (*it)->lookup_row_key(key, loc); CHECK(st.ok() || st.is() || st.is()); if (st.is()) { continue; } else if (st.ok() && _schema->has_sequence_col() && - delete_bitmap->contains({rowset_id, loc->segment_id, version.first}, - loc->row_id)) { + delete_bitmap->contains({rowset_id, loc->segment_id, 0}, loc->row_id)) { // if has sequence col, we continue to compare the sequence_id of // all segments, util we find an existing key. continue; diff --git a/be/src/olap/tablet.h b/be/src/olap/tablet.h index 7d079ebea9..3b69a3fd0e 100644 --- a/be/src/olap/tablet.h +++ b/be/src/olap/tablet.h @@ -442,8 +442,8 @@ private: Status _check_pk_in_pre_segments(RowsetId rowset_id, const std::vector& pre_segments, - const Slice& key, const Version& version, - DeleteBitmapPtr delete_bitmap, RowLocation* loc); + const Slice& key, DeleteBitmapPtr delete_bitmap, + RowLocation* loc); void _rowset_ids_difference(const RowsetIdUnorderedSet& cur, const RowsetIdUnorderedSet& pre, RowsetIdUnorderedSet* to_add, RowsetIdUnorderedSet* to_del); Status _load_rowset_segments(const RowsetSharedPtr& rowset,