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

MCOL-840 Fix incompatible join on expression

Browse Source 
This check was removed but is actually still required in some cases.
This commit is contained in:
Andrew Hutchings
2017-08-01 14:48:24 +01:00
parent 606846e27f
commit 6aeb1bfa3a
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dbcon/joblist/expressionstep.cpp
View File

@@ -569,6 +569,19 @@ void ExpressionStep::functionJoinCheck(SimpleFilter* sf, JobInfo& jobInfo)
return; return;
} }
if ((!compatibleColumnTypes(sf->lhs()->resultType(), sf->rhs()->resultType(), true)) &&
(fFunctionJoinInfo->fTableKey.size() == 2))
{
uint32_t t1 = fFunctionJoinInfo->fTableKey[0];
uint32_t t2 = fFunctionJoinInfo->fTableKey[1];
jobInfo.incompatibleJoinMap[t1] = t2;
jobInfo.incompatibleJoinMap[t2] = t1;
// not convertible
fFunctionJoinInfo.reset();
return;
}
SJSTEP sjstep; SJSTEP sjstep;
ReturnedColumn* sfLhs = sf->lhs(); ReturnedColumn* sfLhs = sf->lhs();
ReturnedColumn* sfRhs = sf->rhs(); ReturnedColumn* sfRhs = sf->rhs();