diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index f749fe9ce7..776ab1a8c8 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -5912,51 +5912,6 @@ SELECT * FROM parent WHERE key = 2400;
-
- force_parallel_mode (enum)
-
- force_parallel_mode configuration parameter
-
-
-
-
- Allows the use of parallel queries for testing purposes even in cases
- where no performance benefit is expected.
- The allowed values of force_parallel_mode are
- off (use parallel mode only when it is expected to improve
- performance), on (force parallel query for all queries
- for which it is thought to be safe), and regress (like
- on, but with additional behavior changes as explained
- below).
-
-
-
- More specifically, setting this value to on will add
- a Gather node to the top of any query plan for which this
- appears to be safe, so that the query runs inside of a parallel worker.
- Even when a parallel worker is not available or cannot be used,
- operations such as starting a subtransaction that would be prohibited
- in a parallel query context will be prohibited unless the planner
- believes that this will cause the query to fail. If failures or
- unexpected results occur when this option is set, some functions used
- by the query may need to be marked PARALLEL UNSAFE
- (or, possibly, PARALLEL RESTRICTED).
-
-
-
- Setting this value to regress has all of the same effects
- as setting it to on plus some additional effects that are
- intended to facilitate automated regression testing. Normally,
- messages from a parallel worker include a context line indicating that,
- but a setting of regress suppresses this line so that the
- output is the same as in non-parallel execution. Also,
- the Gather nodes added to plans by this setting are hidden
- in EXPLAIN output so that the output matches what
- would be obtained if this setting were turned off.
-
-
-
-
plan_cache_mode (enum)
@@ -10374,11 +10329,10 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
Developer Options
- The following parameters are intended for work on the
- PostgreSQL source code, and in some cases
- to assist with recovery of severely damaged databases. There
- should be no reason to use them on a production database.
- As such, they have been excluded from the sample
+ The following parameters are intended for developer testing, and
+ should never be used on a production database. However, some of
+ them can be used to assist with the recovery of severely damaged
+ databases. As such, they have been excluded from the sample
postgresql.conf file. Note that many of these
parameters require special source compilation flags to work at all.
@@ -10464,6 +10418,51 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
+
+ force_parallel_mode (enum)
+
+ force_parallel_mode configuration parameter
+
+
+
+
+ Allows the use of parallel queries for testing purposes even in cases
+ where no performance benefit is expected.
+ The allowed values of force_parallel_mode are
+ off (use parallel mode only when it is expected to improve
+ performance), on (force parallel query for all queries
+ for which it is thought to be safe), and regress (like
+ on, but with additional behavior changes as explained
+ below).
+
+
+
+ More specifically, setting this value to on will add
+ a Gather node to the top of any query plan for which this
+ appears to be safe, so that the query runs inside of a parallel worker.
+ Even when a parallel worker is not available or cannot be used,
+ operations such as starting a subtransaction that would be prohibited
+ in a parallel query context will be prohibited unless the planner
+ believes that this will cause the query to fail. If failures or
+ unexpected results occur when this option is set, some functions used
+ by the query may need to be marked PARALLEL UNSAFE
+ (or, possibly, PARALLEL RESTRICTED).
+
+
+
+ Setting this value to regress has all of the same effects
+ as setting it to on plus some additional effects that are
+ intended to facilitate automated regression testing. Normally,
+ messages from a parallel worker include a context line indicating that,
+ but a setting of regress suppresses this line so that the
+ output is the same as in non-parallel execution. Also,
+ the Gather nodes added to plans by this setting are hidden
+ in EXPLAIN output so that the output matches what
+ would be obtained if this setting were turned off.
+
+
+
+
ignore_system_indexes (boolean)
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 2ffefdf943..b130874bdc 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4922,10 +4922,10 @@ static struct config_enum ConfigureNamesEnum[] =
},
{
- {"force_parallel_mode", PGC_USERSET, QUERY_TUNING_OTHER,
+ {"force_parallel_mode", PGC_USERSET, DEVELOPER_OPTIONS,
gettext_noop("Forces use of parallel query facilities."),
gettext_noop("If possible, run query using a parallel worker and with parallel restrictions."),
- GUC_EXPLAIN
+ GUC_NOT_IN_SAMPLE | GUC_EXPLAIN
},
&force_parallel_mode,
FORCE_PARALLEL_OFF, force_parallel_mode_options,
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 2f6dd014a8..0f7f49b949 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -421,7 +421,6 @@
#from_collapse_limit = 8
#join_collapse_limit = 8 # 1 disables collapsing of explicit
# JOIN clauses
-#force_parallel_mode = off
#jit = on # allow JIT compilation
#plan_cache_mode = auto # auto, force_generic_plan or
# force_custom_plan