Refactor[mqbs::FileStore]: Encapsulate write-head cursor accessors

src/groups/mqb/mqbblp/mqbblp_recoverymanager.cpp

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include <bsls_assert.h>
 #include <mqbblp_recoverymanager.h>
 #include <mqbs_filestoreprintutil.h>
 
@@ -2011,7 +2011,7 @@
 
     bmqp_ctrlmsg::PartitionSequenceNumber selfSequenceNum;
     selfSequenceNum.primaryLeaseId() = fs->writeHeadLeaseId();
-    selfSequenceNum.sequenceNumber() = fs->sequenceNumber();
+    selfSequenceNum.sequenceNumber() = fs->writeHeadSeqNum();
 
     const FileTransferInfo& fti = primarySyncCtx->fileTransferInfo();
 
@@ -4373,7 +4373,7 @@
 
     bmqp_ctrlmsg::PartitionSequenceNumber tmp;
     tmp.primaryLeaseId() = fs->writeHeadLeaseId();
-    tmp.sequenceNumber() = fs->sequenceNumber();
+    tmp.sequenceNumber() = fs->writeHeadSeqNum();
     primarySyncCtx.setSelfPartitionSequenceNum(tmp);
 
     if (!fs->syncPoints().empty()) {
@@ -4469,7 +4469,7 @@
 
     response.partitionId()    = req.partitionId();
     response.primaryLeaseId() = fs->writeHeadLeaseId();
-    response.sequenceNum()    = fs->sequenceNumber();
+    response.sequenceNum()    = fs->writeHeadSeqNum();
     if (!fs->syncPoints().empty()) {
         response.lastSyncPointOffsetPair() = fs->syncPoints().back();
     }
@@ -4578,7 +4578,7 @@
 
     bmqp_ctrlmsg::PartitionSequenceNumber selfPSN;
     selfPSN.primaryLeaseId() = fs->writeHeadLeaseId();
-    selfPSN.sequenceNumber() = fs->sequenceNumber();
+    selfPSN.sequenceNumber() = fs->writeHeadSeqNum();
 
     if (requesterUptoPSN <= requesterPSN) {
         BALL_LOG_WARN << d_clusterData_p->identity().description()

src/groups/mqb/mqbblp/mqbblp_storagemanager.cpp

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include <ball_log.h>
 #include <mqbblp_storagemanager.h>
 
 #include <mqbscm_version.h>
@@ -364,7 +364,7 @@
                                      : "**none**")
                     << ", "
                     << mqbs::printPSN(fs->writeHeadLeaseId(),
-                                      fs->sequenceNumber())
+                                      fs->writeHeadSeqNum())
                     << ")";
             }
         }

src/groups/mqb/mqbc/mqbc_recoverymanager.cpp

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include <ball_log.h>
 #include <bsls_assert.h>
 #include <mqbc_partitionfsm.h>
 #include <mqbc_recoverymanager.h>
@@ -232,7 +232,7 @@
         BSLS_ASSERT_SAFE(receiveDataCtx.d_currPSN.primaryLeaseId() ==
                          fs.writeHeadLeaseId());
         BSLS_ASSERT_SAFE(receiveDataCtx.d_currPSN.sequenceNumber() ==
-                         fs.sequenceNumber());
+                         fs.writeHeadSeqNum());
     }
     else {
         BSLS_ASSERT_SAFE(recoveryCtx.d_mappedJournalFd.isValid() &&
@@ -646,12 +646,12 @@
         BSLS_ASSERT_SAFE(receiveDataCtx.d_currPSN.primaryLeaseId() ==
                          fs->writeHeadLeaseId());
         BSLS_ASSERT_SAFE(receiveDataCtx.d_currPSN.sequenceNumber() ==
-                         fs->sequenceNumber());
+                         fs->writeHeadSeqNum());
 
         fs->processStorageEvent(blob, true /* isPartitionSyncEvent */, source);
 
         receiveDataCtx.d_currPSN.primaryLeaseId() = fs->writeHeadLeaseId();
-        receiveDataCtx.d_currPSN.sequenceNumber() = fs->sequenceNumber();
+        receiveDataCtx.d_currPSN.sequenceNumber() = fs->writeHeadSeqNum();
 
         if (receiveDataCtx.d_currPSN == receiveDataCtx.d_endPSN) {
             receiveDataCtx.d_expectChunks = false;

src/groups/mqb/mqbc/mqbc_storagemanager.cpp

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include <ball_log.h>
 #include <ball_logthrottle.h>
 #include <bsls_assert.h>
 #include <mqbc_storagemanager.h>
@@ -1925,7 +1925,7 @@
     BSLS_ASSERT_SAFE(fs);
     if (fs->isOpen()) {
         nodePSNCtx.d_PSN.primaryLeaseId() = fs->writeHeadLeaseId();
-        nodePSNCtx.d_PSN.sequenceNumber() = fs->sequenceNumber();
+        nodePSNCtx.d_PSN.sequenceNumber() = fs->writeHeadSeqNum();
     }
     else {
         const int rc = d_recoveryManager_mp->recoverPSN(&nodePSNCtx.d_PSN,

src/groups/mqb/mqbc/mqbc_storagemanager.t.cpp

@@ -2924,7 +2924,7 @@ static void test18_primaryHealingWatchdogRetry()
     const int k_PRIMARY_LEASE_ID =
         storageManager.fileStore(k_PARTITION_ID).writeHeadLeaseId();
     const int k_PRIMARY_SEQ_NUM =
-        storageManager.fileStore(k_PARTITION_ID).sequenceNumber();
+        storageManager.fileStore(k_PARTITION_ID).writeHeadSeqNum();
 
     static const int             k_REQUEST_ID = 1;
     bmqp_ctrlmsg::ControlMessage message;
@@ -3555,7 +3555,7 @@ static void test23_replicaHealingReceivesReplicaDataRqstDropInvalidPid()
 
     // 5. Send a storage event (PUT) and verify it is buffered, not processed
     const bsls::Types::Uint64 seqNumBefore =
-        storageManager.fileStore(k_PARTITION_ID).sequenceNumber();
+        storageManager.fileStore(k_PARTITION_ID).writeHeadSeqNum();
 
     bmqp::StorageEventBuilder seb(mqbs::FileStoreProtocol::k_VERSION,
                                   bmqp::EventType::e_STORAGE,
@@ -3593,8 +3593,9 @@ static void test23_replicaHealingReceivesReplicaDataRqstDropInvalidPid()
 
     // Sequence number has not advanced; this proves that we did not process
     // the PUT.
-    BMQTST_ASSERT_EQ(storageManager.fileStore(k_PARTITION_ID).sequenceNumber(),
-                     seqNumBefore);
+    BMQTST_ASSERT_EQ(
+        storageManager.fileStore(k_PARTITION_ID).writeHeadSeqNum(),
+        seqNumBefore);
 
     BMQTST_ASSERT_EQ(storageManager.partitionHealthState(k_PARTITION_ID),
                      mqbc::PartitionFSM::State::e_REPLICA_HEALING);

src/groups/mqb/mqbc/mqbc_storageutil.cpp

@@ -3735,7 +3735,7 @@ void StorageUtil::forceIssueAdvisoryAndSyncPt(mqbc::ClusterData*   clusterData,
                       << fs->config().partitionId()
                       << "]: successfully issued a forced SyncPt: "
                       << mqbs::printPSN(fs->writeHeadLeaseId(),
-                                        fs->sequenceNumber())
+                                        fs->writeHeadSeqNum())
                       << ".";
     }
     else {
@@ -3744,7 +3744,7 @@ void StorageUtil::forceIssueAdvisoryAndSyncPt(mqbc::ClusterData*   clusterData,
                        << "]: failed to force-issue SyncPt, rc: " << rc
                        << ", current PSN: "
                        << mqbs::printPSN(fs->writeHeadLeaseId(),
-                                         fs->sequenceNumber());
+                                         fs->writeHeadSeqNum());
     }
 }