mirror of https://github.com/citusdata/citus.git
indent
parent
f49caf8aca
commit
128a259b15
|
@ -136,8 +136,7 @@ static MultiNode * ApplyCartesianProductReferenceJoin(MultiNode *leftNode,
|
|||
static MultiNode * ApplyCartesianProduct(MultiNode *leftNode, MultiNode *rightNode,
|
||||
List *partitionColumnList, JoinType joinType,
|
||||
List *joinClauses);
|
||||
static bool
|
||||
ExprMentionsPartitionColumn(Node *node, Query *query);
|
||||
static bool ExprMentionsPartitionColumn(Node *node, Query *query);
|
||||
|
||||
|
||||
/*
|
||||
|
@ -233,6 +232,7 @@ TargetListOnPartitionColumn(Query *query, List *targetEntryList)
|
|||
RangeTblEntry *rte = NULL;
|
||||
|
||||
FindReferencedTableColumn(targetExpression, NIL, query, &column, &rte,
|
||||
|
||||
/*skipOuterVars=*/ false);
|
||||
Oid relationId = rte ? rte->relid : InvalidOid;
|
||||
|
||||
|
@ -308,7 +308,9 @@ static bool
|
|||
ExprMentionsPartitionColumn(Node *node, Query *query)
|
||||
{
|
||||
if (node == NULL)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (IsA(node, Var))
|
||||
{
|
||||
|
@ -323,21 +325,27 @@ ExprMentionsPartitionColumn(Node *node, Query *query)
|
|||
|
||||
/* Sanity-check varno */
|
||||
if (v->varno <= 0 || v->varno > list_length(query->rtable))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
RangeTblEntry *rte = rt_fetch(v->varno, query->rtable);
|
||||
|
||||
#if PG_VERSION_NUM >= 180000
|
||||
|
||||
/* Synthetic GROUP RTE – examine its expressions instead */
|
||||
if (rte->rtekind == RTE_GROUP && rte->groupexprs)
|
||||
{
|
||||
ListCell *lc;
|
||||
foreach(lc, rte->groupexprs)
|
||||
if (ExprMentionsPartitionColumn((Node *) lfirst(lc), query))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Real table? — compare against its dist key */
|
||||
if (rte->rtekind == RTE_RELATION && HasDistributionKey(rte->relid))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue