Merge branch 'main' into lua-modules

dragonflydb · Sep 8, 2022 · 1495aee · 1495aee
2 parents 8e5bdf1 + cfa1265
commit 1495aee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/server/db_slice.cc b/src/server/db_slice.cc
@@ -294,7 +294,8 @@ pair<PrimeIterator, ExpireIterator> DbSlice::FindExt(DbIndex db_ind, string_view
         }
       };
 
-      db.prime.CVCUponBump(change_cb_.front().first, res.first, bump_cb);
+      //
+      db.prime.CVCUponBump(change_cb_.back().first, res.first, bump_cb);
     }
 
     res.first = db.prime.BumpUp(res.first, PrimeBumpPolicy{});

diff --git a/src/server/db_slice.h b/src/server/db_slice.h
@@ -289,6 +289,7 @@ class DbSlice {
   // Used in temporary computations in Acquire/Release.
   absl::flat_hash_set<std::string_view> uniq_keys_;
 
+  // ordered from the smallest to largest version.
   std::vector<std::pair<uint64_t, ChangeCallback>> change_cb_;
 };
-Original file line number
+Diff line change
@@ Expand Up @@
             }
           };
-          db.prime.CVCUponBump(change_cb_.front().first, res.first, bump_cb);
+          //
+          db.prime.CVCUponBump(change_cb_.back().first, res.first, bump_cb);
         }
         res.first = db.prime.BumpUp(res.first, PrimeBumpPolicy{});
@@ Expand Down @@