This is an automated email from the ASF dual-hosted git repository.
maxyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/main by this push:
new f84eb2cfac Revert: "Vacuum auxiliary TOAST should not be dispatched."
f84eb2cfac is described below
commit f84eb2cfac5a23b6470a79641ea6e4a07962aee6
Author: GongXun <[email protected]>
AuthorDate: Wed Dec 18 00:11:37 2024 +0800
Revert: "Vacuum auxiliary TOAST should not be dispatched."
Partially revert test case changes introduced in commit
https://github.com/apache/cloudberry/commit/fdfea2088778ec63dfd594b4261d6f828d08fabe
This reversion is necessary because we cherry-picked the following commit
from GPDB:
https://github.com/apache/cloudberry/commit/e9d862f55e2c6425b4226e36315d0ff558ce3b33.
As a result, index dead tuples may not always be fully cleaned up after
VACUUM, causing
test cases related to index stats to become flaky. These test cases should
be ignored
until the underlying issue is resolved.
---
src/test/regress/expected/brin_ao.out | 6 ++++
src/test/regress/expected/brin_ao_optimizer.out | 6 ++++
src/test/regress/expected/brin_aocs.out | 6 ++++
src/test/regress/expected/brin_aocs_optimizer.out | 6 ++++
.../expected/uao_compaction/drop_column.out | 10 +++---
.../regress/expected/uao_compaction/full_stats.out | 8 +++--
.../expected/uao_compaction/index_stats.out | 5 +++
src/test/regress/expected/uao_compaction/stats.out | 36 ++++------------------
.../expected/uaocs_compaction/drop_column.out | 10 +++---
.../expected/uaocs_compaction/full_stats.out | 8 +++--
.../expected/uaocs_compaction/index_stats.out | 5 +++
.../regress/expected/uaocs_compaction/stats.out | 36 ++++------------------
src/test/regress/input/uao_dml/uao_dml.source | 7 +++++
src/test/regress/output/uao_dml/uao_dml.source | 6 ++++
src/test/regress/sql/brin_ao.sql | 6 ++++
src/test/regress/sql/brin_aocs.sql | 6 ++++
.../regress/sql/uao_compaction/drop_column.sql | 10 +++---
src/test/regress/sql/uao_compaction/full_stats.sql | 8 +++--
.../regress/sql/uao_compaction/index_stats.sql | 6 ++++
src/test/regress/sql/uao_compaction/stats.sql | 31 +++++--------------
.../regress/sql/uaocs_compaction/drop_column.sql | 10 +++---
.../regress/sql/uaocs_compaction/full_stats.sql | 8 +++--
.../regress/sql/uaocs_compaction/index_stats.sql | 6 ++++
src/test/regress/sql/uaocs_compaction/stats.sql | 31 +++++--------------
24 files changed, 141 insertions(+), 136 deletions(-)
diff --git a/src/test/regress/expected/brin_ao.out
b/src/test/regress/expected/brin_ao.out
index 1209f0bf20..306869a1ea 100644
--- a/src/test/regress/expected/brin_ao.out
+++ b/src/test/regress/expected/brin_ao.out
@@ -466,9 +466,15 @@ CONTEXT: SQL function "brin_summarize_new_values"
statement 1
SELECT brin_summarize_new_values('tenk1_unique1'); -- error, not a BRIN index
ERROR: "tenk1_unique1" is not a BRIN index
CONTEXT: SQL function "brin_summarize_new_values" statement 1
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- brin_summarize_new_values() will not always be accurate. So ignore the
check to
+-- coordinate with the new behavior.
+-- start_ignore
SELECT brin_summarize_new_values('brinaoidx'); -- ok, no change expected
brin_summarize_new_values
---------------------------
0
(1 row)
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/expected/brin_ao_optimizer.out
b/src/test/regress/expected/brin_ao_optimizer.out
index 6e31649262..80c8fd8b6f 100644
--- a/src/test/regress/expected/brin_ao_optimizer.out
+++ b/src/test/regress/expected/brin_ao_optimizer.out
@@ -484,9 +484,15 @@ CONTEXT: SQL function "brin_summarize_new_values"
statement 1
SELECT brin_summarize_new_values('tenk1_unique1'); -- error, not a BRIN index
ERROR: "tenk1_unique1" is not a BRIN index
CONTEXT: SQL function "brin_summarize_new_values" statement 1
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- brin_summarize_new_values() will not always be accurate. So ignore the
check to
+-- coordinate with the new behavior.
+-- start_ignore
SELECT brin_summarize_new_values('brinaoidx'); -- ok, no change expected
brin_summarize_new_values
---------------------------
0
(1 row)
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/expected/brin_aocs.out
b/src/test/regress/expected/brin_aocs.out
index 08e7c49ccb..a9fef05e78 100644
--- a/src/test/regress/expected/brin_aocs.out
+++ b/src/test/regress/expected/brin_aocs.out
@@ -466,9 +466,15 @@ CONTEXT: SQL function "brin_summarize_new_values"
statement 1
SELECT brin_summarize_new_values('tenk1_unique1'); -- error, not a BRIN index
ERROR: "tenk1_unique1" is not a BRIN index
CONTEXT: SQL function "brin_summarize_new_values" statement 1
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- brin_summarize_new_values() will not always be accurate. So ignore the
check to
+-- coordinate with the new behavior.
+-- start_ignore
SELECT brin_summarize_new_values('brinaocsidx'); -- ok, no change expected
brin_summarize_new_values
---------------------------
0
(1 row)
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/expected/brin_aocs_optimizer.out
b/src/test/regress/expected/brin_aocs_optimizer.out
index f4a329a72b..e2a74261dc 100644
--- a/src/test/regress/expected/brin_aocs_optimizer.out
+++ b/src/test/regress/expected/brin_aocs_optimizer.out
@@ -484,9 +484,15 @@ CONTEXT: SQL function "brin_summarize_new_values"
statement 1
SELECT brin_summarize_new_values('tenk1_unique1'); -- error, not a BRIN index
ERROR: "tenk1_unique1" is not a BRIN index
CONTEXT: SQL function "brin_summarize_new_values" statement 1
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- brin_summarize_new_values() will not always be accurate. So ignore the
check to
+-- coordinate with the new behavior.
+-- start_ignore
SELECT brin_summarize_new_values('brinaocsidx'); -- ok, no change expected
brin_summarize_new_values
---------------------------
0
(1 row)
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/expected/uao_compaction/drop_column.out
b/src/test/regress/expected/uao_compaction/drop_column.out
index 6ece6b370d..898b82b172 100644
--- a/src/test/regress/expected/uao_compaction/drop_column.out
+++ b/src/test/regress/expected/uao_compaction/drop_column.out
@@ -30,17 +30,17 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uao_drop_col';
(1 row)
-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
--- Index dead tuples will not always be cleaned up completely after VACUUM,
leading to
--- index->reltuples not always equal to table->reltuples, it depends on the GUC
--- gp_appendonly_compaction_threshold. In this case, the ratio of dead tuples
is about 30%
--- which is greater than default value (10%) of the compaction threshold, so
compaction
--- should be triggered and reltuples of both table and index should be equal.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_drop_col_index';
relname | reltuples
--------------------+-----------
uao_drop_col_index | 7
(1 row)
+-- end_ignore
ALTER TABLE uao_drop_col DROP COLUMN c;
SELECT * FROM uao_drop_col;
a | b
diff --git a/src/test/regress/expected/uao_compaction/full_stats.out
b/src/test/regress/expected/uao_compaction/full_stats.out
index dc5940cc0d..1f9d473aa7 100644
--- a/src/test/regress/expected/uao_compaction/full_stats.out
+++ b/src/test/regress/expected/uao_compaction/full_stats.out
@@ -26,11 +26,15 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uao_full_stats';
uao_full_stats | 85
(1 row)
--- Compaction is always triggered in VACUUM FULL, expecting
--- reltuples of both table and index are equal.
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_full_stats_index';
relname | reltuples
----------------------+-----------
uao_full_stats_index | 85
(1 row)
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/expected/uao_compaction/index_stats.out
b/src/test/regress/expected/uao_compaction/index_stats.out
index 5e328ba673..9750bdd8a6 100644
--- a/src/test/regress/expected/uao_compaction/index_stats.out
+++ b/src/test/regress/expected/uao_compaction/index_stats.out
@@ -29,6 +29,11 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'mytab';
mytab | 2
(1 row)
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'mytab_int_idx1';
relname | reltuples
----------------+-----------
diff --git a/src/test/regress/expected/uao_compaction/stats.out
b/src/test/regress/expected/uao_compaction/stats.out
index d8b3c76db1..a18834d43e 100644
--- a/src/test/regress/expected/uao_compaction/stats.out
+++ b/src/test/regress/expected/uao_compaction/stats.out
@@ -20,12 +20,6 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uao_stats_index';
(1 row)
DELETE FROM uao_stats WHERE a < 16;
--- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
--- Index dead tuples will not always be cleaned up completely after VACUUM,
leading to
--- index->reltuples not always equal to table->reltuples, it depends on the GUC
--- gp_appendonly_compaction_threshold:
--- a) without changing gp_appendonly_compaction_threshold (default is 10),
index->reltuples
--- might greater than table->reltuples if no compaction was triggered during
VACUUM;
VACUUM uao_stats;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats';
relname | reltuples
@@ -33,33 +27,15 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uao_stats';
uao_stats | 85
(1 row)
--- expect index->reltuples greater than table->reltuples
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats_index';
relname | reltuples
-----------------+-----------
uao_stats_index | 88
(1 row)
--- re-setup for next case
-TRUNCATE uao_stats;
-INSERT INTO uao_stats SELECT i as a, i as b, 'hello world' as c FROM
generate_series(1, 50) AS i;
-INSERT INTO uao_stats SELECT i as a, i as b, 'hello world' as c FROM
generate_series(51, 100) AS i;
-ANALYZE uao_stats;
-DELETE FROM uao_stats WHERE a < 16;
--- b) changing gp_appendonly_compaction_threshold to make sure compaction
could be triggered,
--- index->reltuples should be equal to table->reltuples
-SET gp_appendonly_compaction_threshold = 8;
-VACUUM uao_stats;
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats';
- relname | reltuples
------------+-----------
- uao_stats | 85
-(1 row)
-
--- expect index->reltuples equals to table->reltuples
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats_index';
- relname | reltuples
------------------+-----------
- uao_stats_index | 85
-(1 row)
-
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/expected/uaocs_compaction/drop_column.out
b/src/test/regress/expected/uaocs_compaction/drop_column.out
index 7fcb23a451..5d9579e2e0 100644
--- a/src/test/regress/expected/uaocs_compaction/drop_column.out
+++ b/src/test/regress/expected/uaocs_compaction/drop_column.out
@@ -30,17 +30,17 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_drop';
(1 row)
-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
--- Index dead tuples will not always be cleaned up completely after VACUUM,
leading to
--- index->reltuples not always equal to table->reltuples, it depends on the GUC
--- gp_appendonly_compaction_threshold. In this case, the ratio of dead tuples
is about 30%
--- which is greater than default value (10%) of the compaction threshold, so
compaction
--- should be triggered and reltuples of both table and index should be equal.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_drop_index';
relname | reltuples
------------------+-----------
uaocs_drop_index | 7
(1 row)
+-- end_ignore
ALTER TABLE uaocs_drop DROP COLUMN c;
SELECT * FROM uaocs_drop;
a | b
diff --git a/src/test/regress/expected/uaocs_compaction/full_stats.out
b/src/test/regress/expected/uaocs_compaction/full_stats.out
index b6859d1e62..e5d7825ecf 100644
--- a/src/test/regress/expected/uaocs_compaction/full_stats.out
+++ b/src/test/regress/expected/uaocs_compaction/full_stats.out
@@ -44,11 +44,15 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_full_stats';
uaocs_full_stats | 85
(1 row)
--- Compaction is always triggered in VACUUM FULL, expecting
--- reltuples of both table and index are equal.
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_full_stats_index';
relname | reltuples
------------------------+-----------
uaocs_full_stats_index | 85
(1 row)
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/expected/uaocs_compaction/index_stats.out
b/src/test/regress/expected/uaocs_compaction/index_stats.out
index 88f6f189b9..b0e23ff70a 100644
--- a/src/test/regress/expected/uaocs_compaction/index_stats.out
+++ b/src/test/regress/expected/uaocs_compaction/index_stats.out
@@ -34,6 +34,11 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_index_stats';
uaocs_index_stats | 2
(1 row)
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_index_stats_int_idx1';
relname | reltuples
----------------------------+-----------
diff --git a/src/test/regress/expected/uaocs_compaction/stats.out
b/src/test/regress/expected/uaocs_compaction/stats.out
index 62b681ab14..f643fb4dcc 100644
--- a/src/test/regress/expected/uaocs_compaction/stats.out
+++ b/src/test/regress/expected/uaocs_compaction/stats.out
@@ -20,35 +20,6 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_stats_index';
(1 row)
DELETE FROM uaocs_stats WHERE a < 16;
--- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
--- Index dead tuples will not always be cleaned up completely after VACUUM,
leading to
--- index->reltuples not always equal to table->reltuples, it depends on the GUC
--- gp_appendonly_compaction_threshold:
--- a) without changing gp_appendonly_compaction_threshold (default is 10),
index->reltuples
--- might greater than table->reltuples if no compaction was triggered during
VACUUM;
-VACUUM uaocs_stats;
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats';
- relname | reltuples
--------------+-----------
- uaocs_stats | 85
-(1 row)
-
--- expect index->reltuples greater than table->reltuples
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats_index';
- relname | reltuples
--------------------+-----------
- uaocs_stats_index | 88
-(1 row)
-
--- re-setup for next case
-TRUNCATE uaocs_stats;
-INSERT INTO uaocs_stats SELECT i as a, i as b, 'hello world' as c FROM
generate_series(1, 50) AS i;
-INSERT INTO uaocs_stats SELECT i as a, i as b, 'hello world' as c FROM
generate_series(51, 100) AS i;
-ANALYZE uaocs_stats;
-DELETE FROM uaocs_stats WHERE a < 16;
--- b) changing gp_appendonly_compaction_threshold to make sure compaction
could be triggered,
--- index->reltuples should be equal to table->reltuples
-SET gp_appendonly_compaction_threshold = 8;
VACUUM uaocs_stats;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats';
relname | reltuples
@@ -56,10 +27,15 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_stats';
uaocs_stats | 85
(1 row)
--- expect index->reltuples equals to table->reltuples
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats_index';
relname | reltuples
-------------------+-----------
uaocs_stats_index | 85
(1 row)
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/input/uao_dml/uao_dml.source
b/src/test/regress/input/uao_dml/uao_dml.source
index 6e3916100b..adb9f033b7 100644
--- a/src/test/regress/input/uao_dml/uao_dml.source
+++ b/src/test/regress/input/uao_dml/uao_dml.source
@@ -479,7 +479,14 @@ update mytab_@amname@ set col_text=' new value' where
col_int = 1;
select * from mytab_@amname@;
vacuum mytab_@amname@;
SELECT reltuples FROM pg_class WHERE relname = 'mytab_@amname@';
+
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT reltuples FROM pg_class WHERE relname = 'mytab_int_idx1_@amname@';
+-- end_ignore
-- @Description Checks that deleting works with many AO blocks.
--
diff --git a/src/test/regress/output/uao_dml/uao_dml.source
b/src/test/regress/output/uao_dml/uao_dml.source
index 9ecf578eb8..f07b1b8de1 100644
--- a/src/test/regress/output/uao_dml/uao_dml.source
+++ b/src/test/regress/output/uao_dml/uao_dml.source
@@ -939,12 +939,18 @@ SELECT reltuples FROM pg_class WHERE relname =
'mytab_@amname@';
2
(1 row)
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT reltuples FROM pg_class WHERE relname = 'mytab_int_idx1_@amname@';
reltuples
-----------
2
(1 row)
+-- end_ignore
-- @Description Checks that deleting works with many AO blocks.
--
DROP TABLE IF EXISTS foo;
diff --git a/src/test/regress/sql/brin_ao.sql b/src/test/regress/sql/brin_ao.sql
index 1894d8812c..c6f7643630 100644
--- a/src/test/regress/sql/brin_ao.sql
+++ b/src/test/regress/sql/brin_ao.sql
@@ -464,4 +464,10 @@ SELECT segment_id, segno, tupcount, state FROM
gp_toolkit.__gp_aoseg('brintest_a
-- Tests for brin_summarize_new_values
SELECT brin_summarize_new_values('brintest_ao'); -- error, not an index
SELECT brin_summarize_new_values('tenk1_unique1'); -- error, not a BRIN index
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- brin_summarize_new_values() will not always be accurate. So ignore the
check to
+-- coordinate with the new behavior.
+-- start_ignore
SELECT brin_summarize_new_values('brinaoidx'); -- ok, no change expected
+-- end_ignore
diff --git a/src/test/regress/sql/brin_aocs.sql
b/src/test/regress/sql/brin_aocs.sql
index 276afaaaee..fd2047c01f 100644
--- a/src/test/regress/sql/brin_aocs.sql
+++ b/src/test/regress/sql/brin_aocs.sql
@@ -464,4 +464,10 @@ SELECT segment_id, segno, tupcount, state FROM
gp_toolkit.__gp_aocsseg('brintest
-- Tests for brin_summarize_new_values
SELECT brin_summarize_new_values('brintest_aocs'); -- error, not an index
SELECT brin_summarize_new_values('tenk1_unique1'); -- error, not a BRIN index
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- brin_summarize_new_values() will not always be accurate. So ignore the
check to
+-- coordinate with the new behavior.
+-- start_ignore
SELECT brin_summarize_new_values('brinaocsidx'); -- ok, no change expected
+-- end_ignore
diff --git a/src/test/regress/sql/uao_compaction/drop_column.sql
b/src/test/regress/sql/uao_compaction/drop_column.sql
index 207a298ab5..83e542be3c 100644
--- a/src/test/regress/sql/uao_compaction/drop_column.sql
+++ b/src/test/regress/sql/uao_compaction/drop_column.sql
@@ -12,12 +12,12 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uao_drop_col_index';
VACUUM uao_drop_col;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_drop_col';
-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
--- Index dead tuples will not always be cleaned up completely after VACUUM,
leading to
--- index->reltuples not always equal to table->reltuples, it depends on the GUC
--- gp_appendonly_compaction_threshold. In this case, the ratio of dead tuples
is about 30%
--- which is greater than default value (10%) of the compaction threshold, so
compaction
--- should be triggered and reltuples of both table and index should be equal.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_drop_col_index';
+-- end_ignore
ALTER TABLE uao_drop_col DROP COLUMN c;
SELECT * FROM uao_drop_col;
INSERT INTO uao_drop_col VALUES (42, 42);
diff --git a/src/test/regress/sql/uao_compaction/full_stats.sql
b/src/test/regress/sql/uao_compaction/full_stats.sql
index b133adc421..f8361ea0a9 100644
--- a/src/test/regress/sql/uao_compaction/full_stats.sql
+++ b/src/test/regress/sql/uao_compaction/full_stats.sql
@@ -13,6 +13,10 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uao_full_stats_index';
DELETE FROM uao_full_stats WHERE a < 16;
VACUUM FULL uao_full_stats;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_full_stats';
--- Compaction is always triggered in VACUUM FULL, expecting
--- reltuples of both table and index are equal.
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_full_stats_index';
+-- end_ignore
diff --git a/src/test/regress/sql/uao_compaction/index_stats.sql
b/src/test/regress/sql/uao_compaction/index_stats.sql
index 15550338d7..f88e000e70 100644
--- a/src/test/regress/sql/uao_compaction/index_stats.sql
+++ b/src/test/regress/sql/uao_compaction/index_stats.sql
@@ -16,6 +16,12 @@ update mytab set col_text=' new value' where col_int = 1;
select * from mytab;
vacuum mytab;
SELECT relname, reltuples FROM pg_class WHERE relname = 'mytab';
+
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'mytab_int_idx1';
-- Test to ensure that reltuples is updated for an index after lazy vacuum.
diff --git a/src/test/regress/sql/uao_compaction/stats.sql
b/src/test/regress/sql/uao_compaction/stats.sql
index 68ae82e893..bd2c2ce8c0 100644
--- a/src/test/regress/sql/uao_compaction/stats.sql
+++ b/src/test/regress/sql/uao_compaction/stats.sql
@@ -12,30 +12,13 @@ SET enable_seqscan=false;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats';
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats_index';
DELETE FROM uao_stats WHERE a < 16;
-
--- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
--- Index dead tuples will not always be cleaned up completely after VACUUM,
leading to
--- index->reltuples not always equal to table->reltuples, it depends on the GUC
--- gp_appendonly_compaction_threshold:
-
--- a) without changing gp_appendonly_compaction_threshold (default is 10),
index->reltuples
--- might greater than table->reltuples if no compaction was triggered during
VACUUM;
VACUUM uao_stats;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats';
--- expect index->reltuples greater than table->reltuples
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats_index';
--- re-setup for next case
-TRUNCATE uao_stats;
-INSERT INTO uao_stats SELECT i as a, i as b, 'hello world' as c FROM
generate_series(1, 50) AS i;
-INSERT INTO uao_stats SELECT i as a, i as b, 'hello world' as c FROM
generate_series(51, 100) AS i;
-ANALYZE uao_stats;
-
-DELETE FROM uao_stats WHERE a < 16;
--- b) changing gp_appendonly_compaction_threshold to make sure compaction
could be triggered,
--- index->reltuples should be equal to table->reltuples
-SET gp_appendonly_compaction_threshold = 8;
-VACUUM uao_stats;
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats';
--- expect index->reltuples equals to table->reltuples
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats_index';
\ No newline at end of file
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
+SELECT relname, reltuples FROM pg_class WHERE relname = 'uao_stats_index';
+-- end_ignore
diff --git a/src/test/regress/sql/uaocs_compaction/drop_column.sql
b/src/test/regress/sql/uaocs_compaction/drop_column.sql
index d5fcb21107..3e66ab489f 100644
--- a/src/test/regress/sql/uaocs_compaction/drop_column.sql
+++ b/src/test/regress/sql/uaocs_compaction/drop_column.sql
@@ -11,12 +11,12 @@ SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_drop_index';
VACUUM uaocs_drop;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_drop';
-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
--- Index dead tuples will not always be cleaned up completely after VACUUM,
leading to
--- index->reltuples not always equal to table->reltuples, it depends on the GUC
--- gp_appendonly_compaction_threshold. In this case, the ratio of dead tuples
is about 30%
--- which is greater than default value (10%) of the compaction threshold, so
compaction
--- should be triggered and reltuples of both table and index should be equal.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_drop_index';
+-- end_ignore
ALTER TABLE uaocs_drop DROP COLUMN c;
SELECT * FROM uaocs_drop;
INSERT INTO uaocs_drop VALUES (42, 42);
diff --git a/src/test/regress/sql/uaocs_compaction/full_stats.sql
b/src/test/regress/sql/uaocs_compaction/full_stats.sql
index 85cfa032c0..92780646ea 100644
--- a/src/test/regress/sql/uaocs_compaction/full_stats.sql
+++ b/src/test/regress/sql/uaocs_compaction/full_stats.sql
@@ -15,6 +15,10 @@ SELECT COUNT(*) FROM uaocs_full_stats;
VACUUM FULL uaocs_full_stats;
SELECT COUNT(*) FROM uaocs_full_stats;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_full_stats';
--- Compaction is always triggered in VACUUM FULL, expecting
--- reltuples of both table and index are equal.
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_full_stats_index';
+-- end_ignore
diff --git a/src/test/regress/sql/uaocs_compaction/index_stats.sql
b/src/test/regress/sql/uaocs_compaction/index_stats.sql
index 2901238e7e..d87b41a8b4 100644
--- a/src/test/regress/sql/uaocs_compaction/index_stats.sql
+++ b/src/test/regress/sql/uaocs_compaction/index_stats.sql
@@ -16,6 +16,12 @@ update uaocs_index_stats set col_text=' new value' where
col_int = 1;
select * from uaocs_index_stats;
vacuum uaocs_index_stats;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_index_stats';
+
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
SELECT relname, reltuples FROM pg_class WHERE relname =
'uaocs_index_stats_int_idx1';
-- Test to ensure that reltuples is updated for an index after lazy vacuum.
diff --git a/src/test/regress/sql/uaocs_compaction/stats.sql
b/src/test/regress/sql/uaocs_compaction/stats.sql
index 81e039ee4b..9e48364167 100644
--- a/src/test/regress/sql/uaocs_compaction/stats.sql
+++ b/src/test/regress/sql/uaocs_compaction/stats.sql
@@ -12,30 +12,13 @@ SET enable_seqscan=false;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats';
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats_index';
DELETE FROM uaocs_stats WHERE a < 16;
-
--- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
--- Index dead tuples will not always be cleaned up completely after VACUUM,
leading to
--- index->reltuples not always equal to table->reltuples, it depends on the GUC
--- gp_appendonly_compaction_threshold:
-
--- a) without changing gp_appendonly_compaction_threshold (default is 10),
index->reltuples
--- might greater than table->reltuples if no compaction was triggered during
VACUUM;
VACUUM uaocs_stats;
SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats';
--- expect index->reltuples greater than table->reltuples
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats_index';
--- re-setup for next case
-TRUNCATE uaocs_stats;
-INSERT INTO uaocs_stats SELECT i as a, i as b, 'hello world' as c FROM
generate_series(1, 50) AS i;
-INSERT INTO uaocs_stats SELECT i as a, i as b, 'hello world' as c FROM
generate_series(51, 100) AS i;
-ANALYZE uaocs_stats;
-
-DELETE FROM uaocs_stats WHERE a < 16;
--- b) changing gp_appendonly_compaction_threshold to make sure compaction
could be triggered,
--- index->reltuples should be equal to table->reltuples
-SET gp_appendonly_compaction_threshold = 8;
-VACUUM uaocs_stats;
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats';
--- expect index->reltuples equals to table->reltuples
-SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats_index';
\ No newline at end of file
+-- New strategy of VACUUM AO/CO was introduced by PR #13255 for performance
enhancement.
+-- Index dead tuples will not always be cleaned up completely after VACUUM,
resulting
+-- index stats pg_class->reltuples will not always be accurate. So ignore the
stats check
+-- for reltuples to coordinate with the new behavior.
+-- start_ignore
+SELECT relname, reltuples FROM pg_class WHERE relname = 'uaocs_stats_index';
+-- end_ignore
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
