From c4944a93eb526f3799a36f30d46d6e765108b2b4 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Thu, 25 Jul 2019 14:50:48 -0700
Subject: [PATCH] Add missing (COSTS OFF) to EXPLAIN added in previous commit.

Backpatch: 12-, like the previous commit
---
 src/test/regress/expected/groupingsets.out | 26 +++++++++++-----------
 src/test/regress/sql/groupingsets.sql      |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/test/regress/expected/groupingsets.out b/src/test/regress/expected/groupingsets.out
index 146c54f5bf1..c1f802c88a7 100644
--- a/src/test/regress/expected/groupingsets.out
+++ b/src/test/regress/expected/groupingsets.out
@@ -1365,19 +1365,19 @@ explain (costs off)
 -- e.g. due to an index scan.
 BEGIN;
 SET LOCAL enable_hashagg = false;
-EXPLAIN SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
-                               QUERY PLAN                                
--------------------------------------------------------------------------
- Sort  (cost=1.20..1.21 rows=5 width=24)
+EXPLAIN (COSTS OFF) SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
+              QUERY PLAN               
+---------------------------------------
+ Sort
    Sort Key: a, b
-   ->  GroupAggregate  (cost=1.03..1.14 rows=5 width=24)
+   ->  GroupAggregate
          Group Key: a
          Group Key: ()
          Sort Key: b
            Group Key: b
-         ->  Sort  (cost=1.03..1.03 rows=2 width=8)
+         ->  Sort
                Sort Key: a
-               ->  Seq Scan on gstest3  (cost=0.00..1.02 rows=2 width=8)
+               ->  Seq Scan on gstest3
 (10 rows)
 
 SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
@@ -1391,17 +1391,17 @@ SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,(
 (5 rows)
 
 SET LOCAL enable_seqscan = false;
-EXPLAIN SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
-                                       QUERY PLAN                                        
------------------------------------------------------------------------------------------
- Sort  (cost=12.32..12.33 rows=5 width=24)
+EXPLAIN (COSTS OFF) SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
+                      QUERY PLAN                      
+------------------------------------------------------
+ Sort
    Sort Key: a, b
-   ->  GroupAggregate  (cost=0.13..12.26 rows=5 width=24)
+   ->  GroupAggregate
          Group Key: a
          Group Key: ()
          Sort Key: b
            Group Key: b
-         ->  Index Scan using gstest3_pkey on gstest3  (cost=0.13..12.16 rows=2 width=8)
+         ->  Index Scan using gstest3_pkey on gstest3
 (8 rows)
 
 SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
diff --git a/src/test/regress/sql/groupingsets.sql b/src/test/regress/sql/groupingsets.sql
index 2633fbf4284..95ac3fb52f6 100644
--- a/src/test/regress/sql/groupingsets.sql
+++ b/src/test/regress/sql/groupingsets.sql
@@ -389,10 +389,10 @@ explain (costs off)
 -- e.g. due to an index scan.
 BEGIN;
 SET LOCAL enable_hashagg = false;
-EXPLAIN SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
+EXPLAIN (COSTS OFF) SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
 SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
 SET LOCAL enable_seqscan = false;
-EXPLAIN SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
+EXPLAIN (COSTS OFF) SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
 SELECT a, b, count(*), max(a), max(b) FROM gstest3 GROUP BY GROUPING SETS(a, b,()) ORDER BY a, b;
 COMMIT;
 
-- 
GitLab