From 539a205462e3a0a460eca13346fff0677aea0815 Mon Sep 17 00:00:00 2001 From: Brian Cloutier Date: Thu, 12 Jan 2017 18:31:33 +0300 Subject: [PATCH] Pass entire ShardPlacement into WorkerShardStats A small refactor so we'll be able to call the new connection API (which requires having a ShardPlacement) from within WorkerShardStats. --- .../distributed/master/master_stage_protocol.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/backend/distributed/master/master_stage_protocol.c b/src/backend/distributed/master/master_stage_protocol.c index c749fdae5..3474e2bcb 100644 --- a/src/backend/distributed/master/master_stage_protocol.c +++ b/src/backend/distributed/master/master_stage_protocol.c @@ -44,7 +44,7 @@ /* Local functions forward declarations */ -static bool WorkerShardStats(char *nodeName, uint32 nodePort, Oid relationId, +static bool WorkerShardStats(ShardPlacement *placement, Oid relationId, char *shardName, uint64 *shardSize, text **shardMinValue, text **shardMaxValue); @@ -570,10 +570,8 @@ UpdateShardStatistics(int64 shardId) foreach(shardPlacementCell, shardPlacementList) { ShardPlacement *placement = (ShardPlacement *) lfirst(shardPlacementCell); - char *workerName = placement->nodeName; - uint32 workerPort = placement->nodePort; - statsOK = WorkerShardStats(workerName, workerPort, relationId, shardQualifiedName, + statsOK = WorkerShardStats(placement, relationId, shardQualifiedName, &shardSize, &minValue, &maxValue); if (statsOK) { @@ -636,9 +634,12 @@ UpdateShardStatistics(int64 shardId) * we assume have changed after new table data have been appended to the shard. */ static bool -WorkerShardStats(char *nodeName, uint32 nodePort, Oid relationId, char *shardName, +WorkerShardStats(ShardPlacement *placement, Oid relationId, char *shardName, uint64 *shardSize, text **shardMinValue, text **shardMaxValue) { + char *nodeName = placement->nodeName; + uint32 nodePort = placement->nodePort; + char *quotedShardName = NULL; bool cstoreTable = false; StringInfo tableSizeQuery = makeStringInfo();