From 94bd563ff0e24a745d35f448b110bd1fbd60c282 Mon Sep 17 00:00:00 2001
From: SaitTalhaNisanci <s.talhanisanci@gmail.com>
Date: Mon, 27 Jan 2020 13:00:46 +0300
Subject: [PATCH] switch back to old memory context in cache local plan for
 task (#3428)

---
 src/backend/distributed/executor/citus_custom_scan.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/backend/distributed/executor/citus_custom_scan.c b/src/backend/distributed/executor/citus_custom_scan.c
index 74fc1f11a..d2e5cd51f 100644
--- a/src/backend/distributed/executor/citus_custom_scan.c
+++ b/src/backend/distributed/executor/citus_custom_scan.c
@@ -433,6 +433,7 @@ CacheLocalPlanForTask(Task *task, DistributedPlan *originalDistributedPlan)
 	if (rangeTableEntry->relid == InvalidOid)
 	{
 		pfree(shardQuery);
+		MemoryContextSwitchTo(oldContext);
 		return;
 	}