Merge branch 'neo'

* neo: MB-51805: Pass persistedPrepareSeqno(maxPrepareSeqno) into VBucket Change-Id: I19964bea884fcbd4dd94ea54830c17d40b60ac0c
couchbase · Jun 7, 2022 · b532ea1 · b532ea1
2 parents cbedc2a + 4c7d312
commit b532ea1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/engines/ep/src/ep_bucket.cc b/engines/ep/src/ep_bucket.cc
@@ -1639,7 +1639,8 @@ VBucketPtr EPBucket::makeVBucket(
                           hlcEpochSeqno,
                           mightContainXattrs,
                           replicationTopology,
-                          maxVisibleSeqno),
+                          maxVisibleSeqno,
+                          maxPrepareSeqno),
             VBucket::DeferredDeleter(engine)};
 }
 

diff --git a/engines/ep/src/ep_vb.cc b/engines/ep/src/ep_vb.cc
@@ -69,7 +69,8 @@ EPVBucket::EPVBucket(Vbid i,
                      int64_t hlcEpochSeqno,
                      bool mightContainXattrs,
                      const nlohmann::json* replicationTopology,
-                     uint64_t maxVisibleSeqno)
+                     uint64_t maxVisibleSeqno,
+                     uint64_t maxPrepareSeqno)
     : VBucket(i,
               newState,
               st,
@@ -95,7 +96,8 @@ EPVBucket::EPVBucket(Vbid i,
               hlcEpochSeqno,
               mightContainXattrs,
               replicationTopology,
-              maxVisibleSeqno),
+              maxVisibleSeqno,
+              maxPrepareSeqno),
       shard(kvshard),
       rangeScans(bucket ? static_cast<EPBucket*>(bucket)->getReadyRangeScans()
                         : nullptr) {

diff --git a/engines/ep/src/ep_vb.h b/engines/ep/src/ep_vb.h
@@ -53,7 +53,8 @@ class EPVBucket : public VBucket {
               int64_t hlcEpochSeqno = HlcCasSeqnoUninitialised,
               bool mightContainXattrs = false,
               const nlohmann::json* replicationTopology = {},
-              uint64_t maxVisibleSeqno = 0);
+              uint64_t maxVisibleSeqno = 0,
+              uint64_t maxPrepareSeqno = 0);
 
     ~EPVBucket() override;
 

diff --git a/engines/ep/src/vbucket.cc b/engines/ep/src/vbucket.cc
@@ -193,7 +193,8 @@ VBucket::VBucket(Vbid i,
                  int64_t hlcEpochSeqno,
                  bool mightContainXattrs,
                  const nlohmann::json* replTopology,
-                 uint64_t maxVisibleSeqno)
+                 uint64_t maxVisibleSeqno,
+                 uint64_t maxPrepareSeqno)
     : ht(st, std::move(valFact), config.getHtSize(), config.getHtLocks()),
       failovers(std::move(table)),
       opsCreate(0),

diff --git a/engines/ep/src/vbucket.h b/engines/ep/src/vbucket.h
@@ -194,7 +194,8 @@ class VBucket : public std::enable_shared_from_this<VBucket> {
             int64_t hlcEpochSeqno = HlcCasSeqnoUninitialised,
             bool mightContainXattrs = false,
             const nlohmann::json* replTopology = {},
-            uint64_t maxVisibleSeqno = 0);
+            uint64_t maxVisibleSeqno = 0,
+            uint64_t maxPrepareSeqno = 0);
 
     virtual ~VBucket();