Fix another Assert issue exposed by CLOBBER_CACHE_ALWAYS.

tglsfdc · tglsfdc · commit faf5cee7f018 · 2011-09-18T23:46:04.000-04:00
plpgsql's exec_stmt_execsql was Assert'ing that a CachedPlanSource was
is_valid immediately after exec_prepare_plan.  The risk factor in this case
is that after building the prepared statement, exec_prepare_plan calls
exec_simple_check_plan, which might try to generate a generic plan --- and
with CLOBBER_CACHE_ALWAYS or other unusual causes of invalidation, that
could result in an invalidation.  However, that path could only be taken
for a SELECT query, for which we need not set mod_stmt.  So in this case
I think it's best to just remove the Assert; it's okay to look at a
slightly-stale querytree for what we need here.  Per buildfarm testing.
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -3027,7 +3027,6 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,
 			CachedPlanSource *plansource = (CachedPlanSource *) lfirst(l);
 			ListCell   *l2;
 
-			Assert(plansource->is_valid);
 			foreach(l2, plansource->query_list)
 			{
 				Query  *q = (Query *) lfirst(l2);

Original file line number	Diff line number	Diff line change
`@@ -3027,7 +3027,6 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,`
`3027`	`3027`	`CachedPlanSource plansource = (CachedPlanSource ) lfirst(l);`
`3028`	`3028`	`ListCell *l2;`
`3029`	`3029`
`3030`		`- Assert(plansource->is_valid);`
`3031`	`3030`	`foreach(l2, plansource->query_list)`
`3032`	`3031`	`{`
`3033`	`3032`	`Query q = (Query ) lfirst(l2);`