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

[MCOL-4849] Fix build warnings.

Browse Source
This commit is contained in:
Denis Khalikov
2021-11-17 17:33:09 +03:00
parent 3c65499820
commit f8bd566b0f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dbcon/joblist/primitivestep.h
View File

@ -1539,14 +1539,15 @@ private:
int64_t ridsReturned_Thread = 0; int64_t ridsReturned_Thread = 0;
// On init. // On init.
bool doJoin;
boost::shared_ptr<funcexp::FuncExpWrapper> fe2; boost::shared_ptr<funcexp::FuncExpWrapper> fe2;
rowgroup::RowGroup fe2Output; rowgroup::RowGroup fe2Output;
uint32_t smallSideCount;
std::vector<rowgroup::RowGroup> joinerMatchesRGs; std::vector<rowgroup::RowGroup> joinerMatchesRGs;
rowgroup::RowGroup joinFERG; rowgroup::RowGroup joinFERG;
std::vector<boost::shared_ptr<joiner::TupleJoiner>> tjoiners; std::vector<boost::shared_ptr<joiner::TupleJoiner>> tjoiners;
uint32_t smallSideCount;
bool doJoin;
// Join vars. // Join vars.
vector<vector<rowgroup::Row::Pointer>> joinerOutput; vector<vector<rowgroup::Row::Pointer>> joinerOutput;
rowgroup::Row largeSideRow; rowgroup::Row largeSideRow;

7
dbcon/joblist/tuple-bps.cpp
View File

@ -175,7 +175,6 @@ TupleBPS::JoinLocalData::JoinLocalData(RowGroup& primRowGroup, RowGroup& outputR
local_fe2Output.initRow(&local_fe2OutRow); local_fe2Output.initRow(&local_fe2OutRow);
local_fe2Data.reinit(fe2Output); local_fe2Data.reinit(fe2Output);
local_fe2Output.setData(&local_fe2Data); local_fe2Output.setData(&local_fe2Data);
// local_fe2OutRow = fe2OutRow;
local_fe2 = *fe2; local_fe2 = *fe2;
} }
@ -196,7 +195,7 @@ TupleBPS::JoinLocalData::JoinLocalData(RowGroup& primRowGroup, RowGroup& outputR
bool hasJoinFE = false; bool hasJoinFE = false;
for (int i = 0; i < smallSideCount; i++) for (uint32_t i = 0; i < smallSideCount; ++i)
{ {
joinerMatchesRGs[i].initRow(&(smallSideRows[i])); joinerMatchesRGs[i].initRow(&(smallSideRows[i]));
smallMappings[i] = makeMapping(joinerMatchesRGs[i], local_outputRG); smallMappings[i] = makeMapping(joinerMatchesRGs[i], local_outputRG);
@ -217,7 +216,7 @@ TupleBPS::JoinLocalData::JoinLocalData(RowGroup& primRowGroup, RowGroup& outputR
fergMappings[smallSideCount] = makeMapping(local_primRG, joinFERG); fergMappings[smallSideCount] = makeMapping(local_primRG, joinFERG);
} }
for (int i = 0; i < smallSideCount; i++) for (uint32_t i = 0; i < smallSideCount; ++i)
{ {
joinerMatchesRGs[i].initRow(&(smallNulls[i]), true); joinerMatchesRGs[i].initRow(&(smallNulls[i]), true);
smallNullMemory[i].reset(new uint8_t[smallNulls[i].getSize()]); smallNullMemory[i].reset(new uint8_t[smallNulls[i].getSize()]);
@ -2445,8 +2444,6 @@ void TupleBPS::receiveMultiPrimitiveMessages()
abort_nolock(); abort_nolock();
} }
out:
// We have on thread here and do not need to notify any waiting producer threads, because we are done of // We have on thread here and do not need to notify any waiting producer threads, because we are done of
// consuming messages from queue. // consuming messages from queue.
tplLock.unlock(); tplLock.unlock();