Bugfix. Assertion on disabled query at the ExecutorEnd hook.

danolivo · danolivo · commit db8179b546c4 · 2023-02-01T14:42:21.000+05:00
In an extravagant situation:
(mode=disabled, forced stat gathering = 'on')
we can get into a situation when AQO is disabled
for a query, but previously cached plan contains some AQO preferences. Even so,
we should ignore the query at the end of execution.
diff --git a/postprocessing.c b/postprocessing.c
@@ -757,7 +757,7 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)
 	cardinality_sum_errors = 0.;
 	cardinality_num_objects = 0;
 
-	if (!ExtractFromQueryEnv(queryDesc))
+	if (IsQueryDisabled() || !ExtractFromQueryEnv(queryDesc))
 		/* AQO keep all query-related preferences at the query context.
 		 * It is needed to prevent from possible recursive changes, at
 		 * preprocessing stage of subqueries.
@@ -768,7 +768,6 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)
 
 	njoins = (enr != NULL) ? *(int *) enr->reldata : -1;
 
-	Assert(!IsQueryDisabled());
 	Assert(!IsParallelWorker());
 
 	if (query_context.explain_only)
