diff options
| author | Robert Haas <rhaas@postgresql.org> | 2017-10-27 22:22:39 +0200 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2017-10-27 22:22:39 +0200 |
| commit | 682ce911f8f30de39b13cf211fc8ceb8c6cbc01b (patch) | |
| tree | 36caf44ee3d2da6af8fef9b9366ff4432e7ea91b /src/backend | |
| parent | 6784d7a1dc69d53b7f41eebf62bf7ffd63885294 (diff) | |
| download | postgresql-682ce911f8f30de39b13cf211fc8ceb8c6cbc01b.tar.gz postgresql-682ce911f8f30de39b13cf211fc8ceb8c6cbc01b.zip | |
Allow parallel query for prepared statements with generic plans.
This was always intended to work, but due to an oversight in
max_parallel_hazard_walker, it didn't. In testing, we missed the
fact that it was only working for custom plans, where the parameter
value has been substituted for the parameter itself early enough
that everything worked. In a generic plan, the Param node survives
and must be treated as parallel-safe. SerializeParamList provides
for the transmission of parameter values to workers.
Amit Kapila with help from Kuntal Ghosh. Some changes by me.
Discussion: http://postgr.es/m/CAA4eK1+_BuZrmVCeua5Eqnm4Co9DAXdM5HPAOE2J19ePbR912Q@mail.gmail.com
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/optimizer/util/clauses.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index 5344f6167a6..652843a146f 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -1223,13 +1223,17 @@ max_parallel_hazard_walker(Node *node, max_parallel_hazard_context *context) /* * We can't pass Params to workers at the moment either, so they are also - * parallel-restricted, unless they are PARAM_EXEC Params listed in - * safe_param_ids, meaning they could be generated within the worker. + * parallel-restricted, unless they are PARAM_EXTERN Params or are + * PARAM_EXEC Params listed in safe_param_ids, meaning they could be + * generated within the worker. */ else if (IsA(node, Param)) { Param *param = (Param *) node; + if (param->paramkind == PARAM_EXTERN) + return false; + if (param->paramkind != PARAM_EXEC || !list_member_int(context->safe_param_ids, param->paramid)) { |