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

Fix finalized placement list and hash token increment bugs

pull/390/head
Marco Slot 2016-03-08 13:00:02 +01:00
parent e313ceb7f6
commit 24cad431f4
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/distributed/commands/multi_copy.c
View File

@ -628,7 +628,7 @@ ShardIntervalCompareFunction(Var *partitionColumn, char partitionMethod)
static bool static bool
IsUniformHashDistribution(ShardInterval **shardIntervalArray, int shardCount) IsUniformHashDistribution(ShardInterval **shardIntervalArray, int shardCount)
{ {
uint32 hashTokenIncrement = (uint32) (HASH_TOKEN_COUNT / shardCount); uint64 hashTokenIncrement = HASH_TOKEN_COUNT / shardCount;
int shardIndex = 0; int shardIndex = 0;
for (shardIndex = 0; shardIndex < shardCount; shardIndex++) for (shardIndex = 0; shardIndex < shardCount; shardIndex++)
@ -676,10 +676,10 @@ FindShardInterval(Datum partitionColumnValue, ShardInterval **shardIntervalCache
} }
else else
{ {
uint32 hashTokenIncrement = (uint32) (HASH_TOKEN_COUNT / shardCount); uint64 hashTokenIncrement = HASH_TOKEN_COUNT / shardCount;
int shardHashCode = ((uint32) (hashedValue - INT32_MIN) / hashTokenIncrement); int shardIndex = (uint32) (hashedValue - INT32_MIN) / hashTokenIncrement;
shardInterval = shardIntervalCache[shardHashCode]; shardInterval = shardIntervalCache[shardIndex];
} }
} }
else else
@ -753,7 +753,7 @@ OpenShardConnections(CopyStmt *copyStatement, ShardConnections *shardConnections
ListCell *failedPlacementCell = NULL; ListCell *failedPlacementCell = NULL;
List *connectionList = NIL; List *connectionList = NIL;
finalizedPlacementList = ShardPlacementList(shardId); finalizedPlacementList = FinalizedShardPlacementList(shardId);
foreach(placementCell, finalizedPlacementList) foreach(placementCell, finalizedPlacementList)
{ {
@ -962,7 +962,9 @@ ConnectionList(HTAB *connectionHash)
ShardConnections *shardConnections = NULL; ShardConnections *shardConnections = NULL;
hash_seq_init(&status, connectionHash); hash_seq_init(&status, connectionHash);
while ((shardConnections = (ShardConnections *) hash_seq_search(&status)) != NULL)
shardConnections = (ShardConnections *) hash_seq_search(&status);
while (shardConnections != NULL)
{ {
ListCell *connectionCell = NULL; ListCell *connectionCell = NULL;
foreach(connectionCell, shardConnections->connectionList) foreach(connectionCell, shardConnections->connectionList)
@ -972,6 +974,8 @@ ConnectionList(HTAB *connectionHash)
connectionList = lappend(connectionList, transactionConnection); connectionList = lappend(connectionList, transactionConnection);
} }
shardConnections = (ShardConnections *) hash_seq_search(&status);
} }
return connectionList; return connectionList;