update

Yukang-Lian · Jul 10, 2023 · 12ea5c4 · 12ea5c4
1 parent f696588
commit 12ea5c4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
@@ -3268,7 +3268,7 @@ Status Tablet::full_compaction_update_delete_bitmap(const RowsetSharedPtr& rowse
     for (const auto& it : _rs_version_map) {
         const int64_t& cur_version = it.first.first;
         const RowsetSharedPtr& published_rowset = it.second;
-        delete_bitmap.reset();
+        delete_bitmap->clear();
         if (cur_version > rowset->version().second) {
             LOG(INFO) << "[Full compaction published rowsets]"
                       << "[" << it.first.first << "-" << it.first.second << "]";

diff --git a/be/src/olap/tablet_meta.cpp b/be/src/olap/tablet_meta.cpp
@@ -26,6 +26,7 @@
 #include <json2pb/pb_to_json.h>
 #include <time.h>
 
+#include <mutex>
 #include <set>
 #include <utility>
 
@@ -931,6 +932,11 @@ void DeleteBitmap::remove(const BitmapKey& start, const BitmapKey& end) {
     }
 }
 
+void DeleteBitmap::clear() {
+    std::lock_guard l(lock);
+    delete_bitmap.clear();
+}
+
 bool DeleteBitmap::contains(const BitmapKey& bmk, uint32_t row_id) const {
     std::shared_lock l(lock);
     auto it = delete_bitmap.find(bmk);

diff --git a/be/src/olap/tablet_meta.h b/be/src/olap/tablet_meta.h
@@ -349,6 +349,11 @@ class DeleteBitmap {
      */
     void remove(const BitmapKey& lower_key, const BitmapKey& upper_key);
 
+    /**
+     * Clears all bitmaps
+     */
+    void clear();
+
     /**
      * Checks if the given row is marked deleted
      *