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

Revert physical planner changes

pull/390/head
Marco Slot 2016-03-10 21:23:19 +01:00
parent 168be97c36
commit 04261d9bc4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/distributed/planner/multi_physical_planner.c
View File

@ -110,6 +110,8 @@ static MapMergeJob * BuildMapMergeJob(Query *jobQuery, List *dependedJobList,
Oid baseRelationId, Oid baseRelationId,
BoundaryNodeJobType boundaryNodeJobType); BoundaryNodeJobType boundaryNodeJobType);
static uint32 HashPartitionCount(void); static uint32 HashPartitionCount(void);
static int CompareShardIntervals(const void *leftElement, const void *rightElement,
FmgrInfo *typeCompareFunction);
static ArrayType * SplitPointObject(ShardInterval **shardIntervalArray, static ArrayType * SplitPointObject(ShardInterval **shardIntervalArray,
uint32 shardIntervalCount); uint32 shardIntervalCount);
@ -167,6 +169,7 @@ static List * RoundRobinAssignTaskList(List *taskList);
static List * RoundRobinReorder(Task *task, List *placementList); static List * RoundRobinReorder(Task *task, List *placementList);
static List * ReorderAndAssignTaskList(List *taskList, static List * ReorderAndAssignTaskList(List *taskList,
List * (*reorderFunction)(Task *, List *)); List * (*reorderFunction)(Task *, List *));
static int CompareTasksByShardId(const void *leftElement, const void *rightElement);
static List * ActiveShardPlacementLists(List *taskList); static List * ActiveShardPlacementLists(List *taskList);
static List * ActivePlacementList(List *placementList); static List * ActivePlacementList(List *placementList);
static List * LeftRotateList(List *list, uint32 rotateCount); static List * LeftRotateList(List *list, uint32 rotateCount);
@ -1807,7 +1810,7 @@ SortedShardIntervalArray(List *shardIntervalList)
* CompareShardIntervals acts as a helper function to compare two shard interval * CompareShardIntervals acts as a helper function to compare two shard interval
* pointers by their minimum values, using the value's type comparison function. * pointers by their minimum values, using the value's type comparison function.
*/ */
int static int
CompareShardIntervals(const void *leftElement, const void *rightElement, CompareShardIntervals(const void *leftElement, const void *rightElement,
FmgrInfo *typeCompareFunction) FmgrInfo *typeCompareFunction)
{ {
@ -5070,7 +5073,7 @@ ReorderAndAssignTaskList(List *taskList, List * (*reorderFunction)(Task *, List
/* Helper function to compare two tasks by their anchor shardId. */ /* Helper function to compare two tasks by their anchor shardId. */
int static int
CompareTasksByShardId(const void *leftElement, const void *rightElement) CompareTasksByShardId(const void *leftElement, const void *rightElement)
{ {
const Task *leftTask = *((const Task **) leftElement); const Task *leftTask = *((const Task **) leftElement);

3
src/include/distributed/multi_physical_planner.h
View File

@ -238,8 +238,6 @@ extern int CompareShardPlacements(const void *leftElement, const void *rightElem
extern ShardInterval ** SortedShardIntervalArray(List *shardList); extern ShardInterval ** SortedShardIntervalArray(List *shardList);
extern bool ShardIntervalsOverlap(ShardInterval *firstInterval, extern bool ShardIntervalsOverlap(ShardInterval *firstInterval,
ShardInterval *secondInterval); ShardInterval *secondInterval);
extern int CompareShardIntervals(const void *leftElement, const void *rightElement,
FmgrInfo *typeCompareFunction);
/* function declarations for Task and Task list operations */ /* function declarations for Task and Task list operations */
extern bool TasksEqual(const Task *a, const Task *b); extern bool TasksEqual(const Task *a, const Task *b);
@ -249,7 +247,6 @@ extern bool TaskListMember(const List *taskList, const Task *task);
extern List * TaskListDifference(const List *list1, const List *list2); extern List * TaskListDifference(const List *list1, const List *list2);
extern List * TaskListUnion(const List *list1, const List *list2); extern List * TaskListUnion(const List *list1, const List *list2);
extern List * FirstReplicaAssignTaskList(List *taskList); extern List * FirstReplicaAssignTaskList(List *taskList);
extern int CompareTasksByShardId(const void *leftElement, const void *rightElement);
#endif /* MULTI_PHYSICAL_PLANNER_H */ #endif /* MULTI_PHYSICAL_PLANNER_H */