From c964ab47acc85d1dc751c1348a9f98f7663b4ca0 Mon Sep 17 00:00:00 2001
From: Nils Dijk <nils@citusdata.com>
Date: Wed, 27 Sep 2023 13:42:21 +0000
Subject: [PATCH] idiomatic use of CacheMemoryContext suggests to check its
 existence and create if not already created

---
 src/backend/distributed/utils/foreign_key_relationship.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/backend/distributed/utils/foreign_key_relationship.c b/src/backend/distributed/utils/foreign_key_relationship.c
index 7a7748412..4e79cb9fb 100644
--- a/src/backend/distributed/utils/foreign_key_relationship.c
+++ b/src/backend/distributed/utils/foreign_key_relationship.c
@@ -28,6 +28,7 @@
 #include "distributed/version_compat.h"
 #include "nodes/pg_list.h"
 #include "storage/lockdefs.h"
+#include "utils/catcache.h"
 #include "utils/fmgroids.h"
 #include "utils/hsearch.h"
 #include "common/hashfn.h"
@@ -332,6 +333,12 @@ CreateForeignConstraintRelationshipGraph()
 	 */
 	if (ForeignConstraintRelationshipMemoryContext == NULL)
 	{
+		/* make sure we've initialized CacheMemoryContext */
+		if (CacheMemoryContext == NULL)
+		{
+			CreateCacheMemoryContext();
+		}
+
 		ForeignConstraintRelationshipMemoryContext = AllocSetContextCreate(
 			CacheMemoryContext,
 			"Foreign Constraint Relationship Graph Context",