提交: d84beebd39ddb29f0a6abec5868f9dd9f25a9944 - pg_hint_plan (git)

firtst release

Commit MetaInfo

• 修訂: d84beebd39ddb29f0a6abec5868f9dd9f25a9944 (tree)
• 時間: 2014-09-17 15:26:57
• 作者: Kyotaro Horiguchi <horiguchi.kyotaro@lab....>
• Commiter: Kyotaro Horiguchi

Log Message

Stabilize regtest

Change Summary

• modified: expected/R_1-6-5.out
• modified: expected/ut-R.out
• modified: sql/ut-R.sql

差異

--- a/expected/R_1-6-5.out
+++ b/expected/R_1-6-5.out
@@ -1,18 +1,18 @@
-                                 QUERY PLAN                                 
-----------------------------------------------------------------------------
- Hash Join  (cost=xxx rows=612 width=396)
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Hash Join  (cost=xxx rows=100 width=xxx)
    Hash Cond: (t1.oid = t2.oid)
-   ->  Seq Scan on pg_class t1  (cost=xxx rows=612 width=202)
-   ->  Hash  (cost=xxx rows=612 width=202)
-         ->  Seq Scan on pg_class t2  (cost=xxx rows=612 width=202)
+   ->  Seq Scan on tmpcl t1  (cost=xxx rows=100 width=xxx)
+   ->  Hash  (cost=xxx rows=100 width=xxx)
+         ->  Seq Scan on tmpcl t2  (cost=xxx rows=100 width=xxx)
 (5 rows)
 
-                                 QUERY PLAN                                 
-----------------------------------------------------------------------------
- Hash Join  (cost=xxx rows=1 width=396)
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Hash Join  (cost=xxx rows=1 width=xxx)
    Hash Cond: (t1.oid = t2.oid)
-   ->  Seq Scan on pg_class t1  (cost=xxx rows=612 width=202)
-   ->  Hash  (cost=xxx rows=612 width=202)
-         ->  Seq Scan on pg_class t2  (cost=xxx rows=612 width=202)
+   ->  Seq Scan on tmpcl t1  (cost=xxx rows=100 width=xxx)
+   ->  Hash  (cost=xxx rows=100 width=xxx)
+         ->  Seq Scan on tmpcl t2  (cost=xxx rows=100 width=xxx)
 (5 rows)
 

--- a/expected/ut-R.out
+++ b/expected/ut-R.out
@@ -306,9 +306,11 @@ error hint:
 \! diff expected/R_1-6-4.out results/R_1-6-4.out
 -- No. R-1-6-5
 \o results/R_1-6-5.out.log
-EXPLAIN SELECT * FROM pg_catalog.pg_class t1, pg_catalog.pg_class t2 WHERE t1.oid = t2.oid;
+CREATE TABLE tmpcl WITH OIDS AS SELECT * from pg_catalog.pg_class limit 100;
+ANALYZE tmpcl;
+EXPLAIN SELECT * FROM tmpcl t1, tmpcl t2 WHERE t1.oid = t2.oid;
 /*+Rows(t1 t2 #1)*/
-EXPLAIN SELECT * FROM pg_catalog.pg_class t1, pg_catalog.pg_class t2 WHERE t1.oid = t2.oid;
+EXPLAIN SELECT * FROM tmpcl t1, tmpcl t2 WHERE t1.oid = t2.oid;
 LOG:  pg_hint_plan:
 used hint:
 Rows(t1 t2 #1)
@@ -317,7 +319,7 @@ duplication hint:
 error hint:
 
 \o
-\! sed 's/cost=[\.0-9]*/cost=xxx/' results/R_1-6-5.out.log > results/R_1-6-5.out
+\! sed -e 's/cost=[\.0-9]*/cost=xxx/' -e 's/width=[0-9]*/width=xxx/' results/R_1-6-5.out.log > results/R_1-6-5.out
 \! diff expected/R_1-6-5.out results/R_1-6-5.out
 -- No. R-1-6-6
 -- refer ut-fdw.sql

--- a/sql/ut-R.sql
+++ b/sql/ut-R.sql
@@ -190,11 +190,13 @@ EXPLAIN SELECT * FROM tm1 t1, tm1 t2 WHERE t1.c1 = t2.c1;
 
 -- No. R-1-6-5
 \o results/R_1-6-5.out.log
-EXPLAIN SELECT * FROM pg_catalog.pg_class t1, pg_catalog.pg_class t2 WHERE t1.oid = t2.oid;
+CREATE TABLE tmpcl WITH OIDS AS SELECT * from pg_catalog.pg_class limit 100;
+ANALYZE tmpcl;
+EXPLAIN SELECT * FROM tmpcl t1, tmpcl t2 WHERE t1.oid = t2.oid;
 /*+Rows(t1 t2 #1)*/
-EXPLAIN SELECT * FROM pg_catalog.pg_class t1, pg_catalog.pg_class t2 WHERE t1.oid = t2.oid;
+EXPLAIN SELECT * FROM tmpcl t1, tmpcl t2 WHERE t1.oid = t2.oid;
 \o
-\! sed 's/cost=[\.0-9]*/cost=xxx/' results/R_1-6-5.out.log > results/R_1-6-5.out
+\! sed -e 's/cost=[\.0-9]*/cost=xxx/' -e 's/width=[0-9]*/width=xxx/' results/R_1-6-5.out.log > results/R_1-6-5.out
 \! diff expected/R_1-6-5.out results/R_1-6-5.out
 
 -- No. R-1-6-6