external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge tests

pull/7781/head
Teja Mupparti 2024-12-06 12:55:47 -08:00 committed by naisila
parent 90feda69dc
commit dbcf217050
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/backend/distributed/planner/merge_planner.c
View File

@ -723,7 +723,7 @@ ErrorIfRepartitionMergeNotSupported(Oid targetRelationId, Query *mergeQuery,
/* /*
* Sub-queries and CTEs are not allowed in actions and ON clause * Sub-queries and CTEs are not allowed in actions and ON clause
*/ */
if (FindNodeMatchingCheckFunction((Node *) mergeQuery->jointree->quals, if (FindNodeMatchingCheckFunction((Node *) mergeQuery->mergeJoinCondition,
IsNodeSubquery)) IsNodeSubquery))
{ {
ereport(ERROR, ereport(ERROR,
@ -1225,11 +1225,12 @@ ErrorIfMergeQueryQualAndTargetListNotSupported(Oid targetRelationId, Query *orig
} }
DeferredErrorMessage *deferredError = DeferredErrorMessage *deferredError =
MergeQualAndTargetListFunctionsSupported(targetRelationId, MergeQualAndTargetListFunctionsSupported(
originalQuery, targetRelationId,
originalQuery->jointree->quals, originalQuery,
originalQuery->targetList, originalQuery->jointree->mergeConditions,
originalQuery->commandType); originalQuery->targetList,
originalQuery->commandType);
if (deferredError) if (deferredError)
{ {
@ -1304,7 +1305,19 @@ SourceResultPartitionColumnIndex(Query *mergeQuery, List *sourceTargetList,
CitusTableCacheEntry *targetRelation) CitusTableCacheEntry *targetRelation)
{ {
/* Get all the Join conditions from the ON clause */ /* Get all the Join conditions from the ON clause */
List *mergeJoinConditionList = WhereClauseList(mergeQuery->jointree); List *mergeJoinConditionList = NIL;
if (IsA(mergeQuery->mergeJoinCondition, List))
{
mergeJoinConditionList = (List *) mergeQuery->mergeJoinCondition;
}
else
{
Node *joinClause =
eval_const_expressions(NULL, mergeQuery->mergeJoinCondition);
joinClause = (Node *) canonicalize_qual((Expr *) joinClause, false);
mergeJoinConditionList = make_ands_implicit((Expr *) joinClause);
}
Var *targetColumn = targetRelation->partitionColumn; Var *targetColumn = targetRelation->partitionColumn;
Var *sourceRepartitionVar = NULL; Var *sourceRepartitionVar = NULL;
bool foundTypeMismatch = false; bool foundTypeMismatch = false;