Fix lock.

infiniflow · Dec 17, 2024 · a62f973 · a62f973
1 parent a94a50b
commit a62f973
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/src/storage/meta/entry/table_index_entry.cpp b/src/storage/meta/entry/table_index_entry.cpp
@@ -479,15 +479,25 @@ Vector<String> TableIndexEntry::GetFilePath(TransactionID txn_id, TxnTimeStamp b
 
 void TableIndexEntry::PickCleanup(CleanupScanner *scanner) {
     TxnTimeStamp visible_ts = scanner->visible_ts();
-    std::shared_lock r_lock(rw_locker_);
-    for (auto iter = index_by_segment_.begin(); iter != index_by_segment_.end();) {
-        auto &[segment_id, segment_index_entry] = *iter;
-        if (segment_index_entry->CheckDeprecate(visible_ts)) {
-            scanner->AddEntry(std::move(segment_index_entry));
-            iter = index_by_segment_.erase(iter);
-        } else {
-            segment_index_entry->PickCleanup(scanner);
-            ++iter;
+    Vector<SegmentID> segment_ids;
+    {
+        std::shared_lock r_lock(rw_locker_);
+        for (auto iter = index_by_segment_.begin(); iter != index_by_segment_.end();) {
+            auto &[segment_id, segment_index_entry] = *iter;
+            if (segment_index_entry->CheckDeprecate(visible_ts)) {
+                scanner->AddEntry(std::move(segment_index_entry));
+                segment_ids.push_back(segment_id);
+                ++iter;
+            } else {
+                segment_index_entry->PickCleanup(scanner);
+                ++iter;
+            }
+        }
+    }
+    if (!segment_ids.empty()) {
+        std::unique_lock w_lock(rw_locker_);
+        for (auto segment_id : segment_ids) {
+            index_by_segment_.erase(segment_id);
         }
     }
 }