Merge branch 'PGPROEE10_lru_fix' into PGPROEE10

Author: vbwagner

src/backend/utils/cache/plancache.c

@@ -137,6 +137,10 @@ PullPlanInLRU(CachedPlanSource *plansource)
 	if (plan_cache_lru_size <= 0)
 		return;
 
+	/* We don't cache oneshot plans */
+	if (plansource->is_oneshot)
+		return;
+
 	/* Remove from current place in LRU (if any) */
 	DeletePlanFromLRU(plansource);
 
@@ -175,6 +179,8 @@ PullPlanInLRU(CachedPlanSource *plansource)
 		{
 			MemoryContext qcxt = ps->query_context;
 
+			Assert(qcxt != ps->context);
+
 			ps->query_context = NULL;
 			MemoryContextDelete(qcxt);
 		}
@@ -193,6 +199,10 @@ PullPlanInLRU(CachedPlanSource *plansource)
 static void
 DeletePlanFromLRU(CachedPlanSource *plansource)
 {
+	/* We don't cache oneshot plans */
+	if (plansource->is_oneshot)
+		return;
+
 	if (plansource->lru_prev || plansource->lru_next)
 	{
 		plan_cache_lru_cur_size--;
@@ -430,8 +440,6 @@ CreateOneShotCachedPlan(RawStmt *raw_parse_tree,
 
 	PlanSourceContextRegisterCallback(CurrentMemoryContext, plansource);
 
-	PullPlanInLRU(plansource);
-
 	return plansource;
 }
 
@@ -806,6 +814,8 @@ RevalidateCachedQuery(CachedPlanSource *plansource,
 	{
 		MemoryContext qcxt = plansource->query_context;
 
+		Assert(qcxt != plansource->context);
+
 		plansource->query_context = NULL;
 		MemoryContextDelete(qcxt);
 	}