Skip to content

Fix default allocator usage on Solaris in mqbs_filestoreprotocolutil test #1209

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
hallfox merged 1 commit into from
Mar 20, 2026
Merged

Fix default allocator usage on Solaris in mqbs_filestoreprotocolutil test #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/groups/mqb/mqbs/mqbs_filestoreprotocolutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,15 @@ void FileStoreProtocolUtil::loadAppInfos(
const char* appIdBegin = appIdsBlock.base() + offset +
sizeof(AppIdHeader);

appIdKeyPairs->insert(bsl::make_pair(
bslma::Allocator* alloc = appIdKeyPairs->get_allocator();
mqbi::Storage::AppInfos::value_type appIdKeyPair(
bsl::string(appIdBegin,
paddedLen - appIdBegin[paddedLen - 1],
appIdKeyPairs->get_allocator()),
alloc),
mqbu::StorageKey(mqbu::StorageKey::BinaryRepresentation(),
appIdBegin + paddedLen)));
appIdBegin + paddedLen),
alloc);
appIdKeyPairs->insert(appIdKeyPair);

// Move to beginning of next AppIdHeader.
offset += sizeof(AppIdHeader) + paddedLen +
Expand Down
46 changes: 21 additions & 25 deletions src/groups/mqb/mqbs/mqbs_filestoreprotocolutil.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,21 +525,22 @@ static void test4_loadAppInfos()
{
typedef mqbi::Storage::AppInfos AppInfos;

bslma::Allocator* alloc = bmqtst::TestHelperUtil::allocator();

{
// No appIds.

char* p = static_cast<char*>(
bmqtst::TestHelperUtil::allocator()->allocate(1));
char* p = static_cast<char*>(alloc->allocate(1));
mqbs::MemoryBlock mb(p, 1);
AppInfos appIdKeyPairs(bmqtst::TestHelperUtil::allocator());
AppInfos appIdKeyPairs(alloc);

mqbs::FileStoreProtocolUtil::loadAppInfos(&appIdKeyPairs,
mb,
0); // no appIds

BMQTST_ASSERT_EQ(0u, appIdKeyPairs.size());

bmqtst::TestHelperUtil::allocator()->deallocate(p);
alloc->deallocate(p);
}

{
Expand All @@ -550,8 +551,7 @@ static void test4_loadAppInfos()
const size_t numPaddingBytes = 3;
const size_t totalSize = sizeof(mqbs::AppIdHeader) + paddedAppIdLen +
mqbs::FileStoreProtocol::k_HASH_LENGTH;
char* p = static_cast<char*>(
bmqtst::TestHelperUtil::allocator()->allocate(totalSize));
char* p = static_cast<char*>(alloc->allocate(totalSize));
size_t offset = 0;

// Append AppIdHeader.
Expand All @@ -563,7 +563,7 @@ static void test4_loadAppInfos()
offset += sizeof(mqbs::AppIdHeader);

// Append AppId.
bsl::string appId(appIdLen, 'g', bmqtst::TestHelperUtil::allocator());
bsl::string appId(appIdLen, 'g', alloc);
bsl::memcpy(p + offset, appId.c_str(), appIdLen);
offset += appIdLen;

Expand All @@ -586,7 +586,7 @@ static void test4_loadAppInfos()

// Test.
mqbs::MemoryBlock mb(p, totalSize);
AppInfos appIdKeyPairs(bmqtst::TestHelperUtil::allocator());
AppInfos appIdKeyPairs(alloc);

mqbs::FileStoreProtocolUtil::loadAppInfos(&appIdKeyPairs,
mb,
Expand All @@ -596,19 +596,17 @@ static void test4_loadAppInfos()
BMQTST_ASSERT_EQ(appId, appIdKeyPairs.begin()->first);
BMQTST_ASSERT_EQ(appKey, appIdKeyPairs.begin()->second);

bmqtst::TestHelperUtil::allocator()->deallocate(p);
alloc->deallocate(p);
}

{
// 6 appId/appKey pair.
const int numAppIds = 6;
size_t totalSize = 0;

bsl::vector<size_t> appIdLenVec(bmqtst::TestHelperUtil::allocator());
bsl::vector<size_t> paddedAppIdLenVec(
bmqtst::TestHelperUtil::allocator());
bsl::vector<size_t> numPaddingBytesVec(
bmqtst::TestHelperUtil::allocator());
bsl::vector<size_t> appIdLenVec(alloc);
bsl::vector<size_t> paddedAppIdLenVec(alloc);
bsl::vector<size_t> numPaddingBytesVec(alloc);

for (int n = 0; n < numAppIds; ++n) {
size_t appIdLen = (n + 1) * 9 + 3;
Expand All @@ -626,10 +624,9 @@ static void test4_loadAppInfos()
mqbs::FileStoreProtocol::k_HASH_LENGTH;
}

char* p = static_cast<char*>(
bmqtst::TestHelperUtil::allocator()->allocate(totalSize));
char* p = static_cast<char*>(alloc->allocate(totalSize));
size_t offset = 0;
AppInfos expectedAppInfos(bmqtst::TestHelperUtil::allocator());
AppInfos expectedAppInfos(alloc);

for (int n = 0; n < numAppIds; ++n) {
// Append AppIdHeader.
Expand All @@ -644,9 +641,7 @@ static void test4_loadAppInfos()

// Append AppId.

bsl::string appId(appIdLenVec[n],
static_cast<char>(n + 1),
bmqtst::TestHelperUtil::allocator());
bsl::string appId(appIdLenVec[n], static_cast<char>(n + 1), alloc);
bsl::memcpy(p + offset, appId.c_str(), appIdLenVec[n]);
offset += appIdLenVec[n];

Expand All @@ -671,14 +666,15 @@ static void test4_loadAppInfos()
appHash,
mqbs::FileStoreProtocol::k_HASH_LENGTH);

expectedAppInfos.insert(bsl::make_pair(
bsl::string(appId, bmqtst::TestHelperUtil::allocator()),
appKey));
AppInfos::value_type appInfo(bsl::string(appId, alloc),
appKey,
alloc);
expectedAppInfos.insert(appInfo);
offset += mqbs::FileStoreProtocol::k_HASH_LENGTH;
}
// Test.
mqbs::MemoryBlock mb(p, totalSize);
AppInfos appIdKeyPairs(bmqtst::TestHelperUtil::allocator());
AppInfos appIdKeyPairs(alloc);

mqbs::FileStoreProtocolUtil::loadAppInfos(&appIdKeyPairs,
mb,
Expand All @@ -692,7 +688,7 @@ static void test4_loadAppInfos()
BMQTST_ASSERT_EQ(expectedAppInfos.count(cit->first), 1u);
}

bmqtst::TestHelperUtil::allocator()->deallocate(p);
alloc->deallocate(p);
}
}

Expand Down
Loading