aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2015-12-19 16:55:14 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2015-12-19 16:55:14 -0500
commit3ef762e7d806f18db743fd10bbf75a9b2631033c (patch)
tree6a6b1c0c5f3ae95131735e5808939215f69db0c0 /src
parent8ae22e7d36e349d7d8fd616fbf7f78cc03e301e0 (diff)
downloadpostgresql-3ef762e7d806f18db743fd10bbf75a9b2631033c.tar.gz
postgresql-3ef762e7d806f18db743fd10bbf75a9b2631033c.zip
Add missing COSTS OFF to EXPLAIN commands in rowsecurity.sql.
Commit e5e11c8cc added a bunch of EXPLAIN statements without COSTS OFF to the regression tests. This is contrary to project policy since it results in unnecessary platform dependencies in the output (it's just luck that we didn't get buildfarm failures from it). Per gripe from Mike Wilson.
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/expected/rowsecurity.out184
-rw-r--r--src/test/regress/sql/rowsecurity.sql24
2 files changed, 104 insertions, 104 deletions
diff --git a/src/test/regress/expected/rowsecurity.out b/src/test/regress/expected/rowsecurity.out
index 2102eab4577..8d925dc1605 100644
--- a/src/test/regress/expected/rowsecurity.out
+++ b/src/test/regress/expected/rowsecurity.out
@@ -1680,42 +1680,42 @@ EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
(4 rows)
PREPARE plancache_test AS SELECT * FROM z1 WHERE f_leak(b);
-EXPLAIN EXECUTE plancache_test;
- QUERY PLAN
----------------------------------------------------------------
- Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test;
+ QUERY PLAN
+-------------------------------
+ Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 0)
(4 rows)
PREPARE plancache_test2 AS WITH q AS (SELECT * FROM z1 WHERE f_leak(b)) SELECT * FROM q,z2;
-EXPLAIN EXECUTE plancache_test2;
- QUERY PLAN
------------------------------------------------------------------------
- Nested Loop (cost=29.11..86.78 rows=2540 width=72)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
+ QUERY PLAN
+---------------------------------------
+ Nested Loop
CTE q
- -> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+ -> Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 0)
- -> CTE Scan on q (cost=0.00..0.04 rows=2 width=36)
- -> Materialize (cost=0.00..29.05 rows=1270 width=36)
- -> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
+ -> CTE Scan on q
+ -> Materialize
+ -> Seq Scan on z2
(9 rows)
PREPARE plancache_test3 AS WITH q AS (SELECT * FROM z2) SELECT * FROM q,z1 WHERE f_leak(z1.b);
-EXPLAIN EXECUTE plancache_test3;
- QUERY PLAN
----------------------------------------------------------------------------
- Nested Loop (cost=22.70..108.97 rows=2540 width=72)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
+ QUERY PLAN
+-------------------------------------------
+ Nested Loop
CTE q
- -> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
- -> CTE Scan on q (cost=0.00..25.40 rows=1270 width=36)
- -> Materialize (cost=0.00..29.12 rows=2 width=36)
- -> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+ -> Seq Scan on z2
+ -> CTE Scan on q
+ -> Materialize
+ -> Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 0)
(9 rows)
@@ -1738,40 +1738,40 @@ EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
Filter: ((a % 2) = 0)
(4 rows)
-EXPLAIN EXECUTE plancache_test;
- QUERY PLAN
----------------------------------------------------------------
- Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test;
+ QUERY PLAN
+-------------------------------
+ Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 0)
(4 rows)
-EXPLAIN EXECUTE plancache_test2;
- QUERY PLAN
------------------------------------------------------------------------
- Nested Loop (cost=29.11..86.78 rows=2540 width=72)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
+ QUERY PLAN
+---------------------------------------
+ Nested Loop
CTE q
- -> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+ -> Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 0)
- -> CTE Scan on q (cost=0.00..0.04 rows=2 width=36)
- -> Materialize (cost=0.00..29.05 rows=1270 width=36)
- -> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
+ -> CTE Scan on q
+ -> Materialize
+ -> Seq Scan on z2
(9 rows)
-EXPLAIN EXECUTE plancache_test3;
- QUERY PLAN
----------------------------------------------------------------------------
- Nested Loop (cost=22.70..108.97 rows=2540 width=72)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
+ QUERY PLAN
+-------------------------------------------
+ Nested Loop
CTE q
- -> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
- -> CTE Scan on q (cost=0.00..25.40 rows=1270 width=36)
- -> Materialize (cost=0.00..29.12 rows=2 width=36)
- -> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+ -> Seq Scan on z2
+ -> CTE Scan on q
+ -> Materialize
+ -> Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 0)
(9 rows)
@@ -1794,40 +1794,40 @@ EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
Filter: ((a % 2) = 1)
(4 rows)
-EXPLAIN EXECUTE plancache_test;
- QUERY PLAN
----------------------------------------------------------------
- Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test;
+ QUERY PLAN
+-------------------------------
+ Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 1)
(4 rows)
-EXPLAIN EXECUTE plancache_test2;
- QUERY PLAN
------------------------------------------------------------------------
- Nested Loop (cost=29.11..86.78 rows=2540 width=72)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
+ QUERY PLAN
+---------------------------------------
+ Nested Loop
CTE q
- -> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+ -> Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 1)
- -> CTE Scan on q (cost=0.00..0.04 rows=2 width=36)
- -> Materialize (cost=0.00..29.05 rows=1270 width=36)
- -> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
+ -> CTE Scan on q
+ -> Materialize
+ -> Seq Scan on z2
(9 rows)
-EXPLAIN EXECUTE plancache_test3;
- QUERY PLAN
----------------------------------------------------------------------------
- Nested Loop (cost=22.70..108.97 rows=2540 width=72)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
+ QUERY PLAN
+-------------------------------------------
+ Nested Loop
CTE q
- -> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
- -> CTE Scan on q (cost=0.00..25.40 rows=1270 width=36)
- -> Materialize (cost=0.00..29.12 rows=2 width=36)
- -> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+ -> Seq Scan on z2
+ -> CTE Scan on q
+ -> Materialize
+ -> Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 1)
(9 rows)
@@ -1850,40 +1850,40 @@ EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
Filter: ((a % 2) = 1)
(4 rows)
-EXPLAIN EXECUTE plancache_test;
- QUERY PLAN
----------------------------------------------------------------
- Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test;
+ QUERY PLAN
+-------------------------------
+ Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 1)
(4 rows)
-EXPLAIN EXECUTE plancache_test2;
- QUERY PLAN
------------------------------------------------------------------------
- Nested Loop (cost=29.11..86.78 rows=2540 width=72)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
+ QUERY PLAN
+---------------------------------------
+ Nested Loop
CTE q
- -> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+ -> Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 1)
- -> CTE Scan on q (cost=0.00..0.04 rows=2 width=36)
- -> Materialize (cost=0.00..29.05 rows=1270 width=36)
- -> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
+ -> CTE Scan on q
+ -> Materialize
+ -> Seq Scan on z2
(9 rows)
-EXPLAIN EXECUTE plancache_test3;
- QUERY PLAN
----------------------------------------------------------------------------
- Nested Loop (cost=22.70..108.97 rows=2540 width=72)
+EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
+ QUERY PLAN
+-------------------------------------------
+ Nested Loop
CTE q
- -> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
- -> CTE Scan on q (cost=0.00..25.40 rows=1270 width=36)
- -> Materialize (cost=0.00..29.12 rows=2 width=36)
- -> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
+ -> Seq Scan on z2
+ -> CTE Scan on q
+ -> Materialize
+ -> Subquery Scan on z1
Filter: f_leak(z1.b)
- -> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
+ -> Seq Scan on z1 z1_1
Filter: ((a % 2) = 1)
(9 rows)
diff --git a/src/test/regress/sql/rowsecurity.sql b/src/test/regress/sql/rowsecurity.sql
index 34c551da823..decde90730d 100644
--- a/src/test/regress/sql/rowsecurity.sql
+++ b/src/test/regress/sql/rowsecurity.sql
@@ -650,37 +650,37 @@ SELECT * FROM z1 WHERE f_leak(b);
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
PREPARE plancache_test AS SELECT * FROM z1 WHERE f_leak(b);
-EXPLAIN EXECUTE plancache_test;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test;
PREPARE plancache_test2 AS WITH q AS (SELECT * FROM z1 WHERE f_leak(b)) SELECT * FROM q,z2;
-EXPLAIN EXECUTE plancache_test2;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
PREPARE plancache_test3 AS WITH q AS (SELECT * FROM z2) SELECT * FROM q,z1 WHERE f_leak(z1.b);
-EXPLAIN EXECUTE plancache_test3;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
SET ROLE rls_regress_group1;
SELECT * FROM z1 WHERE f_leak(b);
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
-EXPLAIN EXECUTE plancache_test;
-EXPLAIN EXECUTE plancache_test2;
-EXPLAIN EXECUTE plancache_test3;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
SET SESSION AUTHORIZATION rls_regress_user2;
SELECT * FROM z1 WHERE f_leak(b);
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
-EXPLAIN EXECUTE plancache_test;
-EXPLAIN EXECUTE plancache_test2;
-EXPLAIN EXECUTE plancache_test3;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
SET ROLE rls_regress_group2;
SELECT * FROM z1 WHERE f_leak(b);
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
-EXPLAIN EXECUTE plancache_test;
-EXPLAIN EXECUTE plancache_test2;
-EXPLAIN EXECUTE plancache_test3;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
+EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
--
-- Views should follow policy for view owner.