Skip to content

Commit 6542181

Browse files
tglsfdctglsfdc
committed
Add missing COSTS OFF to EXPLAIN commands in rowsecurity.sql.
Commit e5e11c8 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.
1 parent d37b816 commit 6542181

File tree

2 files changed

+104
-104
lines changed

2 files changed

+104
-104
lines changed

‎src/test/regress/expected/rowsecurity.out‎

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,42 +1680,42 @@ EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
16801680
(4 rows)
16811681

16821682
PREPARE plancache_test AS SELECT * FROM z1 WHERE f_leak(b);
1683-
EXPLAIN EXECUTE plancache_test;
1684-
QUERY PLAN
1685-
---------------------------------------------------------------
1686-
Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1683+
EXPLAIN (COSTS OFF) EXECUTE plancache_test;
1684+
QUERY PLAN
1685+
-------------------------------
1686+
Subquery Scan on z1
16871687
Filter: f_leak(z1.b)
1688-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1688+
-> Seq Scan on z1 z1_1
16891689
Filter: ((a % 2) = 0)
16901690
(4 rows)
16911691

16921692
PREPARE plancache_test2 AS WITH q AS (SELECT * FROM z1 WHERE f_leak(b)) SELECT * FROM q,z2;
1693-
EXPLAIN EXECUTE plancache_test2;
1694-
QUERY PLAN
1695-
-----------------------------------------------------------------------
1696-
Nested Loop (cost=29.11..86.78 rows=2540 width=72)
1693+
EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
1694+
QUERY PLAN
1695+
---------------------------------------
1696+
Nested Loop
16971697
CTE q
1698-
-> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1698+
-> Subquery Scan on z1
16991699
Filter: f_leak(z1.b)
1700-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1700+
-> Seq Scan on z1 z1_1
17011701
Filter: ((a % 2) = 0)
1702-
-> CTE Scan on q (cost=0.00..0.04 rows=2 width=36)
1703-
-> Materialize (cost=0.00..29.05 rows=1270 width=36)
1704-
-> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
1702+
-> CTE Scan on q
1703+
-> Materialize
1704+
-> Seq Scan on z2
17051705
(9 rows)
17061706

17071707
PREPARE plancache_test3 AS WITH q AS (SELECT * FROM z2) SELECT * FROM q,z1 WHERE f_leak(z1.b);
1708-
EXPLAIN EXECUTE plancache_test3;
1709-
QUERY PLAN
1710-
---------------------------------------------------------------------------
1711-
Nested Loop (cost=22.70..108.97 rows=2540 width=72)
1708+
EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
1709+
QUERY PLAN
1710+
-------------------------------------------
1711+
Nested Loop
17121712
CTE q
1713-
-> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
1714-
-> CTE Scan on q (cost=0.00..25.40 rows=1270 width=36)
1715-
-> Materialize (cost=0.00..29.12 rows=2 width=36)
1716-
-> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1713+
-> Seq Scan on z2
1714+
-> CTE Scan on q
1715+
-> Materialize
1716+
-> Subquery Scan on z1
17171717
Filter: f_leak(z1.b)
1718-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1718+
-> Seq Scan on z1 z1_1
17191719
Filter: ((a % 2) = 0)
17201720
(9 rows)
17211721

@@ -1738,40 +1738,40 @@ EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
17381738
Filter: ((a % 2) = 0)
17391739
(4 rows)
17401740

1741-
EXPLAIN EXECUTE plancache_test;
1742-
QUERY PLAN
1743-
---------------------------------------------------------------
1744-
Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1741+
EXPLAIN (COSTS OFF) EXECUTE plancache_test;
1742+
QUERY PLAN
1743+
-------------------------------
1744+
Subquery Scan on z1
17451745
Filter: f_leak(z1.b)
1746-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1746+
-> Seq Scan on z1 z1_1
17471747
Filter: ((a % 2) = 0)
17481748
(4 rows)
17491749

1750-
EXPLAIN EXECUTE plancache_test2;
1751-
QUERY PLAN
1752-
-----------------------------------------------------------------------
1753-
Nested Loop (cost=29.11..86.78 rows=2540 width=72)
1750+
EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
1751+
QUERY PLAN
1752+
---------------------------------------
1753+
Nested Loop
17541754
CTE q
1755-
-> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1755+
-> Subquery Scan on z1
17561756
Filter: f_leak(z1.b)
1757-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1757+
-> Seq Scan on z1 z1_1
17581758
Filter: ((a % 2) = 0)
1759-
-> CTE Scan on q (cost=0.00..0.04 rows=2 width=36)
1760-
-> Materialize (cost=0.00..29.05 rows=1270 width=36)
1761-
-> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
1759+
-> CTE Scan on q
1760+
-> Materialize
1761+
-> Seq Scan on z2
17621762
(9 rows)
17631763

1764-
EXPLAIN EXECUTE plancache_test3;
1765-
QUERY PLAN
1766-
---------------------------------------------------------------------------
1767-
Nested Loop (cost=22.70..108.97 rows=2540 width=72)
1764+
EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
1765+
QUERY PLAN
1766+
-------------------------------------------
1767+
Nested Loop
17681768
CTE q
1769-
-> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
1770-
-> CTE Scan on q (cost=0.00..25.40 rows=1270 width=36)
1771-
-> Materialize (cost=0.00..29.12 rows=2 width=36)
1772-
-> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1769+
-> Seq Scan on z2
1770+
-> CTE Scan on q
1771+
-> Materialize
1772+
-> Subquery Scan on z1
17731773
Filter: f_leak(z1.b)
1774-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1774+
-> Seq Scan on z1 z1_1
17751775
Filter: ((a % 2) = 0)
17761776
(9 rows)
17771777

@@ -1794,40 +1794,40 @@ EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
17941794
Filter: ((a % 2) = 1)
17951795
(4 rows)
17961796

1797-
EXPLAIN EXECUTE plancache_test;
1798-
QUERY PLAN
1799-
---------------------------------------------------------------
1800-
Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1797+
EXPLAIN (COSTS OFF) EXECUTE plancache_test;
1798+
QUERY PLAN
1799+
-------------------------------
1800+
Subquery Scan on z1
18011801
Filter: f_leak(z1.b)
1802-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1802+
-> Seq Scan on z1 z1_1
18031803
Filter: ((a % 2) = 1)
18041804
(4 rows)
18051805

1806-
EXPLAIN EXECUTE plancache_test2;
1807-
QUERY PLAN
1808-
-----------------------------------------------------------------------
1809-
Nested Loop (cost=29.11..86.78 rows=2540 width=72)
1806+
EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
1807+
QUERY PLAN
1808+
---------------------------------------
1809+
Nested Loop
18101810
CTE q
1811-
-> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1811+
-> Subquery Scan on z1
18121812
Filter: f_leak(z1.b)
1813-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1813+
-> Seq Scan on z1 z1_1
18141814
Filter: ((a % 2) = 1)
1815-
-> CTE Scan on q (cost=0.00..0.04 rows=2 width=36)
1816-
-> Materialize (cost=0.00..29.05 rows=1270 width=36)
1817-
-> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
1815+
-> CTE Scan on q
1816+
-> Materialize
1817+
-> Seq Scan on z2
18181818
(9 rows)
18191819

1820-
EXPLAIN EXECUTE plancache_test3;
1821-
QUERY PLAN
1822-
---------------------------------------------------------------------------
1823-
Nested Loop (cost=22.70..108.97 rows=2540 width=72)
1820+
EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
1821+
QUERY PLAN
1822+
-------------------------------------------
1823+
Nested Loop
18241824
CTE q
1825-
-> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
1826-
-> CTE Scan on q (cost=0.00..25.40 rows=1270 width=36)
1827-
-> Materialize (cost=0.00..29.12 rows=2 width=36)
1828-
-> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1825+
-> Seq Scan on z2
1826+
-> CTE Scan on q
1827+
-> Materialize
1828+
-> Subquery Scan on z1
18291829
Filter: f_leak(z1.b)
1830-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1830+
-> Seq Scan on z1 z1_1
18311831
Filter: ((a % 2) = 1)
18321832
(9 rows)
18331833

@@ -1850,40 +1850,40 @@ EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
18501850
Filter: ((a % 2) = 1)
18511851
(4 rows)
18521852

1853-
EXPLAIN EXECUTE plancache_test;
1854-
QUERY PLAN
1855-
---------------------------------------------------------------
1856-
Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1853+
EXPLAIN (COSTS OFF) EXECUTE plancache_test;
1854+
QUERY PLAN
1855+
-------------------------------
1856+
Subquery Scan on z1
18571857
Filter: f_leak(z1.b)
1858-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1858+
-> Seq Scan on z1 z1_1
18591859
Filter: ((a % 2) = 1)
18601860
(4 rows)
18611861

1862-
EXPLAIN EXECUTE plancache_test2;
1863-
QUERY PLAN
1864-
-----------------------------------------------------------------------
1865-
Nested Loop (cost=29.11..86.78 rows=2540 width=72)
1862+
EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
1863+
QUERY PLAN
1864+
---------------------------------------
1865+
Nested Loop
18661866
CTE q
1867-
-> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1867+
-> Subquery Scan on z1
18681868
Filter: f_leak(z1.b)
1869-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1869+
-> Seq Scan on z1 z1_1
18701870
Filter: ((a % 2) = 1)
1871-
-> CTE Scan on q (cost=0.00..0.04 rows=2 width=36)
1872-
-> Materialize (cost=0.00..29.05 rows=1270 width=36)
1873-
-> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
1871+
-> CTE Scan on q
1872+
-> Materialize
1873+
-> Seq Scan on z2
18741874
(9 rows)
18751875

1876-
EXPLAIN EXECUTE plancache_test3;
1877-
QUERY PLAN
1878-
---------------------------------------------------------------------------
1879-
Nested Loop (cost=22.70..108.97 rows=2540 width=72)
1876+
EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
1877+
QUERY PLAN
1878+
-------------------------------------------
1879+
Nested Loop
18801880
CTE q
1881-
-> Seq Scan on z2 (cost=0.00..22.70 rows=1270 width=36)
1882-
-> CTE Scan on q (cost=0.00..25.40 rows=1270 width=36)
1883-
-> Materialize (cost=0.00..29.12 rows=2 width=36)
1884-
-> Subquery Scan on z1 (cost=0.00..29.11 rows=2 width=36)
1881+
-> Seq Scan on z2
1882+
-> CTE Scan on q
1883+
-> Materialize
1884+
-> Subquery Scan on z1
18851885
Filter: f_leak(z1.b)
1886-
-> Seq Scan on z1 z1_1 (cost=0.00..29.05 rows=6 width=36)
1886+
-> Seq Scan on z1 z1_1
18871887
Filter: ((a % 2) = 1)
18881888
(9 rows)
18891889

‎src/test/regress/sql/rowsecurity.sql‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -650,37 +650,37 @@ SELECT * FROM z1 WHERE f_leak(b);
650650
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
651651

652652
PREPARE plancache_test AS SELECT * FROM z1 WHERE f_leak(b);
653-
EXPLAIN EXECUTE plancache_test;
653+
EXPLAIN (COSTS OFF) EXECUTE plancache_test;
654654

655655
PREPARE plancache_test2 AS WITH q AS (SELECT * FROM z1 WHERE f_leak(b)) SELECT * FROM q,z2;
656-
EXPLAIN EXECUTE plancache_test2;
656+
EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
657657

658658
PREPARE plancache_test3 AS WITH q AS (SELECT * FROM z2) SELECT * FROM q,z1 WHERE f_leak(z1.b);
659-
EXPLAIN EXECUTE plancache_test3;
659+
EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
660660

661661
SET ROLE rls_regress_group1;
662662
SELECT * FROM z1 WHERE f_leak(b);
663663
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
664664

665-
EXPLAIN EXECUTE plancache_test;
666-
EXPLAIN EXECUTE plancache_test2;
667-
EXPLAIN EXECUTE plancache_test3;
665+
EXPLAIN (COSTS OFF) EXECUTE plancache_test;
666+
EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
667+
EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
668668

669669
SET SESSION AUTHORIZATION rls_regress_user2;
670670
SELECT * FROM z1 WHERE f_leak(b);
671671
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
672672

673-
EXPLAIN EXECUTE plancache_test;
674-
EXPLAIN EXECUTE plancache_test2;
675-
EXPLAIN EXECUTE plancache_test3;
673+
EXPLAIN (COSTS OFF) EXECUTE plancache_test;
674+
EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
675+
EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
676676

677677
SET ROLE rls_regress_group2;
678678
SELECT * FROM z1 WHERE f_leak(b);
679679
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
680680

681-
EXPLAIN EXECUTE plancache_test;
682-
EXPLAIN EXECUTE plancache_test2;
683-
EXPLAIN EXECUTE plancache_test3;
681+
EXPLAIN (COSTS OFF) EXECUTE plancache_test;
682+
EXPLAIN (COSTS OFF) EXECUTE plancache_test2;
683+
EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
684684

685685
--
686686
-- Views should follow policy for view owner.

0 commit comments

Comments
 (0)