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

Merge pull request #479 from citusdata/fix_mixed_code_and_declaration_warning 

FIX "mixed declarations and code" Warning in multi_physical_planner.c
pull/414/head
Ahmet Eren Basak 2016-04-29 13:54:35 +03:00
parent 0036eb3253 7e19ebe679
commit 25382c289b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1729,6 +1729,7 @@ BuildMapMergeJob(Query *jobQuery, List *dependedJobList, Var *partitionKey,
bool hasUninitializedShardInterval = false; bool hasUninitializedShardInterval = false;
uint32 shardCount = cache->shardIntervalArrayLength; uint32 shardCount = cache->shardIntervalArrayLength;
ShardInterval **sortedShardIntervalArray = cache->sortedShardIntervalArray; ShardInterval **sortedShardIntervalArray = cache->sortedShardIntervalArray;
char basePartitionMethod PG_USED_FOR_ASSERTS_ONLY = 0;
hasUninitializedShardInterval = cache->hasUninitializedShardInterval; hasUninitializedShardInterval = cache->hasUninitializedShardInterval;
if (hasUninitializedShardInterval) if (hasUninitializedShardInterval)
@ -1737,9 +1738,9 @@ BuildMapMergeJob(Query *jobQuery, List *dependedJobList, Var *partitionKey,
"missing min/max values"))); "missing min/max values")));
} }
basePartitionMethod = PartitionMethod(baseRelationId);
/* this join-type currently doesn't work for hash partitioned tables */ /* this join-type currently doesn't work for hash partitioned tables */
char basePartitionMethod PG_USED_FOR_ASSERTS_ONLY =
PartitionMethod(baseRelationId);
Assert(basePartitionMethod != DISTRIBUTE_BY_HASH); Assert(basePartitionMethod != DISTRIBUTE_BY_HASH);
mapMergeJob->partitionType = RANGE_PARTITION_TYPE; mapMergeJob->partitionType = RANGE_PARTITION_TYPE;