Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaikulimu merged 6 commits into from
Jul 31, 2026
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc86c5f
Refactor[mqbs::FileStore]: Add setWriteHead to move the write cursor
kaikulimu Jul 30, 2026
2eccee3
Refactor[mqbs::FileStore]: sequenceNumber -> writeHeadSeqNum
kaikulimu Jul 30, 2026
66fb6a2
Refactor[mqbs::FileStore]: Encapsulate write-head seqNum increment
kaikulimu Jul 30, 2026
6e72d80
Refactor[mqbs::DataStore]: Order leaseId before seqNum in RecordKey
kaikulimu Jul 31, 2026
af5bc64
Refactor[mqbs::FileStore]: Harden incrementWriteHeadSeqNum precondition
kaikulimu Jul 31, 2026
2d98f43
PR#1673: Address feedback
kaikulimu Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/groups/mqb/mqbblp/mqbblp_recoverymanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <bsls_assert.h>

Check failure on line 16 in src/groups/mqb/mqbblp/mqbblp_recoverymanager.cpp

View workflow job for this annotation

GitHub Actions / C++ Linter Check

src/groups/mqb/mqbblp/mqbblp_recoverymanager.cpp:16:10 [clang-diagnostic-error] 

'bsls_assert.h' file not found
#include <mqbblp_recoverymanager.h>
#include <mqbs_filestoreprintutil.h>

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/groups/mqb/mqbblp/mqbblp_storagemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <ball_log.h>

Check failure on line 16 in src/groups/mqb/mqbblp/mqbblp_storagemanager.cpp

View workflow job for this annotation

GitHub Actions / C++ Linter Check

src/groups/mqb/mqbblp/mqbblp_storagemanager.cpp:16:10 [clang-diagnostic-error] 

'ball_log.h' file not found
#include <mqbblp_storagemanager.h>

#include <mqbscm_version.h>
Expand Down Expand Up @@ -364,7 +364,7 @@
: "**none**")
<< ", "
<< mqbs::printPSN(fs->writeHeadLeaseId(),
fs->sequenceNumber())
fs->writeHeadSeqNum())
<< ")";
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/groups/mqb/mqbc/mqbc_recoverymanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <ball_log.h>

Check failure on line 16 in src/groups/mqb/mqbc/mqbc_recoverymanager.cpp

View workflow job for this annotation

GitHub Actions / C++ Linter Check

src/groups/mqb/mqbc/mqbc_recoverymanager.cpp:16:10 [clang-diagnostic-error] 

'ball_log.h' file not found
#include <bsls_assert.h>
#include <mqbc_partitionfsm.h>
#include <mqbc_recoverymanager.h>
Expand Down Expand Up @@ -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() &&
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/groups/mqb/mqbc/mqbc_storagemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <ball_log.h>

Check failure on line 16 in src/groups/mqb/mqbc/mqbc_storagemanager.cpp

View workflow job for this annotation

GitHub Actions / C++ Linter Check

src/groups/mqb/mqbc/mqbc_storagemanager.cpp:16:10 [clang-diagnostic-error] 

'ball_log.h' file not found
#include <ball_logthrottle.h>
#include <bsls_assert.h>
#include <mqbc_storagemanager.h>
Expand Down Expand Up @@ -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,
Expand Down
9 changes: 5 additions & 4 deletions src/groups/mqb/mqbc/mqbc_storagemanager.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions src/groups/mqb/mqbc/mqbc_storageutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2134,8 +2134,8 @@ void StorageUtil::recoveredQueuesCb(
queueKey);
BSLS_ASSERT_SAFE(infoMapCit != queueKeyInfoMap->end());

const mqbs::DataStoreRecordKey current(handle.sequenceNum(),
handle.primaryLeaseId());
const mqbs::DataStoreRecordKey current(handle.primaryLeaseId(),
handle.sequenceNum());

const unsigned int numGhosts = infoMapCit->second.advanceAndCount(
current);
Expand Down Expand Up @@ -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 {
Expand All @@ -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());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/groups/mqb/mqbs/mqbs_datastore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ bsl::ostream& DataStoreRecordKey::print(bsl::ostream& stream,

bslim::Printer printer(&stream, level, spacesPerLevel);
printer.start();
printer.printAttribute("sequenceNum", d_sequenceNum);
printer.printAttribute("primaryLeaseId", d_primaryLeaseId);
printer.printAttribute("sequenceNum", d_sequenceNum);
printer.end();

return stream;
Expand Down
26 changes: 13 additions & 13 deletions src/groups/mqb/mqbs/mqbs_datastore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,10 @@ struct DataStoreRecord {
struct DataStoreRecordKey {
public:
// PUBLIC DATA
bsls::Types::Uint64 d_sequenceNum;

unsigned int d_primaryLeaseId;

bsls::Types::Uint64 d_sequenceNum;

@678098 678098 Jul 31, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now member alignment is not ideal:

d_primaryLeaseId - 4 bytes
[empty space] - 4 bytes
d_sequenceNum - 8 bytes

If only we could use 64bit type for leaseId too...

@kaikulimu kaikulimu Jul 31, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switched them back only in the data member declarations.


// TRAITS
BSLMF_NESTED_TRAIT_DECLARATION(DataStoreRecordKey,
bslmf::IsBitwiseEqualityComparable)
Expand All @@ -192,8 +192,8 @@ struct DataStoreRecordKey {
// CREATORS
DataStoreRecordKey();

DataStoreRecordKey(const bsls::Types::Uint64 sequenceNum,
unsigned int primaryLeaseId);
DataStoreRecordKey(unsigned int primaryLeaseId,
const bsls::Types::Uint64 sequenceNum);

@678098 678098 Jul 31, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const bsls::Types::Uint64 sequenceNum);
bsls::Types::Uint64 sequenceNum);

This is a basic type, no need to have const


// ACCESSORS

Expand Down Expand Up @@ -831,17 +831,17 @@ inline DataStoreRecord::DataStoreRecord(

// CREATORS
inline DataStoreRecordKey::DataStoreRecordKey()
: d_sequenceNum(0)
, d_primaryLeaseId(0)
: d_primaryLeaseId(0)
, d_sequenceNum(0)
{
// NOTHING
}

inline DataStoreRecordKey::DataStoreRecordKey(
const bsls::Types::Uint64 sequenceNum,
unsigned int primaryLeaseId)
: d_sequenceNum(sequenceNum)
, d_primaryLeaseId(primaryLeaseId)
unsigned int primaryLeaseId,
const bsls::Types::Uint64 sequenceNum)
: d_primaryLeaseId(primaryLeaseId)
, d_sequenceNum(sequenceNum)
{
// NOTHING
}
Expand All @@ -851,8 +851,8 @@ template <class HASH_ALGORITHM>
void hashAppend(HASH_ALGORITHM& hashAlgo, const mqbs::DataStoreRecordKey& key)
{
using bslh::hashAppend; // for ADL
hashAppend(hashAlgo, key.d_sequenceNum);
hashAppend(hashAlgo, key.d_primaryLeaseId);
hashAppend(hashAlgo, key.d_sequenceNum);
}

// --------------------------------
Expand All @@ -864,8 +864,8 @@ template <class TYPE>
inline DataStoreRecordKeyHashAlgo::result_type
DataStoreRecordKeyHashAlgo::operator()(const TYPE& type) const
{
return type.d_sequenceNum +
(static_cast<bsls::Types::Uint64>(type.d_primaryLeaseId) << 32);
return (static_cast<bsls::Types::Uint64>(type.d_primaryLeaseId) << 32) +
type.d_sequenceNum;
}

// -----------------------------
Expand Down
28 changes: 14 additions & 14 deletions src/groups/mqb/mqbs/mqbs_datastore.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
index % k_KEYS_PER_LEASE) +
1;

return mqbs::DataStoreRecordKey(sequenceNum, primaryLeaseId);
return mqbs::DataStoreRecordKey(primaryLeaseId, sequenceNum);
}

static void test1_breathingTest()
Expand Down Expand Up @@ -78,7 +78,7 @@
BMQTST_ASSERT_EQ(keyDefault.d_primaryLeaseId, 0U);

// Valued constructor
mqbs::DataStoreRecordKey keyValued(k_SEQUENCE_NUM, k_PRIMARY_LEASE_ID);
mqbs::DataStoreRecordKey keyValued(k_PRIMARY_LEASE_ID, k_SEQUENCE_NUM);
BMQTST_ASSERT_EQ(keyValued.d_sequenceNum, k_SEQUENCE_NUM);
BMQTST_ASSERT_EQ(keyValued.d_primaryLeaseId, k_PRIMARY_LEASE_ID);
}
Expand Down Expand Up @@ -324,7 +324,7 @@

bsls::Types::Int64 begin = bsls::TimeUtil::getTimer();
for (size_t i = 0; i < k_NUM_ITERATIONS; ++i) {
hasher(mqbs::DataStoreRecordKey(i, 7));
hasher(mqbs::DataStoreRecordKey(7, i));

Check failure on line 327 in src/groups/mqb/mqbs/mqbs_datastore.t.cpp

View workflow job for this annotation

GitHub Actions / C++ Linter Check

src/groups/mqb/mqbs/mqbs_datastore.t.cpp:327:41 [cppcoreguidelines-avoid-magic-numbers] 

7 is a magic number; consider replacing it with a named constant
}
bsls::Types::Int64 end = bsls::TimeUtil::getTimer();

Expand Down Expand Up @@ -357,7 +357,7 @@

bsls::Types::Int64 begin = bsls::TimeUtil::getTimer();
for (size_t i = 0; i < k_NUM_ITERATIONS; ++i) {
hasher(mqbs::DataStoreRecordKey(i, 7));
hasher(mqbs::DataStoreRecordKey(7, i));

Check failure on line 360 in src/groups/mqb/mqbs/mqbs_datastore.t.cpp

View workflow job for this annotation

GitHub Actions / C++ Linter Check

src/groups/mqb/mqbs/mqbs_datastore.t.cpp:360:41 [cppcoreguidelines-avoid-magic-numbers] 

7 is a magic number; consider replacing it with a named constant
}
bsls::Types::Int64 end = bsls::TimeUtil::getTimer();

Expand Down Expand Up @@ -390,15 +390,15 @@
k_NUM_ELEMS,
bmqtst::TestHelperUtil::allocator());
// Warmup
for (size_t i = 1; i <= 1000; ++i) {

Check failure on line 393 in src/groups/mqb/mqbs/mqbs_datastore.t.cpp

View workflow job for this annotation

GitHub Actions / C++ Linter Check

src/groups/mqb/mqbs/mqbs_datastore.t.cpp:393:29 [cppcoreguidelines-avoid-magic-numbers] 

1000 is a magic number; consider replacing it with a named constant
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(i, 7), i));
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(7, i), i));
}

ht.clear();

bsls::Types::Int64 begin = bsls::TimeUtil::getTimer();
for (size_t i = 1; i <= k_NUM_ELEMS; ++i) {
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(i, 7), i));
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(7, i), i));
}
bsls::Types::Int64 end = bsls::TimeUtil::getTimer();

Expand Down Expand Up @@ -434,15 +434,15 @@
ht(k_NUM_ELEMS, bmqtst::TestHelperUtil::allocator());

// Warmup
for (size_t i = 1; i <= 1000; ++i) {

Check failure on line 437 in src/groups/mqb/mqbs/mqbs_datastore.t.cpp

View workflow job for this annotation

GitHub Actions / C++ Linter Check

src/groups/mqb/mqbs/mqbs_datastore.t.cpp:437:29 [cppcoreguidelines-avoid-magic-numbers] 

1000 is a magic number; consider replacing it with a named constant
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(i, 7), i));
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(7, i), i));
}

ht.clear();

bsls::Types::Int64 begin = bsls::TimeUtil::getTimer();
for (size_t i = 1; i <= k_NUM_ELEMS; ++i) {
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(i, 7), i));
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(7, i), i));
}
bsls::Types::Int64 end = bsls::TimeUtil::getTimer();

Expand Down Expand Up @@ -479,7 +479,7 @@
// same as: bslh::Hash<> hasher;
for (auto _ : state) {
for (int i = 0; i < state.range(); ++i) {
hasher(mqbs::DataStoreRecordKey(i, 7));
hasher(mqbs::DataStoreRecordKey(7, i));
}
}
}
Expand All @@ -503,7 +503,7 @@

for (auto _ : state) {
for (int i = 0; i < state.range(0); ++i) {
hasher(mqbs::DataStoreRecordKey(i, 7));
hasher(mqbs::DataStoreRecordKey(7, i));
}
}
}
Expand All @@ -529,14 +529,14 @@
bmqtst::TestHelperUtil::allocator());
// Warmup
for (size_t i = 1; i <= 1000; ++i) {
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(i, 7), i));
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(7, i), i));
}

ht.clear();

for (auto _ : state) {
for (int i = 1; i <= state.range(0); ++i) {
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(i, 7), i));
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(7, i), i));
}
}
}
Expand Down Expand Up @@ -564,13 +564,13 @@

// Warmup
for (size_t i = 1; i <= 1000; ++i) {
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(i, 7), i));
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(7, i), i));
}

ht.clear();
for (auto _ : state) {
for (int i = 1; i <= state.range(0); ++i) {
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(i, 7), i));
ht.insert(bsl::make_pair(mqbs::DataStoreRecordKey(7, i), i));
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/groups/mqb/mqbs/mqbs_filebackedstorage.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ class MockDataStore : public mqbs::DataStore {
reinterpret_cast<mqbs::DataStoreConfig::RecordIterator*>(handle);

InsertRc insertRc = d_records.insert(bsl::make_pair(
mqbs::DataStoreRecordKey(sequenceNum, primaryLeaseId),
mqbs::DataStoreRecordKey(primaryLeaseId, sequenceNum),
mqbs::DataStoreRecord(recType, recOffset)));

// Needed for FileBackedStorage::gcExpiredMessages
Expand Down Expand Up @@ -316,7 +316,7 @@ class MockDataStore : public mqbs::DataStore {
reinterpret_cast<mqbs::DataStoreConfig::RecordIterator*>(handle);

InsertRc insertRc = d_records.insert(bsl::make_pair(
mqbs::DataStoreRecordKey(sequenceNum, primaryLeaseId),
mqbs::DataStoreRecordKey(primaryLeaseId, sequenceNum),
mqbs::DataStoreRecord(recType, recOffset)));

*iter = insertRc.first;
Expand Down Expand Up @@ -860,7 +860,7 @@ BMQTST_TEST_F(Test, supportedOperations)

{
const bsls::Types::Uint64 k_SEQUENCE_NUM = 1024;
mqbs::DataStoreRecordKey key(k_SEQUENCE_NUM, k_PRIMARY_LEASE_ID);
mqbs::DataStoreRecordKey key(k_PRIMARY_LEASE_ID, k_SEQUENCE_NUM);
const mqbs::RecordType::Enum k_RECORD_TYPE =
mqbs::RecordType::e_MESSAGE;
mqbs::DataStoreRecord record(k_RECORD_TYPE, k_RECORD_OFFSET);
Expand All @@ -873,7 +873,7 @@ BMQTST_TEST_F(Test, supportedOperations)

{
const bsls::Types::Uint64 k_SEQUENCE_NUM = 1025;
mqbs::DataStoreRecordKey key(k_SEQUENCE_NUM, k_PRIMARY_LEASE_ID);
mqbs::DataStoreRecordKey key(k_PRIMARY_LEASE_ID, k_SEQUENCE_NUM);
const mqbs::RecordType::Enum k_RECORD_TYPE =
mqbs::RecordType::e_CONFIRM;
mqbs::DataStoreRecord record(k_RECORD_TYPE, k_RECORD_OFFSET);
Expand All @@ -889,7 +889,7 @@ BMQTST_TEST_F(Test, supportedOperations)

{
const bsls::Types::Uint64 k_SEQUENCE_NUM = 1026;
mqbs::DataStoreRecordKey key(k_SEQUENCE_NUM, k_PRIMARY_LEASE_ID);
mqbs::DataStoreRecordKey key(k_PRIMARY_LEASE_ID, k_SEQUENCE_NUM);
const mqbs::RecordType::Enum k_RECORD_TYPE =
mqbs::RecordType::e_DELETION;
mqbs::DataStoreRecord record(k_RECORD_TYPE, k_RECORD_OFFSET);
Expand Down Expand Up @@ -1865,7 +1865,7 @@ BMQTST_TEST_F(Test, addQueueOpRecordHandle)
const mqbs::RecordType::Enum k_RECORD_TYPE = mqbs::RecordType::e_QUEUE_OP;
const bsls::Types::Uint64 k_RECORD_OFFSET = 4096;

mqbs::DataStoreRecordKey key(k_SEQUENCE_NUM, k_PRIMARY_LEASE_ID);
mqbs::DataStoreRecordKey key(k_PRIMARY_LEASE_ID, k_SEQUENCE_NUM);
mqbs::DataStoreRecord record(k_RECORD_TYPE, k_RECORD_OFFSET);
mqbs::DataStoreRecordHandle handle;
d_tester.insertDataStoreRecord(&handle, key, record);
Expand Down
Loading
Loading