From 444fc4a6edaaa1197740bebdc2b842244f191637 Mon Sep 17 00:00:00 2001
From: Andrey Borodin <amborodin@acm.org>
Date: Fri, 7 May 2021 15:24:40 +0500
Subject: [PATCH v7 2/3] Remove DEBUG1 verification of the fact that index was
 built with sorting

---
 contrib/btree_gist/expected/bit.out         | 4 ----
 contrib/btree_gist/expected/bytea.out       | 4 ----
 contrib/btree_gist/expected/cash.out        | 4 ----
 contrib/btree_gist/expected/char.out        | 4 ----
 contrib/btree_gist/expected/cidr.out        | 4 ----
 contrib/btree_gist/expected/date.out        | 4 ----
 contrib/btree_gist/expected/enum.out        | 4 ----
 contrib/btree_gist/expected/float4.out      | 4 ----
 contrib/btree_gist/expected/float8.out      | 4 ----
 contrib/btree_gist/expected/inet.out        | 4 ----
 contrib/btree_gist/expected/int2.out        | 4 ----
 contrib/btree_gist/expected/int4.out        | 4 ----
 contrib/btree_gist/expected/int8.out        | 4 ----
 contrib/btree_gist/expected/interval.out    | 4 ----
 contrib/btree_gist/expected/macaddr.out     | 4 ----
 contrib/btree_gist/expected/macaddr8.out    | 4 ----
 contrib/btree_gist/expected/numeric.out     | 4 ----
 contrib/btree_gist/expected/oid.out         | 4 ----
 contrib/btree_gist/expected/text.out        | 4 ----
 contrib/btree_gist/expected/time.out        | 4 ----
 contrib/btree_gist/expected/timestamp.out   | 4 ----
 contrib/btree_gist/expected/timestamptz.out | 4 ----
 contrib/btree_gist/expected/timetz.out      | 4 ----
 contrib/btree_gist/expected/uuid.out        | 4 ----
 contrib/btree_gist/expected/varbit.out      | 4 ----
 contrib/btree_gist/expected/varchar.out     | 4 ----
 contrib/btree_gist/sql/bit.sql              | 1 -
 contrib/btree_gist/sql/bytea.sql            | 1 -
 contrib/btree_gist/sql/cash.sql             | 1 -
 contrib/btree_gist/sql/char.sql             | 1 -
 contrib/btree_gist/sql/cidr.sql             | 1 -
 contrib/btree_gist/sql/date.sql             | 1 -
 contrib/btree_gist/sql/enum.sql             | 1 -
 contrib/btree_gist/sql/float4.sql           | 1 -
 contrib/btree_gist/sql/float8.sql           | 1 -
 contrib/btree_gist/sql/inet.sql             | 1 -
 contrib/btree_gist/sql/int2.sql             | 1 -
 contrib/btree_gist/sql/int4.sql             | 1 -
 contrib/btree_gist/sql/int8.sql             | 1 -
 contrib/btree_gist/sql/interval.sql         | 1 -
 contrib/btree_gist/sql/macaddr.sql          | 1 -
 contrib/btree_gist/sql/macaddr8.sql         | 1 -
 contrib/btree_gist/sql/numeric.sql          | 1 -
 contrib/btree_gist/sql/oid.sql              | 1 -
 contrib/btree_gist/sql/text.sql             | 1 -
 contrib/btree_gist/sql/time.sql             | 1 -
 contrib/btree_gist/sql/timestamp.sql        | 1 -
 contrib/btree_gist/sql/timestamptz.sql      | 1 -
 contrib/btree_gist/sql/timetz.sql           | 2 --
 contrib/btree_gist/sql/uuid.sql             | 1 -
 contrib/btree_gist/sql/varbit.sql           | 1 -
 contrib/btree_gist/sql/varchar.sql          | 1 -
 52 files changed, 131 deletions(-)

diff --git a/contrib/btree_gist/expected/bit.out b/contrib/btree_gist/expected/bit.out
index cb2297ce80..c3da8456d4 100644
--- a/contrib/btree_gist/expected/bit.out
+++ b/contrib/btree_gist/expected/bit.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM bittmp WHERE a >   '011011000100010111011000110000100';
    350
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX bitidx ON bittmp USING GIST ( a );
-DEBUG:  building index "bitidx" on table "bittmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX bitidx_b ON bittmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "bitidx_b" on table "bittmp" serially
 DROP INDEX bitidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/bytea.out b/contrib/btree_gist/expected/bytea.out
index 170b48e1db..7f112236f3 100644
--- a/contrib/btree_gist/expected/bytea.out
+++ b/contrib/btree_gist/expected/bytea.out
@@ -33,12 +33,8 @@ SELECT count(*) FROM byteatmp WHERE a >   '31b0';
    400
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX byteaidx ON byteatmp USING GIST ( a );
-DEBUG:  building index "byteaidx" on table "byteatmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX byteaidx_b ON byteatmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "byteaidx_b" on table "byteatmp" serially
 DROP INDEX byteaidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/cash.out b/contrib/btree_gist/expected/cash.out
index 868af70b22..b8a2c71c5e 100644
--- a/contrib/btree_gist/expected/cash.out
+++ b/contrib/btree_gist/expected/cash.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '21472.79' FROM moneytmp ORDER BY a <-> '21472.79' LIMIT 3;
  $21,915.01 |  $442.22
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX moneyidx ON moneytmp USING gist ( a );
-DEBUG:  building index "moneyidx" on table "moneytmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX moneyidx_b ON moneytmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "moneyidx_b" on table "moneytmp" serially
 DROP INDEX moneyidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/char.out b/contrib/btree_gist/expected/char.out
index 97316cbb06..d4e5e9ad2d 100644
--- a/contrib/btree_gist/expected/char.out
+++ b/contrib/btree_gist/expected/char.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM chartmp WHERE a >   '31b0'::char(32);
    400
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX charidx ON chartmp USING GIST ( a );
-DEBUG:  building index "charidx" on table "chartmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX charidx_b ON chartmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "charidx_b" on table "chartmp" serially
 DROP INDEX charidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/cidr.out b/contrib/btree_gist/expected/cidr.out
index f15597c06a..782c174ea4 100644
--- a/contrib/btree_gist/expected/cidr.out
+++ b/contrib/btree_gist/expected/cidr.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM cidrtmp WHERE a >  '121.111.63.82';
    309
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX cidridx ON cidrtmp USING gist ( a );
-DEBUG:  building index "cidridx" on table "cidrtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX cidridx_b ON cidrtmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "cidridx_b" on table "cidrtmp" serially
 DROP INDEX cidridx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/date.out b/contrib/btree_gist/expected/date.out
index 5c93d02209..3a5e931f1a 100644
--- a/contrib/btree_gist/expected/date.out
+++ b/contrib/btree_gist/expected/date.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '2001-02-13' FROM datetmp ORDER BY a <-> '2001-02-13' LIMIT 3;
  03-24-2001 |       39
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX dateidx ON datetmp USING gist ( a );
-DEBUG:  building index "dateidx" on table "datetmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX dateidx_b ON datetmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "dateidx_b" on table "datetmp" serially
 DROP INDEX dateidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/enum.out b/contrib/btree_gist/expected/enum.out
index d73ad33974..fa7521a2e6 100644
--- a/contrib/btree_gist/expected/enum.out
+++ b/contrib/btree_gist/expected/enum.out
@@ -46,12 +46,8 @@ SELECT count(*) FROM enumtmp WHERE a >  'g'::rainbow;
    230
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX enumidx ON enumtmp USING gist ( a );
-DEBUG:  building index "enumidx" on table "enumtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX enumidx_b ON enumtmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "enumidx_b" on table "enumtmp" serially
 DROP INDEX enumidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/float4.out b/contrib/btree_gist/expected/float4.out
index 5f4f1aa4ec..83a88077f2 100644
--- a/contrib/btree_gist/expected/float4.out
+++ b/contrib/btree_gist/expected/float4.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '-179.0' FROM float4tmp ORDER BY a <-> '-179.0' LIMIT 3;
  -158.17741 | 20.822586
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX float4idx ON float4tmp USING gist ( a );
-DEBUG:  building index "float4idx" on table "float4tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX float4idx_b ON float4tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "float4idx_b" on table "float4tmp" serially
 DROP INDEX float4idx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/float8.out b/contrib/btree_gist/expected/float8.out
index 4db0f7b828..e29f1dea75 100644
--- a/contrib/btree_gist/expected/float8.out
+++ b/contrib/btree_gist/expected/float8.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '-1890.0' FROM float8tmp ORDER BY a <-> '-1890.0' LIMIT 3;
   -1769.73634 | 120.26366000000007
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX float8idx ON float8tmp USING gist ( a );
-DEBUG:  building index "float8idx" on table "float8tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX float8idx_b ON float8tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "float8idx_b" on table "float8tmp" serially
 DROP INDEX float8idx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/inet.out b/contrib/btree_gist/expected/inet.out
index 0847d3b7d1..7ff1598634 100644
--- a/contrib/btree_gist/expected/inet.out
+++ b/contrib/btree_gist/expected/inet.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM inettmp WHERE a >  '89.225.196.191';
    386
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX inetidx ON inettmp USING gist ( a );
-DEBUG:  building index "inetidx" on table "inettmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX inetidx_b ON inettmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "inetidx_b" on table "inettmp" serially
 DROP INDEX inetidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/int2.out b/contrib/btree_gist/expected/int2.out
index 9ad06a8dce..f1337a3534 100644
--- a/contrib/btree_gist/expected/int2.out
+++ b/contrib/btree_gist/expected/int2.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '237' FROM int2tmp ORDER BY a <-> '237' LIMIT 3;
  228 |        9
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int2idx ON int2tmp USING gist ( a );
-DEBUG:  building index "int2idx" on table "int2tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX int2idx_b ON int2tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "int2idx_b" on table "int2tmp" serially
 DROP INDEX int2idx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/int4.out b/contrib/btree_gist/expected/int4.out
index fdf143f32c..425b0183cd 100644
--- a/contrib/btree_gist/expected/int4.out
+++ b/contrib/btree_gist/expected/int4.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '237' FROM int4tmp ORDER BY a <-> '237' LIMIT 3;
  228 |        9
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int4idx ON int4tmp USING gist ( a );
-DEBUG:  building index "int4idx" on table "int4tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX int4idx_b ON int4tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "int4idx_b" on table "int4tmp" serially
 DROP INDEX int4idx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/int8.out b/contrib/btree_gist/expected/int8.out
index 532c4e5e70..1e327b28e8 100644
--- a/contrib/btree_gist/expected/int8.out
+++ b/contrib/btree_gist/expected/int8.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '464571291354841' FROM int8tmp ORDER BY a <-> '464571291354841'
  478227196042750 | 13655904687909
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int8idx ON int8tmp USING gist ( a );
-DEBUG:  building index "int8idx" on table "int8tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX int8idx_b ON int8tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "int8idx_b" on table "int8tmp" serially
 DROP INDEX int8idx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/interval.out b/contrib/btree_gist/expected/interval.out
index 12d50fdf58..b23d1591a6 100644
--- a/contrib/btree_gist/expected/interval.out
+++ b/contrib/btree_gist/expected/interval.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21
  @ 220 days 19 hours 5 mins 42 secs  | @ 21 days -2 hours -15 mins -41 secs
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX intervalidx ON intervaltmp USING gist ( a );
-DEBUG:  building index "intervalidx" on table "intervaltmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX intervalidx_b ON intervaltmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "intervalidx_b" on table "intervaltmp" serially
 DROP INDEX intervalidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/macaddr.out b/contrib/btree_gist/expected/macaddr.out
index 9634000618..06a8044257 100644
--- a/contrib/btree_gist/expected/macaddr.out
+++ b/contrib/btree_gist/expected/macaddr.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM macaddrtmp WHERE a >  '22:00:5c:e5:9b:0d';
    540
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX macaddridx ON macaddrtmp USING gist ( a );
-DEBUG:  building index "macaddridx" on table "macaddrtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX macaddridx_b ON macaddrtmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "macaddridx_b" on table "macaddrtmp" serially
 DROP INDEX macaddridx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/macaddr8.out b/contrib/btree_gist/expected/macaddr8.out
index 910223cd3b..284d66cce3 100644
--- a/contrib/btree_gist/expected/macaddr8.out
+++ b/contrib/btree_gist/expected/macaddr8.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM macaddr8tmp WHERE a >  '22:00:5c:e5:9b:0d';
    540
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX macaddr8idx ON macaddr8tmp USING gist ( a );
-DEBUG:  building index "macaddr8idx" on table "macaddr8tmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX macaddr8idx_b ON macaddr8tmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "macaddr8idx_b" on table "macaddr8tmp" serially
 DROP INDEX macaddr8idx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/numeric.out b/contrib/btree_gist/expected/numeric.out
index 8dce480c30..a3e2a896c5 100644
--- a/contrib/btree_gist/expected/numeric.out
+++ b/contrib/btree_gist/expected/numeric.out
@@ -94,12 +94,8 @@ SELECT count(*) FROM numerictmp WHERE a >  0 ;
    576
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX numericidx ON numerictmp USING gist ( a );
-DEBUG:  building index "numericidx" on table "numerictmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX numericidx_b ON numerictmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "numericidx_b" on table "numerictmp" serially
 DROP INDEX numericidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/oid.out b/contrib/btree_gist/expected/oid.out
index da27172609..59ddef92f7 100644
--- a/contrib/btree_gist/expected/oid.out
+++ b/contrib/btree_gist/expected/oid.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM oidtmp WHERE oid >  17;
    983
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX oididx ON oidtmp USING gist ( oid );
-DEBUG:  building index "oididx" on table "oidtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX oididx_b ON oidtmp USING gist ( oid ) WITH (buffering=on);
-DEBUG:  building index "oididx_b" on table "oidtmp" serially
 DROP INDEX oididx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/text.out b/contrib/btree_gist/expected/text.out
index 2e760d1487..223ffb2750 100644
--- a/contrib/btree_gist/expected/text.out
+++ b/contrib/btree_gist/expected/text.out
@@ -33,12 +33,8 @@ SELECT count(*) FROM texttmp WHERE a >   '31b0';
    400
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX textidx ON texttmp USING GIST ( a );
-DEBUG:  building index "textidx" on table "texttmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX textidx_b ON texttmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "textidx_b" on table "texttmp" serially
 DROP INDEX textidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/time.out b/contrib/btree_gist/expected/time.out
index 9b81e58ed4..0b972ac35a 100644
--- a/contrib/btree_gist/expected/time.out
+++ b/contrib/btree_gist/expected/time.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '10:57:11' FROM timetmp ORDER BY a <-> '10:57:11' LIMIT 3;
  10:55:32 | @ 1 min 39 secs
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timeidx ON timetmp USING gist ( a );
-DEBUG:  building index "timeidx" on table "timetmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX timeidx_b ON timetmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "timeidx_b" on table "timetmp" serially
 DROP INDEX timeidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/timestamp.out b/contrib/btree_gist/expected/timestamp.out
index 8ea9897551..b17f65f698 100644
--- a/contrib/btree_gist/expected/timestamp.out
+++ b/contrib/btree_gist/expected/timestamp.out
@@ -40,12 +40,8 @@ SELECT a, a <-> '2004-10-26 08:55:08' FROM timestamptmp ORDER BY a <-> '2004-10-
  Mon Nov 29 20:12:43 2004 | @ 34 days 11 hours 17 mins 35 secs
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timestampidx ON timestamptmp USING gist ( a );
-DEBUG:  building index "timestampidx" on table "timestamptmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX timestampidx_b ON timestamptmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "timestampidx_b" on table "timestamptmp" serially
 DROP INDEX timestampidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/timestamptz.out b/contrib/btree_gist/expected/timestamptz.out
index 2ba0dcd7ed..5b098006cd 100644
--- a/contrib/btree_gist/expected/timestamptz.out
+++ b/contrib/btree_gist/expected/timestamptz.out
@@ -100,12 +100,8 @@ SELECT a, a <-> '2018-12-18 10:59:54 GMT+2' FROM timestamptztmp ORDER BY a <-> '
  Thu Jan 24 12:28:12 2019 PST | @ 37 days 7 hours 28 mins 18 secs
 (3 rows)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timestamptzidx ON timestamptztmp USING gist ( a );
-DEBUG:  building index "timestamptzidx" on table "timestamptztmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX timestamptzidx_b ON timestamptztmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "timestamptzidx_b" on table "timestamptztmp" serially
 DROP INDEX timestamptzidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/timetz.out b/contrib/btree_gist/expected/timetz.out
index 6c855bfcd6..33d9b2ace3 100644
--- a/contrib/btree_gist/expected/timetz.out
+++ b/contrib/btree_gist/expected/timetz.out
@@ -18,12 +18,8 @@ INSERT INTO timetzcmp (r_id,a) SELECT 22,count(*) FROM timetztmp WHERE a <= '07:
 INSERT INTO timetzcmp (r_id,a) SELECT 23,count(*) FROM timetztmp WHERE a  = '07:46:45 GMT+4';
 INSERT INTO timetzcmp (r_id,a) SELECT 24,count(*) FROM timetztmp WHERE a >= '07:46:45 GMT+4';
 INSERT INTO timetzcmp (r_id,a) SELECT 25,count(*) FROM timetztmp WHERE a >  '07:46:45 GMT+4';
-SET client_min_messages = DEBUG1;
 CREATE INDEX timetzidx ON timetztmp USING gist ( a );
-DEBUG:  building index "timetzidx" on table "timetztmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX timetzidx_b ON timetztmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "timetzidx_b" on table "timetztmp" serially
 DROP INDEX timetzidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/uuid.out b/contrib/btree_gist/expected/uuid.out
index 0f0f296039..3d292dce5a 100644
--- a/contrib/btree_gist/expected/uuid.out
+++ b/contrib/btree_gist/expected/uuid.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM uuidtmp WHERE a >  '55e65ca2-4136-4a4b-ba78-cd3fe4678203';
    375
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX uuididx ON uuidtmp USING gist ( a );
-DEBUG:  building index "uuididx" on table "uuidtmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX uuididx_b ON uuidtmp USING gist ( a ) WITH (buffering=on);
-DEBUG:  building index "uuididx_b" on table "uuidtmp" serially
 DROP INDEX uuididx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/varbit.out b/contrib/btree_gist/expected/varbit.out
index 9cd41f4c9a..1722e0077a 100644
--- a/contrib/btree_gist/expected/varbit.out
+++ b/contrib/btree_gist/expected/varbit.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM varbittmp WHERE a >   '1110100111010';
     50
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX varbitidx ON varbittmp USING GIST ( a );
-DEBUG:  building index "varbitidx" on table "varbittmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX varbitidx_b ON varbittmp USING GIST ( a ) WITH (buffering=on);
-DEBUG:  building index "varbitidx_b" on table "varbittmp" serially
 DROP INDEX varbitidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/expected/varchar.out b/contrib/btree_gist/expected/varchar.out
index 0520eb4731..6085e5ec99 100644
--- a/contrib/btree_gist/expected/varchar.out
+++ b/contrib/btree_gist/expected/varchar.out
@@ -32,12 +32,8 @@ SELECT count(*) FROM vchartmp WHERE a >   '31b0'::varchar(32);
    400
 (1 row)
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX vcharidx ON vchartmp USING GIST ( text(a) );
-DEBUG:  building index "vcharidx" on table "vchartmp" serially
-DEBUG:  using sorted GiST build
 CREATE INDEX vcharidx_b ON vchartmp USING GIST ( text(a) ) WITH (buffering=on);
-DEBUG:  building index "vcharidx_b" on table "vchartmp" serially
 DROP INDEX vcharidx_b;
 RESET client_min_messages;
 SET enable_seqscan=off;
diff --git a/contrib/btree_gist/sql/bit.sql b/contrib/btree_gist/sql/bit.sql
index 53c67cf77a..f7f72354fe 100644
--- a/contrib/btree_gist/sql/bit.sql
+++ b/contrib/btree_gist/sql/bit.sql
@@ -16,7 +16,6 @@ SELECT count(*) FROM bittmp WHERE a >=  '011011000100010111011000110000100';
 
 SELECT count(*) FROM bittmp WHERE a >   '011011000100010111011000110000100';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX bitidx ON bittmp USING GIST ( a );
 CREATE INDEX bitidx_b ON bittmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX bitidx_b;
diff --git a/contrib/btree_gist/sql/bytea.sql b/contrib/btree_gist/sql/bytea.sql
index fdfa0c345b..184de9a04a 100644
--- a/contrib/btree_gist/sql/bytea.sql
+++ b/contrib/btree_gist/sql/bytea.sql
@@ -17,7 +17,6 @@ SELECT count(*) FROM byteatmp WHERE a >=  '31b0';
 
 SELECT count(*) FROM byteatmp WHERE a >   '31b0';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX byteaidx ON byteatmp USING GIST ( a );
 CREATE INDEX byteaidx_b ON byteatmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX byteaidx_b;
diff --git a/contrib/btree_gist/sql/cash.sql b/contrib/btree_gist/sql/cash.sql
index 0581b3593e..be158b4ca9 100644
--- a/contrib/btree_gist/sql/cash.sql
+++ b/contrib/btree_gist/sql/cash.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM moneytmp WHERE a >  '22649.64';
 
 SELECT a, a <-> '21472.79' FROM moneytmp ORDER BY a <-> '21472.79' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX moneyidx ON moneytmp USING gist ( a );
 CREATE INDEX moneyidx_b ON moneytmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX moneyidx_b;
diff --git a/contrib/btree_gist/sql/char.sql b/contrib/btree_gist/sql/char.sql
index 234eabee3b..7db4fd9f6f 100644
--- a/contrib/btree_gist/sql/char.sql
+++ b/contrib/btree_gist/sql/char.sql
@@ -16,7 +16,6 @@ SELECT count(*) FROM chartmp WHERE a >=  '31b0'::char(32);
 
 SELECT count(*) FROM chartmp WHERE a >   '31b0'::char(32);
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX charidx ON chartmp USING GIST ( a );
 CREATE INDEX charidx_b ON chartmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX charidx_b;
diff --git a/contrib/btree_gist/sql/cidr.sql b/contrib/btree_gist/sql/cidr.sql
index be2d22b079..a30490f674 100644
--- a/contrib/btree_gist/sql/cidr.sql
+++ b/contrib/btree_gist/sql/cidr.sql
@@ -15,7 +15,6 @@ SELECT count(*) FROM cidrtmp WHERE a >= '121.111.63.82';
 
 SELECT count(*) FROM cidrtmp WHERE a >  '121.111.63.82';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX cidridx ON cidrtmp USING gist ( a );
 CREATE INDEX cidridx_b ON cidrtmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX cidridx_b;
diff --git a/contrib/btree_gist/sql/date.sql b/contrib/btree_gist/sql/date.sql
index f007402bac..d1c6292e2f 100644
--- a/contrib/btree_gist/sql/date.sql
+++ b/contrib/btree_gist/sql/date.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM datetmp WHERE a >  '2001-02-13';
 
 SELECT a, a <-> '2001-02-13' FROM datetmp ORDER BY a <-> '2001-02-13' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX dateidx ON datetmp USING gist ( a );
 CREATE INDEX dateidx_b ON datetmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX dateidx_b;
diff --git a/contrib/btree_gist/sql/enum.sql b/contrib/btree_gist/sql/enum.sql
index d6dbcb4239..4d169cf474 100644
--- a/contrib/btree_gist/sql/enum.sql
+++ b/contrib/btree_gist/sql/enum.sql
@@ -20,7 +20,6 @@ SELECT count(*) FROM enumtmp WHERE a >= 'g'::rainbow;
 
 SELECT count(*) FROM enumtmp WHERE a >  'g'::rainbow;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX enumidx ON enumtmp USING gist ( a );
 CREATE INDEX enumidx_b ON enumtmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX enumidx_b;
diff --git a/contrib/btree_gist/sql/float4.sql b/contrib/btree_gist/sql/float4.sql
index 0e3eb49343..8ccc8187e3 100644
--- a/contrib/btree_gist/sql/float4.sql
+++ b/contrib/btree_gist/sql/float4.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM float4tmp WHERE a >  -179.0;
 
 SELECT a, a <-> '-179.0' FROM float4tmp ORDER BY a <-> '-179.0' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX float4idx ON float4tmp USING gist ( a );
 CREATE INDEX float4idx_b ON float4tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX float4idx_b;
diff --git a/contrib/btree_gist/sql/float8.sql b/contrib/btree_gist/sql/float8.sql
index 6a216dd606..1560bed6f9 100644
--- a/contrib/btree_gist/sql/float8.sql
+++ b/contrib/btree_gist/sql/float8.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM float8tmp WHERE a >  -1890.0;
 
 SELECT a, a <-> '-1890.0' FROM float8tmp ORDER BY a <-> '-1890.0' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX float8idx ON float8tmp USING gist ( a );
 CREATE INDEX float8idx_b ON float8tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX float8idx_b;
diff --git a/contrib/btree_gist/sql/inet.sql b/contrib/btree_gist/sql/inet.sql
index 0339c853d3..60c4894116 100644
--- a/contrib/btree_gist/sql/inet.sql
+++ b/contrib/btree_gist/sql/inet.sql
@@ -16,7 +16,6 @@ SELECT count(*) FROM inettmp WHERE a >= '89.225.196.191';
 
 SELECT count(*) FROM inettmp WHERE a >  '89.225.196.191';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX inetidx ON inettmp USING gist ( a );
 CREATE INDEX inetidx_b ON inettmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX inetidx_b;
diff --git a/contrib/btree_gist/sql/int2.sql b/contrib/btree_gist/sql/int2.sql
index bf98ac65f8..9781447bbc 100644
--- a/contrib/btree_gist/sql/int2.sql
+++ b/contrib/btree_gist/sql/int2.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM int2tmp WHERE a >  237;
 
 SELECT a, a <-> '237' FROM int2tmp ORDER BY a <-> '237' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int2idx ON int2tmp USING gist ( a );
 CREATE INDEX int2idx_b ON int2tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX int2idx_b;
diff --git a/contrib/btree_gist/sql/int4.sql b/contrib/btree_gist/sql/int4.sql
index 214993314a..00d5d3a7c6 100644
--- a/contrib/btree_gist/sql/int4.sql
+++ b/contrib/btree_gist/sql/int4.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM int4tmp WHERE a >  237;
 
 SELECT a, a <-> '237' FROM int4tmp ORDER BY a <-> '237' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int4idx ON int4tmp USING gist ( a );
 CREATE INDEX int4idx_b ON int4tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX int4idx_b;
diff --git a/contrib/btree_gist/sql/int8.sql b/contrib/btree_gist/sql/int8.sql
index 8a6c2a4bfd..20b93cab9e 100644
--- a/contrib/btree_gist/sql/int8.sql
+++ b/contrib/btree_gist/sql/int8.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM int8tmp WHERE a >  464571291354841;
 
 SELECT a, a <-> '464571291354841' FROM int8tmp ORDER BY a <-> '464571291354841' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX int8idx ON int8tmp USING gist ( a );
 CREATE INDEX int8idx_b ON int8tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX int8idx_b;
diff --git a/contrib/btree_gist/sql/interval.sql b/contrib/btree_gist/sql/interval.sql
index 6f9b1d4a39..07835eb0e8 100644
--- a/contrib/btree_gist/sql/interval.sql
+++ b/contrib/btree_gist/sql/interval.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM intervaltmp WHERE a >  '199 days 21:21:23';
 
 SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX intervalidx ON intervaltmp USING gist ( a );
 CREATE INDEX intervalidx_b ON intervaltmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX intervalidx_b;
diff --git a/contrib/btree_gist/sql/macaddr.sql b/contrib/btree_gist/sql/macaddr.sql
index bccfc820ca..c706b0cc19 100644
--- a/contrib/btree_gist/sql/macaddr.sql
+++ b/contrib/btree_gist/sql/macaddr.sql
@@ -16,7 +16,6 @@ SELECT count(*) FROM macaddrtmp WHERE a >= '22:00:5c:e5:9b:0d';
 
 SELECT count(*) FROM macaddrtmp WHERE a >  '22:00:5c:e5:9b:0d';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX macaddridx ON macaddrtmp USING gist ( a );
 CREATE INDEX macaddridx_b ON macaddrtmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX macaddridx_b;
diff --git a/contrib/btree_gist/sql/macaddr8.sql b/contrib/btree_gist/sql/macaddr8.sql
index 2d0447a777..20bce939d5 100644
--- a/contrib/btree_gist/sql/macaddr8.sql
+++ b/contrib/btree_gist/sql/macaddr8.sql
@@ -16,7 +16,6 @@ SELECT count(*) FROM macaddr8tmp WHERE a >= '22:00:5c:e5:9b:0d';
 
 SELECT count(*) FROM macaddr8tmp WHERE a >  '22:00:5c:e5:9b:0d';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX macaddr8idx ON macaddr8tmp USING gist ( a );
 CREATE INDEX macaddr8idx_b ON macaddr8tmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX macaddr8idx_b;
diff --git a/contrib/btree_gist/sql/numeric.sql b/contrib/btree_gist/sql/numeric.sql
index 55ecbcdadc..553dae4dd1 100644
--- a/contrib/btree_gist/sql/numeric.sql
+++ b/contrib/btree_gist/sql/numeric.sql
@@ -40,7 +40,6 @@ SELECT count(*) FROM numerictmp WHERE a >= 0 ;
 SELECT count(*) FROM numerictmp WHERE a >  0 ;
 
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX numericidx ON numerictmp USING gist ( a );
 CREATE INDEX numericidx_b ON numerictmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX numericidx_b;
diff --git a/contrib/btree_gist/sql/oid.sql b/contrib/btree_gist/sql/oid.sql
index bc9ee0cba3..e15493aa49 100644
--- a/contrib/btree_gist/sql/oid.sql
+++ b/contrib/btree_gist/sql/oid.sql
@@ -15,7 +15,6 @@ SELECT count(*) FROM oidtmp WHERE oid >= 17;
 
 SELECT count(*) FROM oidtmp WHERE oid >  17;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX oididx ON oidtmp USING gist ( oid );
 CREATE INDEX oididx_b ON oidtmp USING gist ( oid ) WITH (buffering=on);
 DROP INDEX oididx_b;
diff --git a/contrib/btree_gist/sql/text.sql b/contrib/btree_gist/sql/text.sql
index 52705a216d..c44ea013e4 100644
--- a/contrib/btree_gist/sql/text.sql
+++ b/contrib/btree_gist/sql/text.sql
@@ -17,7 +17,6 @@ SELECT count(*) FROM texttmp WHERE a >=  '31b0';
 
 SELECT count(*) FROM texttmp WHERE a >   '31b0';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX textidx ON texttmp USING GIST ( a );
 CREATE INDEX textidx_b ON texttmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX textidx_b;
diff --git a/contrib/btree_gist/sql/time.sql b/contrib/btree_gist/sql/time.sql
index 6123945213..eefca3901e 100644
--- a/contrib/btree_gist/sql/time.sql
+++ b/contrib/btree_gist/sql/time.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM timetmp WHERE a >  '10:57:11';
 
 SELECT a, a <-> '10:57:11' FROM timetmp ORDER BY a <-> '10:57:11' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timeidx ON timetmp USING gist ( a );
 CREATE INDEX timeidx_b ON timetmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX timeidx_b;
diff --git a/contrib/btree_gist/sql/timestamp.sql b/contrib/btree_gist/sql/timestamp.sql
index 66a14f5ae5..b7c51c1ea3 100644
--- a/contrib/btree_gist/sql/timestamp.sql
+++ b/contrib/btree_gist/sql/timestamp.sql
@@ -18,7 +18,6 @@ SELECT count(*) FROM timestamptmp WHERE a >  '2004-10-26 08:55:08';
 
 SELECT a, a <-> '2004-10-26 08:55:08' FROM timestamptmp ORDER BY a <-> '2004-10-26 08:55:08' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timestampidx ON timestamptmp USING gist ( a );
 CREATE INDEX timestampidx_b ON timestamptmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX timestampidx_b;
diff --git a/contrib/btree_gist/sql/timestamptz.sql b/contrib/btree_gist/sql/timestamptz.sql
index 2a92f63fc4..c21c849fe2 100644
--- a/contrib/btree_gist/sql/timestamptz.sql
+++ b/contrib/btree_gist/sql/timestamptz.sql
@@ -39,7 +39,6 @@ SELECT count(*) FROM timestamptztmp WHERE a >  '2018-12-18 10:59:54 GMT+4';
 
 SELECT a, a <-> '2018-12-18 10:59:54 GMT+2' FROM timestamptztmp ORDER BY a <-> '2018-12-18 10:59:54 GMT+2' LIMIT 3;
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX timestamptzidx ON timestamptztmp USING gist ( a );
 CREATE INDEX timestamptzidx_b ON timestamptztmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX timestamptzidx_b;
diff --git a/contrib/btree_gist/sql/timetz.sql b/contrib/btree_gist/sql/timetz.sql
index bc79d134b8..da11157360 100644
--- a/contrib/btree_gist/sql/timetz.sql
+++ b/contrib/btree_gist/sql/timetz.sql
@@ -41,8 +41,6 @@ INSERT INTO timetzcmp (r_id,a) SELECT 24,count(*) FROM timetztmp WHERE a >= '07:
 INSERT INTO timetzcmp (r_id,a) SELECT 25,count(*) FROM timetztmp WHERE a >  '07:46:45 GMT+4';
 
 
-
-SET client_min_messages = DEBUG1;
 CREATE INDEX timetzidx ON timetztmp USING gist ( a );
 CREATE INDEX timetzidx_b ON timetztmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX timetzidx_b;
diff --git a/contrib/btree_gist/sql/uuid.sql b/contrib/btree_gist/sql/uuid.sql
index 7771bc0d82..121c33b171 100644
--- a/contrib/btree_gist/sql/uuid.sql
+++ b/contrib/btree_gist/sql/uuid.sql
@@ -16,7 +16,6 @@ SELECT count(*) FROM uuidtmp WHERE a >= '55e65ca2-4136-4a4b-ba78-cd3fe4678203';
 
 SELECT count(*) FROM uuidtmp WHERE a >  '55e65ca2-4136-4a4b-ba78-cd3fe4678203';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX uuididx ON uuidtmp USING gist ( a );
 CREATE INDEX uuididx_b ON uuidtmp USING gist ( a ) WITH (buffering=on);
 DROP INDEX uuididx_b;
diff --git a/contrib/btree_gist/sql/varbit.sql b/contrib/btree_gist/sql/varbit.sql
index 6d8243572b..b2159d3d0a 100644
--- a/contrib/btree_gist/sql/varbit.sql
+++ b/contrib/btree_gist/sql/varbit.sql
@@ -16,7 +16,6 @@ SELECT count(*) FROM varbittmp WHERE a >=  '1110100111010';
 
 SELECT count(*) FROM varbittmp WHERE a >   '1110100111010';
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX varbitidx ON varbittmp USING GIST ( a );
 CREATE INDEX varbitidx_b ON varbittmp USING GIST ( a ) WITH (buffering=on);
 DROP INDEX varbitidx_b;
diff --git a/contrib/btree_gist/sql/varchar.sql b/contrib/btree_gist/sql/varchar.sql
index 59b77e0983..908654e367 100644
--- a/contrib/btree_gist/sql/varchar.sql
+++ b/contrib/btree_gist/sql/varchar.sql
@@ -16,7 +16,6 @@ SELECT count(*) FROM vchartmp WHERE a >=  '31b0'::varchar(32);
 
 SELECT count(*) FROM vchartmp WHERE a >   '31b0'::varchar(32);
 
-SET client_min_messages = DEBUG1;
 CREATE INDEX vcharidx ON vchartmp USING GIST ( text(a) );
 CREATE INDEX vcharidx_b ON vchartmp USING GIST ( text(a) ) WITH (buffering=on);
 DROP INDEX vcharidx_b;
-- 
2.24.3 (Apple Git-128)

