diff --git a/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-notes.xml b/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-notes.xml
index b4da10ea54feda8f62bc07bd4504a9db00f69520..ddfc44346c4ebf0d4cedb5d440cf1a3c9285cbff 100644
--- a/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-notes.xml
+++ b/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-notes.xml
@@ -29,6 +29,8 @@
aggregate plan for a scalar distinct qualified aggregate.
optimizer_force_three_stage_scalar_dqa forces GPORCA to choose a plan
with multistage aggregates when such a plan alternative is generated.
+ optimizer_join_order sets the query optimization level for join ordering
+ by specifying which types of join ordering alternatives to evaluate.
optimizer_join_order_threshold specifies the maximum number of join
children for which GPORCA uses the dynamic programming-based join ordering algorithm.
optimizer_nestloop_factor controls nested loop join cost factor to apply
@@ -52,7 +54,8 @@
For information about the parameters, see the Greenplum Database Reference
Guide.
GPORCA generates minidumps to describe the optimization context for a given query. The minidump files are used by Pivotal support to analyze Greenplum
+ otherprops="pivotal"
+ >The minidump files are used by Pivotal support to analyze Greenplum
Database issues. The information in the file is not in a format that can be easily used
for debugging or troubleshooting. The minidump file is located under the master data directory
and uses the following naming format:
diff --git a/gpdb-doc/dita/admin_guide/topics/gporca-parameters.xml b/gpdb-doc/dita/admin_guide/topics/gporca-parameters.xml
index ccbeafd5d215ad7fe52147ab93220f51503f5161..60211b5a6c9f41f1e4f60644c1bff267428e3226 100644
--- a/gpdb-doc/dita/admin_guide/topics/gporca-parameters.xml
+++ b/gpdb-doc/dita/admin_guide/topics/gporca-parameters.xml
@@ -18,6 +18,7 @@
optimizer_join_arity_for_associativity_commutativity
+ optimizer_join_order
optimizer_join_order_threshold
optimizer_mdcache_size
diff --git a/gpdb-doc/dita/ref_guide/config_params/guc-list.xml b/gpdb-doc/dita/ref_guide/config_params/guc-list.xml
index 94af1b357e884173fa1d686327b0943dfd9d514b..5f1b3c2f9f259f11ccda32a1b644abe1008e633e 100644
--- a/gpdb-doc/dita/ref_guide/config_params/guc-list.xml
+++ b/gpdb-doc/dita/ref_guide/config_params/guc-list.xml
@@ -676,6 +676,9 @@
optimizer_join_arity_for_associativity_commutativity
+
+ optimizer_join_order
+
optimizer_join_order_threshold
@@ -7689,13 +7692,15 @@
The value is an optimization hint to limit the number of join associativity and join
commutativity transformations explored during query optimization. The limit controls the
alternative plans that GPORCA considers during query optimization. For example, the default
- value of 7 is a optimization hint for GPORCA to stop exploring join associativity and join
+ value of 7 is an optimization hint for GPORCA to stop exploring join associativity and join
commutativity transformations when an n-ary join operator has more than 7 children during
optimization.
For a query with a large number of joins, specifying a lower value improves query
performance by limiting the number of alternate query plans that GPORCA evaluates. However,
setting the value too low might cause GPORCA to generate a query plan that performs
sub-optimally.
+ This parameter has no effect when the optimizer_join_order parameter is
+ set to query or greedy.
This parameter can be set for a database system or a session.