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

Fix rebase conflicts

pull/1250/head
Onder Kalaci 2017-02-23 10:40:08 +02:00
parent 0c57ea7587
commit 4c22ed9ec2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/distributed/planner/multi_router_planner.c
View File

@ -389,9 +389,9 @@ RouterModifyTaskForShardInterval(Query *originalQuery, ShardInterval *shardInter
{ {
RelationRestriction *restriction = lfirst(restrictionCell); RelationRestriction *restriction = lfirst(restrictionCell);
List *originalBaserestrictInfo = restriction->relOptInfo->baserestrictinfo; List *originalBaserestrictInfo = restriction->relOptInfo->baserestrictinfo;
List *originalJoinInfo = restriction->relOptInfo->joininfo;
InstantiateQualContext instantiateQualWalker; InstantiateQualContext instantiateQualWalker;
Var *relationPartitionKey = PartitionKey(restriction->relationId); Var *relationPartitionKey = PartitionKey(restriction->relationId);
Var *relationPartitionKey = PartitionKey(restriction->relationId);
/* /*
* We haven't added the quals if all participating tables are reference * 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, (List *) InstantiatePartitionQualWalker((Node *) originalBaserestrictInfo,
&instantiateQualWalker); &instantiateQualWalker);
originalJoinInfo = originalJoinInfo =
(List *) InstantiatePartitionQual((Node *) originalJoinInfo, (List *) InstantiatePartitionQualWalker((Node *) originalJoinInfo,
instantiateQualWalker); &instantiateQualWalker);
} }
/* /*