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

Refactor worker node hash initialisation

pull/1996/head
Marco Slot 2018-02-09 02:27:33 +01:00
parent 40d715d494
commit 0cba4ab588
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/distributed/utils/metadata_cache.c
View File

@ -2517,7 +2517,7 @@ PrepareWorkerNodeCache(void)
static void static void
InitializeWorkerNodeCache(void) InitializeWorkerNodeCache(void)
{ {
HTAB *oldWorkerNodeHash = NULL; HTAB *newWorkerNodeHash = NULL;
List *workerNodeList = NIL; List *workerNodeList = NIL;
ListCell *workerNodeCell = NULL; ListCell *workerNodeCell = NULL;
HASHCTL info; HASHCTL info;
@ -2543,10 +2543,7 @@ InitializeWorkerNodeCache(void)
info.match = WorkerNodeCompare; info.match = WorkerNodeCompare;
hashFlags = HASH_ELEM | HASH_FUNCTION | HASH_CONTEXT | HASH_COMPARE; hashFlags = HASH_ELEM | HASH_FUNCTION | HASH_CONTEXT | HASH_COMPARE;
oldWorkerNodeHash = WorkerNodeHash; newWorkerNodeHash = hash_create("Worker Node Hash", maxTableSize, &info, hashFlags);
WorkerNodeHash = hash_create("Worker Node Hash",
maxTableSize,
&info, hashFlags);
/* read the list from pg_dist_node */ /* read the list from pg_dist_node */
workerNodeList = ReadWorkerNodes(includeNodesFromOtherClusters); workerNodeList = ReadWorkerNodes(includeNodesFromOtherClusters);
@ -2565,7 +2562,7 @@ InitializeWorkerNodeCache(void)
/* search for the worker node in the hash, and then insert the values */ /* search for the worker node in the hash, and then insert the values */
hashKey = (void *) currentNode; hashKey = (void *) currentNode;
workerNode = (WorkerNode *) hash_search(WorkerNodeHash, hashKey, workerNode = (WorkerNode *) hash_search(newWorkerNodeHash, hashKey,
HASH_ENTER, &handleFound); HASH_ENTER, &handleFound);
/* fill the newly allocated workerNode in the cache */ /* fill the newly allocated workerNode in the cache */
@ -2593,7 +2590,7 @@ InitializeWorkerNodeCache(void)
} }
/* now, safe to destroy the old hash */ /* now, safe to destroy the old hash */
hash_destroy(oldWorkerNodeHash); hash_destroy(WorkerNodeHash);
if (WorkerNodeArray != NULL) if (WorkerNodeArray != NULL)
{ {
@ -2602,7 +2599,7 @@ InitializeWorkerNodeCache(void)
WorkerNodeCount = newWorkerNodeCount; WorkerNodeCount = newWorkerNodeCount;
WorkerNodeArray = newWorkerNodeArray; WorkerNodeArray = newWorkerNodeArray;
WorkerNodeHash = newWorkerNodeHash;
} }