database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL-5512 Fix for post join filter.

Browse Source 
This patch fixes certain situations where post join filter is not applying.
This commit is contained in:
Denis Khalikov
2023-06-09 11:15:02 +03:00
parent ab9b95e368
commit 024e6bd358
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,7 +281,7 @@ uint64_t TupleBPS::JoinLocalData::generateJoinResultSet(const uint32_t depth,
{ {
// Don't wait for memory, just send the data on to DL. // Don't wait for memory, just send the data on to DL.
RowGroup out(local_outputRG); RowGroup out(local_outputRG);
if (fe2 && tbps->runFEonPM()) if (fe2 && !tbps->runFEonPM())
{ {
processFE2(outputData); processFE2(outputData);
tbps->rgDataVecToDl(outputData, local_fe2Output, dlp); tbps->rgDataVecToDl(outputData, local_fe2Output, dlp);

13
dbcon/joblist/tuplehashjoin.cpp
View File

@ -1892,6 +1892,19 @@ void TupleHashJoinStep::generateJoinResultSet(const vector<vector<Row::Pointer>
// Count the memory // Count the memory
if (UNLIKELY(!getMemory(l_outputRG.getMaxDataSize()))) if (UNLIKELY(!getMemory(l_outputRG.getMaxDataSize())))
{ {
// MCOL-5512
if (fe2)
{
RowGroup l_fe2RG;
Row fe2InRow;
Row fe2OutRow;
l_fe2RG = fe2Output;
l_outputRG.initRow(&fe2InRow);
l_fe2RG.initRow(&fe2OutRow);
processFE2(l_outputRG, l_fe2RG, fe2InRow, fe2OutRow, &outputData, fe2.get());
}
// Don't let the join results buffer get out of control. // Don't let the join results buffer get out of control.
sendResult(outputData); sendResult(outputData);
outputData.clear(); outputData.clear();