From a0dff301c715fa520b53fd6799afb94a643b3989 Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Wed, 22 Jan 2020 18:16:04 +0100 Subject: [PATCH] Update shardPlacement->nodeId to uint As the source of the shardPlacement->nodeId is always workerNode->nodeId, and that is uint32. We had this hack because of: https://github.com/citusdata/citus/pull/2633/commits/0ea4e52df512acd678ed7ad0cb128638221a3a5a#r266421409 And, that is gone with: https://github.com/citusdata/citus/commit/90056f7d3cd9f2035dd90d38c658a7211151f3c9#diff-c532177d74c72d3f0e7cd10e448ab3c6L1123 So, we're safe to do it now. --- src/backend/distributed/connection/placement_connection.c | 2 +- src/backend/distributed/utils/citus_outfuncs.c | 2 +- src/backend/distributed/utils/citus_readfuncs.c | 2 +- src/include/distributed/master_metadata_utility.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/distributed/connection/placement_connection.c b/src/backend/distributed/connection/placement_connection.c index b40232492..7198b1dba 100644 --- a/src/backend/distributed/connection/placement_connection.c +++ b/src/backend/distributed/connection/placement_connection.c @@ -134,7 +134,7 @@ static HTAB *ConnectionPlacementHash; typedef struct ColocatedPlacementsHashKey { /* to identify host - database can't differ */ - int nodeId; + uint32 nodeId; /* colocation group, or invalid */ uint32 colocationGroupId; diff --git a/src/backend/distributed/utils/citus_outfuncs.c b/src/backend/distributed/utils/citus_outfuncs.c index 2c55fc08c..e093739f5 100644 --- a/src/backend/distributed/utils/citus_outfuncs.c +++ b/src/backend/distributed/utils/citus_outfuncs.c @@ -411,7 +411,7 @@ OutShardPlacement(OUTFUNC_ARGS) WRITE_INT_FIELD(groupId); WRITE_STRING_FIELD(nodeName); WRITE_UINT_FIELD(nodePort); - WRITE_INT_FIELD(nodeId); + WRITE_UINT_FIELD(nodeId); /* so we can deal with 0 */ WRITE_INT_FIELD(partitionMethod); WRITE_UINT_FIELD(colocationGroupId); diff --git a/src/backend/distributed/utils/citus_readfuncs.c b/src/backend/distributed/utils/citus_readfuncs.c index 810fe5a93..b201dfe19 100644 --- a/src/backend/distributed/utils/citus_readfuncs.c +++ b/src/backend/distributed/utils/citus_readfuncs.c @@ -321,7 +321,7 @@ ReadShardPlacement(READFUNC_ARGS) READ_INT_FIELD(groupId); READ_STRING_FIELD(nodeName); READ_UINT_FIELD(nodePort); - READ_INT_FIELD(nodeId); + READ_UINT_FIELD(nodeId); /* so we can deal with 0 */ READ_INT_FIELD(partitionMethod); READ_UINT_FIELD(colocationGroupId); diff --git a/src/include/distributed/master_metadata_utility.h b/src/include/distributed/master_metadata_utility.h index 01bb2e202..c5b8bc941 100644 --- a/src/include/distributed/master_metadata_utility.h +++ b/src/include/distributed/master_metadata_utility.h @@ -81,7 +81,7 @@ typedef struct ShardPlacement /* the rest of the fields aren't from pg_dist_placement */ char *nodeName; uint32 nodePort; - int nodeId; + uint32 nodeId; char partitionMethod; uint32 colocationGroupId; uint32 representativeValue;