Force hash joins to be enabled in the hash join regression tests.

Otherwise the regressplans.sh tests generate extremely slow nested
loop joins.  Back-patch to 11 where the hash join tests came in.

Reported-by: Michael Paquier
Discussion: https://postgr.es/m/20190708055256.GB2709%40paquier.xyz

diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out
index d63cf442a1b07138c925656d1bd1df0dd6c18179..db4b9c29e5c289ac67064c14f1ba2659f43ed4bf 100644 (file)
--- a/src/test/regress/expected/join.out
+++ b/src/test/regress/expected/join.out
@@ -5998,6 +5998,7 @@ drop table j3;
 begin;
 set local min_parallel_table_scan_size = 0;
 set local parallel_setup_cost = 0;
+set local enable_hashjoin = on;
 -- Extract bucket and batch counts from an explain analyze plan.  In
 -- general we can't make assertions about how many batches (or
 -- buckets) will be required because it can vary, but we can in some

diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql
index 19eb782cb0f74a8fbff8fc50a6f0342b39c41fff..259c7c7a65eddc7ebee6a2cf51ce0b7476240d6c 100644 (file)
--- a/src/test/regress/sql/join.sql
+++ b/src/test/regress/sql/join.sql
@@ -2032,6 +2032,7 @@ begin;
 
 set local min_parallel_table_scan_size = 0;
 set local parallel_setup_cost = 0;
+set local enable_hashjoin = on;
 
 -- Extract bucket and batch counts from an explain analyze plan.  In
 -- general we can't make assertions about how many batches (or