From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 19 Aug 2016 18:35:32 +0000 (-0400)
Subject: Guard against parallel-restricted functions in VALUES expressions.
X-Git-Tag: REL_10_BETA1~1849
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65a603e90328a7a8fb3ab30ed96f24bf8eb4cf84;p=postgresql

Guard against parallel-restricted functions in VALUES expressions.

Obvious brain fade in set_rel_consider_parallel().  Noticed it while
adjusting the adjacent RTE_FUNCTION case.

In 9.6, also make the code look more like what I just did in HEAD
by removing the unnecessary function_rte_parallel_ok subroutine
(it does nothing that expression_tree_walker wouldn't do).
---

diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index af73792227..04264b4335 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -599,11 +599,9 @@ set_rel_consider_parallel(PlannerInfo *root, RelOptInfo *rel,
 			break;
 
 		case RTE_VALUES:
-
-			/*
-			 * The data for a VALUES clause is stored in the plan tree itself,
-			 * so scanning it in a worker is fine.
-			 */
+			/* Check for parallel-restricted functions. */
+			if (!is_parallel_safe(root, (Node *) rte->values_lists))
+				return;
 			break;
 
 		case RTE_CTE: