Make all tests for pg_hint_plan runnable on *nix from contrib tree, adding neccessary extensions to EXTRA_INSTALL (for make check), creating additional configuration file to preload pg_stat_statements and modifying expected output

Author: vbwagner

contrib/pg_hint_plan/Makefile

@@ -15,6 +15,8 @@ REGRESS_OPTS = --encoding=UTF8
 
 EXTENSION = pg_hint_plan
 DATA = pg_hint_plan--1.1.3.sql
+EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
+EXTRA_INSTALL=contrib/pg_stat_statements contrib/btree_gist contrib/btree_gin contrib/file_fdw
 
 EXTRA_CLEAN = sql/ut-fdw.sql expected/ut-fdw.out
 
@@ -28,7 +30,7 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 override CFLAGS += -I$(top_srcdir)/src/pl/plpgsql/src
-REGRESS = init base_plan
+#REGRESS = init base_plan
 endif
 
 STARBALL96 = pg_hint_plan96-$(HINTPLANVER).tar.gz

contrib/pg_hint_plan/conf.add

@@ -0,0 +1 @@
+shared_preload_libraries='pg_stat_statements'

contrib/pg_hint_plan/expected/ut-R.out

@@ -660,11 +660,11 @@ EXPLAIN SELECT * FROM t_pg_class t1, t_pg_class t2 WHERE t1.oid = t2.oid;
 \! sql/maskout.sh results/ut-R.tmpout
                                   QUERY PLAN                                  
 ------------------------------------------------------------------------------
- Hash Join  (cost=xxx rows=360 width=xxx)
+ Hash Join  (cost=xxx rows=340 width=xxx)
    Hash Cond: (t1.oid = t2.oid)
-   ->  Seq Scan on t_pg_class t1  (cost=xxx rows=360 width=xxx)
-   ->  Hash  (cost=xxx rows=360 width=xxx)
-         ->  Seq Scan on t_pg_class t2  (cost=xxx rows=360 width=xxx)
+   ->  Seq Scan on t_pg_class t1  (cost=xxx rows=340 width=xxx)
+   ->  Hash  (cost=xxx rows=340 width=xxx)
+         ->  Seq Scan on t_pg_class t2  (cost=xxx rows=340 width=xxx)
 (5 rows)
 
 \o results/ut-R.tmpout
@@ -683,9 +683,9 @@ error hint:
 ------------------------------------------------------------------------------
  Hash Join  (cost=xxx rows=1 width=xxx)
    Hash Cond: (t1.oid = t2.oid)
-   ->  Seq Scan on t_pg_class t1  (cost=xxx rows=360 width=xxx)
-   ->  Hash  (cost=xxx rows=360 width=xxx)
-         ->  Seq Scan on t_pg_class t2  (cost=xxx rows=360 width=xxx)
+   ->  Seq Scan on t_pg_class t1  (cost=xxx rows=340 width=xxx)
+   ->  Hash  (cost=xxx rows=340 width=xxx)
+         ->  Seq Scan on t_pg_class t2  (cost=xxx rows=340 width=xxx)
 (5 rows)
 
 -- No. R-1-6-6

contrib/pg_hint_plan/expected/ut-S.out

@@ -4696,7 +4696,7 @@ SELECT max(b2t1.c1) FROM s1.t1 b2t1 WHERE b2t1.c1 = 1
 SELECT max(b4t1.c1) FROM s1.t1 b4t1 WHERE b4t1.c1 = 1);
                              QUERY PLAN                              
 ---------------------------------------------------------------------
- Result
+ Aggregate
    InitPlan 2 (returns $1)
      ->  Result
            InitPlan 1 (returns $0)
@@ -4709,11 +4709,9 @@ SELECT max(b4t1.c1) FROM s1.t1 b4t1 WHERE b4t1.c1 = 1);
              ->  Limit
                    ->  Index Only Scan using t1_i1 on t1 b4t1
                          Index Cond: ((c1 IS NOT NULL) AND (c1 = 1))
-   InitPlan 5 (returns $4)
-     ->  Limit
-           ->  Index Only Scan using t1_i1 on t1 b3t1
-                 Index Cond: ((c1 IS NOT NULL) AND (c1 = $3))
-(17 rows)
+   ->  Index Only Scan using t1_i1 on t1 b3t1
+         Index Cond: (c1 = $3)
+(15 rows)
 
 /*+SeqScan(b1t1)IndexScan(b2t1 t1_pkey)BitmapScan(b3t1 t1_pkey)TidScan(b4t1)
 */
@@ -4727,7 +4725,6 @@ SELECT max(b4t1.c1) FROM s1.t1 b4t1 WHERE b4t1.c1 = 1);
 LOG:  available indexes for IndexScan(b2t1): t1_pkey
 LOG:  available indexes for IndexScan(b2t1): t1_pkey
 LOG:  available indexes for BitmapScan(b3t1): t1_pkey
-LOG:  available indexes for BitmapScan(b3t1): t1_pkey
 LOG:  pg_hint_plan:
 used hint:
 IndexScan(b2t1 t1_pkey)
@@ -4740,7 +4737,7 @@ error hint:
 
                              QUERY PLAN                              
 ---------------------------------------------------------------------
- Result
+ Aggregate
    InitPlan 2 (returns $1)
      ->  Result
            InitPlan 1 (returns $0)
@@ -4753,13 +4750,11 @@ error hint:
              ->  Limit
                    ->  Seq Scan on t1 b4t1
                          Filter: ((c1 IS NOT NULL) AND (c1 = 1))
-   InitPlan 5 (returns $4)
-     ->  Limit
-           ->  Bitmap Heap Scan on t1 b3t1
-                 Recheck Cond: ((c1 IS NOT NULL) AND (c1 = $3))
-                 ->  Bitmap Index Scan on t1_pkey
-                       Index Cond: ((c1 IS NOT NULL) AND (c1 = $3))
-(19 rows)
+   ->  Bitmap Heap Scan on t1 b3t1
+         Recheck Cond: (c1 = $3)
+         ->  Bitmap Index Scan on t1_pkey
+               Index Cond: (c1 = $3)
+(17 rows)
 
 -- No. S-3-7-2
 EXPLAIN (COSTS false)