From e8f41c6333156e2d6371b6a1ba68735bfbe41bd1 Mon Sep 17 00:00:00 2001
From: Burak Yucesoy <burak@citusdata.com>
Date: Thu, 22 Dec 2016 09:24:38 +0300
Subject: [PATCH] Address reviews - Part 2

- Add check for reference tables with no shards
---
 src/backend/distributed/utils/node_metadata.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/backend/distributed/utils/node_metadata.c b/src/backend/distributed/utils/node_metadata.c
index a539d1163..c8c5eaf07 100644
--- a/src/backend/distributed/utils/node_metadata.c
+++ b/src/backend/distributed/utils/node_metadata.c
@@ -192,7 +192,13 @@ get_shard_id_for_distribution_column(PG_FUNCTION_ARGS)
 	distributionMethod = PartitionMethod(relationId);
 	if (distributionMethod == DISTRIBUTE_BY_NONE)
 	{
-		shardInterval = (ShardInterval *) linitial(LoadShardIntervalList(relationId));
+		List *shardIntervalList = LoadShardIntervalList(relationId);
+		if (shardIntervalList == NIL)
+		{
+			PG_RETURN_INT64(NULL);
+		}
+
+		shardInterval = (ShardInterval *) linitial(shardIntervalList);
 	}
 	else if (distributionMethod == DISTRIBUTE_BY_HASH ||
 			 distributionMethod == DISTRIBUTE_BY_RANGE)