Restore vacuum_cleanup_index_scale_factor coverage.

Revert two recent commits that had btree_index.sql drop regression test
indexes rather than leave them behind for pg_dump testing.

This is intended to restore pg_upgrade coverage of indexes with the
vacuum_cleanup_index_scale_factor storage parameter set on buildfarm
member crake.

Backpatch: 11-12 only

diff --git a/src/test/regress/expected/btree_index.out b/src/test/regress/expected/btree_index.out
index 876924c58b1ae60d90d9715511d957dceb632ffe..0bd48dc5a0f661e22b235254e8e38100ebb3a67d 100644 (file)
--- a/src/test/regress/expected/btree_index.out
+++ b/src/test/regress/expected/btree_index.out
@@ -179,5 +179,3 @@ select reloptions from pg_class WHERE oid = 'btree_idx1'::regclass;
  {vacuum_cleanup_index_scale_factor=70.0}
 (1 row)
 
-drop index btree_idx1;
-drop index btree_idx_err;

diff --git a/src/test/regress/sql/btree_index.sql b/src/test/regress/sql/btree_index.sql
index 9318dbbda8c73b6b0f4b936cef746aa9906fcabe..21171f776259b55ee51d4e666c46cc8e6bdb1424 100644 (file)
--- a/src/test/regress/sql/btree_index.sql
+++ b/src/test/regress/sql/btree_index.sql
@@ -111,5 +111,3 @@ create index btree_idx_err on btree_test(a) with (vacuum_cleanup_index_scale_fac
 -- Simple ALTER INDEX
 alter index btree_idx1 set (vacuum_cleanup_index_scale_factor = 70.0);
 select reloptions from pg_class WHERE oid = 'btree_idx1'::regclass;
-drop index btree_idx1;
-drop index btree_idx_err;