From 4c22ed9ec227bedbfbc0c1d6b5f231ffb16c75d0 Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Thu, 23 Feb 2017 10:40:08 +0200 Subject: [PATCH] Fix rebase conflicts --- src/backend/distributed/planner/multi_router_planner.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/distributed/planner/multi_router_planner.c b/src/backend/distributed/planner/multi_router_planner.c index a8a269e86..c38c00adf 100644 --- a/src/backend/distributed/planner/multi_router_planner.c +++ b/src/backend/distributed/planner/multi_router_planner.c @@ -389,9 +389,9 @@ RouterModifyTaskForShardInterval(Query *originalQuery, ShardInterval *shardInter { RelationRestriction *restriction = lfirst(restrictionCell); List *originalBaserestrictInfo = restriction->relOptInfo->baserestrictinfo; + List *originalJoinInfo = restriction->relOptInfo->joininfo; InstantiateQualContext instantiateQualWalker; Var *relationPartitionKey = PartitionKey(restriction->relationId); - Var *relationPartitionKey = PartitionKey(restriction->relationId); /* * We haven't added the quals if all participating tables are reference @@ -409,8 +409,8 @@ RouterModifyTaskForShardInterval(Query *originalQuery, ShardInterval *shardInter (List *) InstantiatePartitionQualWalker((Node *) originalBaserestrictInfo, &instantiateQualWalker); originalJoinInfo = - (List *) InstantiatePartitionQual((Node *) originalJoinInfo, - instantiateQualWalker); + (List *) InstantiatePartitionQualWalker((Node *) originalJoinInfo, + &instantiateQualWalker); } /*