zhannngchen commented on code in PR #49383: URL: https://github.com/apache/doris/pull/49383#discussion_r2038771282
########## be/src/olap/tablet.cpp: ########## @@ -862,6 +870,12 @@ void Tablet::delete_expired_stale_rowset() { Version version(start_version, end_version); version_to_delete.emplace_back(version.to_string()); to_delete_iter++; + + // add remove delete bitmap + if (!remove_delete_bitmap_key_ranges.empty()) { + _engine.add_unused_delete_bitmap_key_ranges(tablet_id(), remove_rowset_ids, + remove_delete_bitmap_key_ranges); + } } _tablet_meta->delete_bitmap().remove_stale_delete_bitmap_from_queue(version_to_delete); Review Comment: we don't need to call this method any more, remove it ########## be/src/olap/base_tablet.cpp: ########## @@ -1768,6 +1768,49 @@ Status BaseTablet::update_delete_bitmap_without_lock( return Status::OK(); } +void BaseTablet::agg_delete_bitmap_for_stale_rowsets( + Version version, DeleteBitmapKeyRanges& remove_delete_bitmap_key_ranges) { + if (!config::enable_agg_and_remove_pre_rowsets_delete_bitmap) { + return; + } + if (!(keys_type() == UNIQUE_KEYS && enable_unique_key_merge_on_write())) { + return; + } + int64_t start_version = version.first; + int64_t end_version = version.second; + DCHECK(start_version < end_version) + << ". start_version: " << start_version << ", end_version: " << end_version; + // get pre rowsets + std::vector<RowsetSharedPtr> pre_rowsets {}; + for (const auto& it2 : _rs_version_map) { Review Comment: should hold reader lock of `_meta_lock`? ########## be/src/cloud/cloud_meta_mgr.cpp: ########## @@ -1298,17 +1302,25 @@ Status CloudMetaMgr::cloud_update_delete_bitmap_without_lock(const CloudTablet& req.set_tablet_id(tablet.tablet_id()); // use a fake lock id to resolve compatibility issues req.set_lock_id(-3); - req.set_unlock(true); + req.set_without_lock(true); for (auto& [key, bitmap] : delete_bitmap->delete_bitmap) { req.add_rowset_ids(std::get<0>(key).to_string()); req.add_segment_ids(std::get<1>(key)); req.add_versions(std::get<2>(key)); + DCHECK(pre_rowset_agg_end_version > 0 ? pre_rowset_agg_end_version == std::get<2>(key) Review Comment: ```suggestion DCHECK(pre_rowset_agg_end_version <= 0 || pre_rowset_agg_end_version == std::get<2>(key)) ``` ########## be/src/olap/tablet.cpp: ########## @@ -875,6 +884,23 @@ void Tablet::delete_expired_stale_rowset() { << " old_meta_size=" << old_meta_size << " sweep endtime " << std::fixed << expired_stale_sweep_endtime << ", reconstructed=" << reconstructed; } + if (!deleted_stale_rowsets.empty()) { Review Comment: show check if the table is mow, as same as the logic in `cloud_tablet.cpp` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org