mirror of https://github.com/citusdata/citus.git
!!!!! DO NOT MERGE THIS COMMIT
parent
d3e084c9de
commit
5d16914a1b
|
@ -672,8 +672,8 @@ ShardsMatchingDeleteCriteria(Oid relationId, List *shardIntervalList,
|
||||||
Expr *lessThanExpr = (Expr *) linitial(andExpr->args);
|
Expr *lessThanExpr = (Expr *) linitial(andExpr->args);
|
||||||
Expr *greaterThanExpr = (Expr *) lsecond(andExpr->args);
|
Expr *greaterThanExpr = (Expr *) lsecond(andExpr->args);
|
||||||
|
|
||||||
RestrictInfo *lessThanRestrictInfo = make_simple_restrictinfo(lessThanExpr);
|
RestrictInfo *lessThanRestrictInfo = make_simple_restrictinfo(NULL, lessThanExpr);
|
||||||
RestrictInfo *greaterThanRestrictInfo = make_simple_restrictinfo(
|
RestrictInfo *greaterThanRestrictInfo = make_simple_restrictinfo(NULL,
|
||||||
greaterThanExpr);
|
greaterThanExpr);
|
||||||
|
|
||||||
restrictInfoList = lappend(restrictInfoList, lessThanRestrictInfo);
|
restrictInfoList = lappend(restrictInfoList, lessThanRestrictInfo);
|
||||||
|
|
|
@ -747,7 +747,7 @@ RouterModifyTaskForShardInterval(Query *originalQuery,
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
shardRestrictionList = make_simple_restrictinfo((Expr *) shardOpExpressions);
|
shardRestrictionList = make_simple_restrictinfo(NULL, (Expr *) shardOpExpressions);
|
||||||
extendedBaseRestrictInfo = lappend(extendedBaseRestrictInfo,
|
extendedBaseRestrictInfo = lappend(extendedBaseRestrictInfo,
|
||||||
shardRestrictionList);
|
shardRestrictionList);
|
||||||
|
|
||||||
|
|
|
@ -2054,7 +2054,7 @@ GetRestrictInfoListForRelation(RangeTblEntry *rangeTblEntry,
|
||||||
* If the restriction involves multiple tables, we cannot add it to
|
* If the restriction involves multiple tables, we cannot add it to
|
||||||
* input relation's expression list.
|
* input relation's expression list.
|
||||||
*/
|
*/
|
||||||
Relids varnos = pull_varnos((Node *) restrictionClause);
|
Relids varnos = pull_varnos(NULL, (Node *) restrictionClause);
|
||||||
if (bms_num_members(varnos) != 1)
|
if (bms_num_members(varnos) != 1)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in New Issue