database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Fix atomic usage

Browse Source 
Using atomic without namespace broke the build on most platforms
This commit is contained in:
Andrew Hutchings
2019-12-19 11:15:09 +02:00
parent 5eb050f3af
commit d1199e03c3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
primitives/primproc/batchprimitiveprocessor.cpp
View File

@ -291,7 +291,7 @@ void BatchPrimitiveProcessor::initBPP(ByteStream& bs)
addToJoinerLocks[j].reset(new boost::mutex[processorThreads]); addToJoinerLocks[j].reset(new boost::mutex[processorThreads]);
smallSideDataLocks.reset(new boost::mutex[joinerCount]); smallSideDataLocks.reset(new boost::mutex[joinerCount]);
tJoinerSizes.reset(new atomic<uint32_t>[joinerCount]); tJoinerSizes.reset(new std::atomic<uint32_t>[joinerCount]);
largeSideKeyColumns.reset(new uint32_t[joinerCount]); largeSideKeyColumns.reset(new uint32_t[joinerCount]);
tlLargeSideKeyColumns.reset(new vector<uint32_t>[joinerCount]); tlLargeSideKeyColumns.reset(new vector<uint32_t>[joinerCount]);
typelessJoin.reset(new bool[joinerCount]); typelessJoin.reset(new bool[joinerCount]);
@ -592,7 +592,7 @@ void BatchPrimitiveProcessor::addToJoiner(ByteStream& bs)
idbassert(joinerNum < joinerCount); idbassert(joinerNum < joinerCount);
arr = (JoinerElements*) bs.buf(); arr = (JoinerElements*) bs.buf();
atomic<uint32_t> &tJoinerSize = tJoinerSizes[joinerNum]; std::atomic<uint32_t> &tJoinerSize = tJoinerSizes[joinerNum];
// XXXPAT: enormous if stmts are evil. TODO: move each block into // XXXPAT: enormous if stmts are evil. TODO: move each block into
// properly-named functions for clarity. // properly-named functions for clarity.