plpgsql: Don't generate parallel plans for RETURN QUERY.

robertmhaas · robertmhaas · commit 5674a258fd7e · 2017-03-24T12:39:07.000-04:00
Commit 7aea8e4 allowed a parallel plan to be generated when for a RETURN QUERY or RETURN QUERY EXECUTE statement in a PL/pgsql block, but that's a bad idea because plplgsql asks the executor for 50 rows at a time. That means that we'll always be running serially a plan that was intended for parallel execution, which is not a good idea. Fix by not requesting a parallel plan from the outset. Per discussion, back-patch to 9.6. There is a slight risk that, due to optimizer error, somebody could have a case where the parallel plan executed serially is actually faster than the supposedly-best serial plan, but the consensus seems to be that that's not sufficient justification for leaving 9.6 unpatched. Discussion: http://postgr.es/m/CA+TgmoZ_ZuH+auEeeWnmtorPsgc_SmP+XWbDsJ+cWvWBSjNwDQ@mail.gmail.com Discussion: http://postgr.es/m/CA+TgmobXEhvHbJtWDuPZM9bVSLiTj-kShxQJ2uM5GPDze9fRYA@mail.gmail.com
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -2870,15 +2870,15 @@ exec_stmt_return_query(PLpgSQL_execstate *estate,
 	if (stmt->query != NULL)
 	{
 		/* static query */
-		exec_run_select(estate, stmt->query, 0, &portal, true);
+		exec_run_select(estate, stmt->query, 0, &portal, false);
 	}
 	else
 	{
 		/* RETURN QUERY EXECUTE */
 		Assert(stmt->dynquery != NULL);
 		portal = exec_dynquery_with_params(estate, stmt->dynquery,
 										   stmt->params, NULL,
-										   CURSOR_OPT_PARALLEL_OK);
+										   0);
 	}
 
 	tupmap = convert_tuples_by_position(portal->tupDesc,

Original file line number	Diff line number	Diff line change
`@@ -2870,15 +2870,15 @@ exec_stmt_return_query(PLpgSQL_execstate *estate,`
`2870`	`2870`	`if (stmt->query != NULL)`
`2871`	`2871`	`{`
`2872`	`2872`	`/* static query */`
`2873`		`- exec_run_select(estate, stmt->query, 0, &portal, true);`
	`2873`	`+ exec_run_select(estate, stmt->query, 0, &portal, false);`
`2874`	`2874`	`}`
`2875`	`2875`	`else`
`2876`	`2876`	`{`
`2877`	`2877`	`/* RETURN QUERY EXECUTE */`
`2878`	`2878`	`Assert(stmt->dynquery != NULL);`
`2879`	`2879`	`portal = exec_dynquery_with_params(estate, stmt->dynquery,`
`2880`	`2880`	`stmt->params, NULL,`
`2881`		`- CURSOR_OPT_PARALLEL_OK);`
	`2881`	`+ 0);`
`2882`	`2882`	`}`
`2883`	`2883`
`2884`	`2884`	`tupmap = convert_tuples_by_position(portal->tupDesc,`