Fix regression test following core's behavior

Some changes has been made on GUC default value and behavior. Follow
the change. No change was made on pg_hint_plan's behavior.

diff --git a/expected/init.out b/expected/init.out
index 2472764..5d8c31e 100644 (file)
--- a/expected/init.out
+++ b/expected/init.out
@@ -173,7 +173,7 @@ SELECT * FROM settings;
  default_statistics_target      | 100       | Query Tuning / Other Planner Options
  force_parallel_mode            | off       | Query Tuning / Other Planner Options
  from_collapse_limit            | 8         | Query Tuning / Other Planner Options
- jit                            | on        | Query Tuning / Other Planner Options
+ jit                            | off       | Query Tuning / Other Planner Options
  join_collapse_limit            | 8         | Query Tuning / Other Planner Options
  cpu_index_tuple_cost           | 0.005     | Query Tuning / Planner Cost Constants
  cpu_operator_cost              | 0.0025    | Query Tuning / Planner Cost Constants

diff --git a/expected/pg_hint_plan.out b/expected/pg_hint_plan.out
index c462cf8..32f1bb1 100644 (file)
--- a/expected/pg_hint_plan.out
+++ b/expected/pg_hint_plan.out
@@ -224,7 +224,7 @@ error hint:
 /*+Set(work_mem "1M")*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 INFO:  invalid value for parameter "work_mem": "1M"
-HINT:  Valid units for this parameter are "kB", "MB", "GB", and "TB".
+HINT:  Valid units for this parameter are "B", "kB", "MB", "GB", and "TB".
 LOG:  pg_hint_plan:
 used hint:
 not used hint:
@@ -2999,6 +2999,7 @@ error hint:
    ->  Index Scan using t2_pkey on t2
 (4 rows)
 
+-- Cannot work
 /*+NestLoop(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1 FULL OUTER JOIN  t2 ON (t1.id = t2.id);
 LOG:  pg_hint_plan:
@@ -3011,10 +3012,10 @@ error hint:
           QUERY PLAN          
 ------------------------------
  Hash Full Join
-   Hash Cond: (t2.id = t1.id)
-   ->  Seq Scan on t2
+   Hash Cond: (t1.id = t2.id)
+   ->  Seq Scan on t1
    ->  Hash
-         ->  Seq Scan on t1
+         ->  Seq Scan on t2
 (5 rows)
 
 -- inheritance tables test

diff --git a/expected/ut-A.out b/expected/ut-A.out
index 15ec82b..9bc71f4 100644 (file)
--- a/expected/ut-A.out
+++ b/expected/ut-A.out
@@ -3238,7 +3238,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3293,7 +3293,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3367,7 +3367,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3422,7 +3422,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3485,7 +3485,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3571,7 +3571,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3623,7 +3623,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3687,7 +3687,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3766,7 +3766,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3837,7 +3837,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3910,7 +3910,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -3984,7 +3984,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -4058,7 +4058,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025
@@ -4133,7 +4133,7 @@ SELECT name, setting FROM settings;
  default_statistics_target      | 100
  force_parallel_mode            | off
  from_collapse_limit            | 8
- jit                            | on
+ jit                            | off
  join_collapse_limit            | 8
  cpu_index_tuple_cost           | 0.005
  cpu_operator_cost              | 0.0025

diff --git a/expected/ut-S.out b/expected/ut-S.out
index 07ffe41..27859d0 100644 (file)
--- a/expected/ut-S.out
+++ b/expected/ut-S.out
@@ -4632,14 +4632,15 @@ error hint:
 ---- No. S-3-6 query structure
 ----
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1 AND t1.ctid = '(1,1)';
-               QUERY PLAN                
------------------------------------------
- Nested Loop
-   Join Filter: (t1.c1 = t2.c1)
-   ->  Tid Scan on t1
-         TID Cond: (ctid = '(1,1)'::tid)
+                  QUERY PLAN                   
+-----------------------------------------------
+ Hash Join
+   Hash Cond: (t2.c1 = t1.c1)
    ->  Seq Scan on t2
-(5 rows)
+   ->  Hash
+         ->  Tid Scan on t1
+               TID Cond: (ctid = '(1,1)'::tid)
+(6 rows)
 
 -- No. S-3-6-1
 /*+SeqScan(t1)*/

diff --git a/sql/pg_hint_plan.sql b/sql/pg_hint_plan.sql
index b7dc394..f8172b2 100644 (file)
--- a/sql/pg_hint_plan.sql
+++ b/sql/pg_hint_plan.sql
@@ -336,6 +336,7 @@ EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id AND t1.ctid = '(1
 EXPLAIN (COSTS false) SELECT * FROM t1 FULL OUTER JOIN  t2 ON (t1.id = t2.id);
 /*+MergeJoin(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1 FULL OUTER JOIN  t2 ON (t1.id = t2.id);
+-- Cannot work
 /*+NestLoop(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1 FULL OUTER JOIN  t2 ON (t1.id = t2.id);