From 321d0152c17f560f16084fcaef312873eff3ff6b Mon Sep 17 00:00:00 2001
From: SaitTalhaNisanci <s.talhanisanci@gmail.com>
Date: Mon, 9 Mar 2020 15:50:29 +0300
Subject: [PATCH] add a utility to get shard oid from relation oid and shard id
 (#3596)

---
 .../distributed/planner/deparse_shard_query.c | 11 ++-----
 src/backend/distributed/utils/shard_utils.c   | 31 +++++++++++++++++++
 src/include/distributed/shard_utils.h         | 18 +++++++++++
 3 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 src/backend/distributed/utils/shard_utils.c
 create mode 100644 src/include/distributed/shard_utils.h

diff --git a/src/backend/distributed/planner/deparse_shard_query.c b/src/backend/distributed/planner/deparse_shard_query.c
index f536e0105..5187e5094 100644
--- a/src/backend/distributed/planner/deparse_shard_query.c
+++ b/src/backend/distributed/planner/deparse_shard_query.c
@@ -22,6 +22,7 @@
 #include "distributed/metadata_cache.h"
 #include "distributed/multi_physical_planner.h"
 #include "distributed/multi_router_planner.h"
+#include "distributed/shard_utils.h"
 #include "distributed/version_compat.h"
 #include "lib/stringinfo.h"
 #include "nodes/makefuncs.h"
@@ -334,15 +335,9 @@ UpdateRelationsToLocalShardTables(Node *node, List *relationShardList)
 		return true;
 	}
 
-	uint64 shardId = relationShard->shardId;
-	Oid relationId = relationShard->relationId;
+	Oid shardOid = GetShardOid(relationShard->relationId, relationShard->shardId);
 
-	char *relationName = get_rel_name(relationId);
-	AppendShardIdToName(&relationName, shardId);
-
-	Oid schemaId = get_rel_namespace(relationId);
-
-	newRte->relid = get_relname_relid(relationName, schemaId);
+	newRte->relid = shardOid;
 
 	return false;
 }
diff --git a/src/backend/distributed/utils/shard_utils.c b/src/backend/distributed/utils/shard_utils.c
new file mode 100644
index 000000000..ad3acac67
--- /dev/null
+++ b/src/backend/distributed/utils/shard_utils.c
@@ -0,0 +1,31 @@
+/*-------------------------------------------------------------------------
+ *
+ * shard_utils.c
+ *
+ * This file contains functions to perform useful operations on shards.
+ *
+ * Copyright (c) Citus Data, Inc.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+#include "utils/lsyscache.h"
+
+#include "distributed/relay_utility.h"
+#include "distributed/shard_utils.h"
+
+/*
+ * GetShardOid returns the oid of the shard from the given distributed relation
+ * with the shardid.
+ */
+Oid
+GetShardOid(Oid distRelId, uint64 shardId)
+{
+	char *relationName = get_rel_name(distRelId);
+	AppendShardIdToName(&relationName, shardId);
+
+	Oid schemaId = get_rel_namespace(distRelId);
+
+	return get_relname_relid(relationName, schemaId);
+}
diff --git a/src/include/distributed/shard_utils.h b/src/include/distributed/shard_utils.h
new file mode 100644
index 000000000..e4fd9a2f2
--- /dev/null
+++ b/src/include/distributed/shard_utils.h
@@ -0,0 +1,18 @@
+/*-------------------------------------------------------------------------
+ *
+ * shard_utils.h
+ *   Utilities related to shards.
+ *
+ * Copyright (c) Citus Data, Inc.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef SHARD_UTILS_H
+#define SHARD_UTILS_H
+
+#include "postgres.h"
+
+extern Oid GetShardOid(Oid distRelId, uint64 shardId);
+
+#endif /* SHARD_UTILS_H */