From 939385cf1ec0616e5dcf223b18f498d5f920d92b Mon Sep 17 00:00:00 2001 From: Brian Cloutier Date: Mon, 29 Jan 2018 15:32:36 -0800 Subject: [PATCH] GetNextNodeId() incorrectly called PG_RETURN_DATUM - Also stabilize the output of a multi_router_planner test --- src/backend/distributed/utils/node_metadata.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/backend/distributed/utils/node_metadata.c b/src/backend/distributed/utils/node_metadata.c index d13350023..ddfe318e2 100644 --- a/src/backend/distributed/utils/node_metadata.c +++ b/src/backend/distributed/utils/node_metadata.c @@ -1192,20 +1192,18 @@ GetNextNodeId() Datum sequenceIdDatum = ObjectIdGetDatum(sequenceId); Oid savedUserId = InvalidOid; int savedSecurityContext = 0; - Datum nextNodedIdDatum = 0; + Datum nextNodeIdDatum; int nextNodeId = 0; GetUserIdAndSecContext(&savedUserId, &savedSecurityContext); SetUserIdAndSecContext(CitusExtensionOwner(), SECURITY_LOCAL_USERID_CHANGE); /* generate new and unique shardId from sequence */ - nextNodedIdDatum = DirectFunctionCall1(nextval_oid, sequenceIdDatum); + nextNodeIdDatum = DirectFunctionCall1(nextval_oid, sequenceIdDatum); SetUserIdAndSecContext(savedUserId, savedSecurityContext); - PG_RETURN_DATUM(nextNodedIdDatum); - - nextNodeId = DatumGetUInt32(nextNodeId); + nextNodeId = DatumGetUInt32(nextNodeIdDatum); return nextNodeId; }