mirror of https://github.com/citusdata/citus.git
some reverts
parent
5fe2502c0e
commit
c8b4f75ffc
|
@ -520,23 +520,6 @@ CompositeFieldRecursive(Expr *expression, Query *query)
|
||||||
|
|
||||||
compositeField = CompositeFieldRecursive(joinColumn, query);
|
compositeField = CompositeFieldRecursive(joinColumn, query);
|
||||||
}
|
}
|
||||||
#if PG_VERSION_NUM >= PG_VERSION_18
|
|
||||||
else if (rangeTableEntry->rtekind == RTE_GROUP)
|
|
||||||
{
|
|
||||||
/* PG 18 synthetic GROUP RTE: each groupexprs[i] matches varattno=i+1 */
|
|
||||||
List *gexprs = rangeTableEntry->groupexprs;
|
|
||||||
AttrNumber grpIndex = candidateColumn->varattno - 1;
|
|
||||||
|
|
||||||
if (grpIndex >= 0 && grpIndex < list_length(gexprs))
|
|
||||||
{
|
|
||||||
Expr *grpExpr = (Expr *) list_nth(gexprs, grpIndex);
|
|
||||||
compositeField = CompositeFieldRecursive(grpExpr, query);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* else leave compositeField = NULL */
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
return compositeField;
|
return compositeField;
|
||||||
}
|
}
|
||||||
|
@ -1197,9 +1180,6 @@ HasComplexRangeTableType(Query *queryTree)
|
||||||
rangeTableEntry->rtekind != RTE_SUBQUERY &&
|
rangeTableEntry->rtekind != RTE_SUBQUERY &&
|
||||||
rangeTableEntry->rtekind != RTE_FUNCTION &&
|
rangeTableEntry->rtekind != RTE_FUNCTION &&
|
||||||
rangeTableEntry->rtekind != RTE_VALUES &&
|
rangeTableEntry->rtekind != RTE_VALUES &&
|
||||||
#if PG_VERSION_NUM >= PG_VERSION_18
|
|
||||||
rangeTableEntry->rtekind != RTE_GROUP &&
|
|
||||||
#endif
|
|
||||||
!IsJsonTableRTE(rangeTableEntry))
|
!IsJsonTableRTE(rangeTableEntry))
|
||||||
{
|
{
|
||||||
hasComplexRangeTableType = true;
|
hasComplexRangeTableType = true;
|
||||||
|
|
|
@ -1027,9 +1027,6 @@ ModifyQuerySupported(Query *queryTree, Query *originalQuery, bool multiShardQuer
|
||||||
}
|
}
|
||||||
else if (rangeTableEntry->rtekind == RTE_VALUES ||
|
else if (rangeTableEntry->rtekind == RTE_VALUES ||
|
||||||
rangeTableEntry->rtekind == RTE_RESULT
|
rangeTableEntry->rtekind == RTE_RESULT
|
||||||
#if PG_VERSION_NUM >= PG_VERSION_18
|
|
||||||
|| rangeTableEntry->rtekind == RTE_GROUP /* Accept synthetic GROUP */
|
|
||||||
#endif
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
/* do nothing, this type is supported */
|
/* do nothing, this type is supported */
|
||||||
|
|
Loading…
Reference in New Issue