[スキャン方式]試験のPG9.2用予測結果ファイルの試験番号と分類名を項目表の通りに変更した。

diff --git a/expected/ut-S-9.2.out b/expected/ut-S-9.2.out
index 706d63f..9979711 100644 (file)
--- a/expected/ut-S-9.2.out
+++ b/expected/ut-S-9.2.out
@@ -619,7 +619,7 @@ error hint:
 (2 rows)
 
 ----
----- No. S-2-1 complexity query block
+---- No. S-2-1 some complexity query blocks
 ----
 -- No. S-2-1-1
 EXPLAIN (COSTS false)
@@ -2100,7 +2100,7 @@ error hint:
 (54 rows)
 
 ----
----- No. S-2-3 RULE definition table
+---- No. S-2-3 RULE or VIEW
 ----
 -- No. S-2-3-1
 EXPLAIN (COSTS false) UPDATE s1.r1 SET c1 = c1 WHERE c1 = 1 AND ctid = '(1,1)';
@@ -2848,6 +2848,14 @@ error hint:
                Filter: (ctid = '(1,1)'::tid)
 (62 rows)
 
+-- No. S-2-3-4
+
+-- No. S-2-3-5
+
+-- No. S-2-3-6
+
+-- No. S-2-3-7
+
 ----
 ---- No. S-2-4 VALUES clause
 ----
@@ -4393,10 +4401,7 @@ error hint:
    Filter: (c1 = 100)
 (2 rows)
 
-----
----- No. S-3-6 not exist index
-----
--- No. S-3-6-1
+-- No. S-3-5-4
 /*+IndexScan(ti1 not_exist)*/
 EXPLAIN (COSTS true) SELECT * FROM s1.ti1 WHERE c1 = 100;
 LOG:  available indexes for IndexScan(ti1):
@@ -4413,7 +4418,7 @@ error hint:
    Filter: (c1 = 100)
 (2 rows)
 
--- No. S-3-6-2
+-- No. S-3-5-5
 /*+BitmapScan(ti1 not_exist)*/
 EXPLAIN (COSTS true) SELECT * FROM s1.ti1 WHERE c1 = 100;
 LOG:  available indexes for BitmapScan(ti1):
@@ -4430,7 +4435,7 @@ error hint:
    Filter: (c1 = 100)
 (2 rows)
 
--- No. S-3-6-3
+-- No. S-3-5-6
 /*+IndexOnlyScan(ti1 not_exist)*/
 EXPLAIN (COSTS true) SELECT c1 FROM s1.ti1 WHERE c1 = 100;
 LOG:  available indexes for IndexOnlyScan(ti1):
@@ -4447,8 +4452,10 @@ error hint:
    Filter: (c1 = 100)
 (2 rows)
 
+-- No. S-3-5-7
+
 ----
----- No. S-3-7 query structure
+---- 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                   
@@ -4461,7 +4468,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1 AND t1.ctid
                TID Cond: (ctid = '(1,1)'::tid)
 (6 rows)
 
--- No. S-3-7-1
+-- No. S-3-6-1
 /*+SeqScan(t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE c1 = 100;
 LOG:  pg_hint_plan:
@@ -4477,7 +4484,7 @@ error hint:
    Filter: (c1 = 100)
 (2 rows)
 
--- No. S-3-7-2
+-- No. S-3-6-2
 /*+SeqScan(t1)BitmapScan(t2)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1 AND t1.ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -4499,7 +4506,7 @@ error hint:
                Index Cond: (c1 = t1.c1)
 (7 rows)
 
--- No. S-3-7-3
+-- No. S-3-6-3
 /*+SeqScan(t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1 AND t1.ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -4520,9 +4527,9 @@ error hint:
 (6 rows)
 
 ----
----- No. S-3-8 query structure
+---- No. S-3-7 query structure
 ----
--- No. S-3-8-1
+-- No. S-3-7-1
 EXPLAIN (COSTS false) 
 WITH c1 (c1) AS (
 SELECT max(b1t1.c1) FROM s1.t1 b1t1 WHERE b1t1.c1 = 1)
@@ -4597,7 +4604,7 @@ error hint:
                        Index Cond: ((c1 IS NOT NULL) AND (c1 = $3))
 (19 rows)
 
--- No. S-3-8-2
+-- No. S-3-7-2
 EXPLAIN (COSTS false) 
 WITH cte1 (c1) AS (
 SELECT max(b1t1.c1) FROM s1.t1 b1t1 JOIN s1.t2 b1t2 ON(b1t1.c1 = b1t2.c1) WHERE b1t1.c1 = 1)
@@ -4705,7 +4712,7 @@ error hint:
                Filter: (c1 = $2)
 (34 rows)
 
--- No. S-3-8-3
+-- No. S-3-7-3
 EXPLAIN (COSTS false) 
 WITH cte1 (c1) AS (
 SELECT max(b1t1.c1) FROM s1.t1 b1t1 JOIN s1.t2 b1t2 ON(b1t1.c1 = b1t2.c1) WHERE b1t1.c1 = 1)
@@ -4806,9 +4813,9 @@ error hint:
 (30 rows)
 
 ----
----- No. S-3-9 inheritance table select type
+---- No. S-3-8 inheritance table select type
 ----
--- No. S-3-9-1
+-- No. S-3-8-1
 EXPLAIN (COSTS false) SELECT * FROM ONLY s1.p1 WHERE c1 = 1;
      QUERY PLAN     
 --------------------
@@ -4831,7 +4838,7 @@ error hint:
    Index Cond: (c1 = 1)
 (2 rows)
 
--- No. S-3-9-2
+-- No. S-3-8-2
 EXPLAIN (COSTS false) SELECT * FROM s1.p1 WHERE c1 = 1;
            QUERY PLAN            
 ---------------------------------
@@ -4863,9 +4870,9 @@ error hint:
 (6 rows)
 
 ----
----- No. S-3-10 inheritance table number
+---- No. S-3-9 inheritance table number
 ----
--- No. S-3-10-1
+-- No. S-3-9-1
 EXPLAIN (COSTS false) SELECT * FROM s1.p1 WHERE c1 = 1;
            QUERY PLAN            
 ---------------------------------
@@ -4896,7 +4903,7 @@ error hint:
                Index Cond: (c1 = 1)
 (6 rows)
 
--- No. S-3-10-2
+-- No. S-3-9-2
 EXPLAIN (COSTS false) SELECT * FROM s1.p2 WHERE c1 = 1;
             QUERY PLAN             
 -----------------------------------
@@ -4932,7 +4939,7 @@ error hint:
 (8 rows)
 
 ----
----- No. S-3-11 inheritance table specified table
+---- No. S-3-10 inheritance table specified table
 ----
 EXPLAIN (COSTS false) SELECT * FROM s1.p2 WHERE c1 = 1;
             QUERY PLAN             
@@ -4947,7 +4954,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.p2 WHERE c1 = 1;
                Filter: (c1 = 1)
 (8 rows)
 
--- No. S-3-11-1
+-- No. S-3-10-1
 /*+IndexScan(p2)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.p2 WHERE c1 = 1;
 LOG:  pg_hint_plan:
@@ -4969,7 +4976,7 @@ error hint:
                Index Cond: (c1 = 1)
 (8 rows)
 
--- No. S-3-11-2
+-- No. S-3-10-2
 /*+IndexScan(p2c1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.p2 WHERE c1 = 1;
 LOG:  pg_hint_plan:
@@ -4991,7 +4998,7 @@ error hint:
                Filter: (c1 = 1)
 (8 rows)
 
--- No. S-3-11-3
+-- No. S-3-10-3
 /*+IndexScan(p2 p2_pkey p2c1_pkey p2c1c1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.p2 WHERE c1 = 1;
 LOG:  available indexes for IndexScan(p2): p2_pkey
@@ -5023,7 +5030,7 @@ error hint:
                Index Cond: (c1 = 1)
 (8 rows)
 
--- No. S-3-11-4
+-- No. S-3-10-4
 /*+IndexScan(p2 p2c1_pkey)*/
 EXPLAIN (COSTS true) SELECT * FROM s1.p2 WHERE c1 = 1;
 LOG:  available indexes for IndexScan(p2):
@@ -5056,9 +5063,9 @@ error hint:
 (8 rows)
 
 ----
----- No. S-3-12 specified same table
+---- No. S-3-11 specified same table
 ----
--- No. S-3-12-1
+-- No. S-3-11-1
 /*+IndexScan(ti1) BitmapScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "IndexScan(ti1) BitmapScan(ti1)"
@@ -5080,7 +5087,7 @@ error hint:
          Index Cond: (c1 = 1)
 (5 rows)
 
--- No. S-3-12-2
+-- No. S-3-11-2
 /*+IndexScan(ti1 ti1_pkey) BitmapScan(ti1 ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "IndexScan(ti1 ti1_pkey) BitmapScan(ti1 ti1_btree)"
@@ -5103,7 +5110,7 @@ error hint:
          Index Cond: (c1 = 1)
 (5 rows)
 
--- No. S-3-12-3
+-- No. S-3-11-3
 /*+BitmapScan(ti1) IndexScan(ti1) BitmapScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "BitmapScan(ti1) IndexScan(ti1) BitmapScan(ti1)"
@@ -5128,7 +5135,7 @@ error hint:
          Index Cond: (c1 = 1)
 (5 rows)
 
--- No. S-3-12-4
+-- No. S-3-11-4
 /*+BitmapScan(ti1 ti1_hash) IndexScan(ti1 ti1_pkey) BitmapScan(ti1 ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "BitmapScan(ti1 ti1_hash) IndexScan(ti1 ti1_pkey) BitmapScan(ti1 ti1_btree)"
@@ -5155,9 +5162,9 @@ error hint:
 (5 rows)
 
 ----
----- No. S-3-13 message output
+---- No. S-3-12 message output
 ----
--- No. S-3-13-1
+-- No. S-3-12-1
 /*+SeqScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -5173,7 +5180,7 @@ error hint:
    Filter: ((c1 = 1) AND (ctid = '(1,1)'::tid))
 (2 rows)
 
--- No. S-3-13-2
+-- No. S-3-12-2
 /*+SeqScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5192,7 +5199,7 @@ SeqScan(ti1 ti1_pkey)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-3
+-- No. S-3-12-3
 /*+SeqScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5211,7 +5218,7 @@ SeqScan(ti1 ti1_pkey ti1_btree)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-4
+-- No. S-3-12-4
 /*+IndexScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -5228,7 +5235,7 @@ error hint:
    Filter: (ctid = '(1,1)'::tid)
 (3 rows)
 
--- No. S-3-13-5
+-- No. S-3-12-5
 /*+IndexScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  available indexes for IndexScan(ti1): ti1_pkey
@@ -5246,7 +5253,7 @@ error hint:
    Filter: (ctid = '(1,1)'::tid)
 (3 rows)
 
--- No. S-3-13-6
+-- No. S-3-12-6
 /*+IndexScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  available indexes for IndexScan(ti1): ti1_btree ti1_pkey
@@ -5264,7 +5271,7 @@ error hint:
    Filter: (ctid = '(1,1)'::tid)
 (3 rows)
 
--- No. S-3-13-7
+-- No. S-3-12-7
 /*+BitmapScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -5283,7 +5290,7 @@ error hint:
          Index Cond: (c1 = 1)
 (5 rows)
 
--- No. S-3-13-8
+-- No. S-3-12-8
 /*+BitmapScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  available indexes for BitmapScan(ti1): ti1_pkey
@@ -5303,7 +5310,7 @@ error hint:
          Index Cond: (c1 = 1)
 (5 rows)
 
--- No. S-3-13-9
+-- No. S-3-12-9
 /*+BitmapScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  available indexes for BitmapScan(ti1): ti1_btree ti1_pkey
@@ -5323,7 +5330,7 @@ error hint:
          Index Cond: (c1 = 1)
 (5 rows)
 
--- No. S-3-13-10
+-- No. S-3-12-10
 /*+TidScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -5340,7 +5347,7 @@ error hint:
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-11
+-- No. S-3-12-11
 /*+TidScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5359,7 +5366,7 @@ TidScan(ti1 ti1_pkey)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-12
+-- No. S-3-12-12
 /*+TidScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5378,7 +5385,7 @@ TidScan(ti1 ti1_pkey ti1_btree)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-13
+-- No. S-3-12-13
 /*+NoSeqScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -5395,7 +5402,7 @@ error hint:
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-14
+-- No. S-3-12-14
 /*+NoSeqScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5414,7 +5421,7 @@ NoSeqScan(ti1 ti1_pkey)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-15
+-- No. S-3-12-15
 /*+NoSeqScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5433,7 +5440,7 @@ NoSeqScan(ti1 ti1_pkey ti1_btree)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-16
+-- No. S-3-12-16
 /*+NoIndexScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -5450,7 +5457,7 @@ error hint:
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-17
+-- No. S-3-12-17
 /*+NoIndexScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5469,7 +5476,7 @@ NoIndexScan(ti1 ti1_pkey)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-18
+-- No. S-3-12-18
 /*+NoIndexScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5488,7 +5495,7 @@ NoIndexScan(ti1 ti1_pkey ti1_btree)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-19
+-- No. S-3-12-19
 /*+NoBitmapScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -5505,7 +5512,7 @@ error hint:
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-20
+-- No. S-3-12-20
 /*+NoBitmapScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5524,7 +5531,7 @@ NoBitmapScan(ti1 ti1_pkey)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-21
+-- No. S-3-12-21
 /*+NoBitmapScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5543,7 +5550,7 @@ NoBitmapScan(ti1 ti1_pkey ti1_btree)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-22
+-- No. S-3-12-22
 /*+NoTidScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 LOG:  pg_hint_plan:
@@ -5560,7 +5567,7 @@ error hint:
    Filter: (ctid = '(1,1)'::tid)
 (3 rows)
 
--- No. S-3-13-23
+-- No. S-3-12-23
 /*+NoTidScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5579,7 +5586,7 @@ NoTidScan(ti1 ti1_pkey)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-24
+-- No. S-3-12-24
 /*+NoTidScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near ""
@@ -5598,7 +5605,7 @@ NoTidScan(ti1 ti1_pkey ti1_btree)
    Filter: (c1 = 1)
 (3 rows)
 
--- No. S-3-13-25
+-- No. S-3-12-25
 /*+IndexOnlyScan(ti1)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 >= 1;
 LOG:  pg_hint_plan:
@@ -5614,7 +5621,7 @@ error hint:
    Index Cond: (c1 >= 1)
 (2 rows)
 
--- No. S-3-13-26
+-- No. S-3-12-26
 /*+IndexOnlyScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 >= 1;
 LOG:  available indexes for IndexOnlyScan(ti1): ti1_pkey
@@ -5631,7 +5638,7 @@ error hint:
    Index Cond: (c1 >= 1)
 (2 rows)
 
--- No. S-3-13-27
+-- No. S-3-12-27
 /*+IndexOnlyScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 >= 1;
 LOG:  available indexes for IndexOnlyScan(ti1): ti1_btree ti1_pkey
@@ -5648,7 +5655,7 @@ error hint:
    Index Cond: (c1 >= 1)
 (2 rows)
 
--- No. S-3-13-28
+-- No. S-3-12-28
 /*+NoIndexOnlyScan(ti1)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 = 1;
 LOG:  pg_hint_plan:
@@ -5664,7 +5671,7 @@ error hint:
    Index Cond: (c1 = 1)
 (2 rows)
 
--- No. S-3-13-29
+-- No. S-3-12-29
 /*+NoIndexOnlyScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 = 1;
 INFO:  hint syntax error at or near ""
@@ -5682,7 +5689,7 @@ NoIndexOnlyScan(ti1 ti1_pkey)
    Index Cond: (c1 = 1)
 (2 rows)
 
--- No. S-3-13-30
+-- No. S-3-12-30
 /*+NoIndexOnlyScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 = 1;
 INFO:  hint syntax error at or near ""