git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7fee787)
Improve cleanup phases in regression tests of pg_stat_statements
Mon, 6 Mar 2023 23:58:13 +0000 (08:58 +0900)
Mon, 6 Mar 2023 23:58:13 +0000 (08:58 +0900)
As shaped, two DROP ROLE queries included in "user_activity" were
showing in the reports for "wal". The intention is to keep each test
isolated and independent, so this is incorrect. This commit adds some
calls to pg_stat_statements_reset() to clean up the statistics once each
test finishes, so as there are no risks of overlap in the reports for
individial scenarios.

The addition in "user_activity" fixes the output of "wal". The new
resets done in "level_tracking" and "utility" are added for consistency
with the rest, though they do not affect the stats generated in the
other tests.

Oversight in d0028e3.

Reported-by: Andrei Zubkov
Discussion: https://postgr.es/m/7beb722dd016bf54f1c78bfd6d44a684e28da624.camel@moonset.ru


diff --git a/contrib/pg_stat_statements/expected/level_tracking.out b/contrib/pg_stat_statements/expected/level_tracking.out
index c824ebdac5d95163fc8e88f6e669bad41f53a84a..d924c87b41ed9988535dca1076a7e5a76483f0e0 100644 (file)
--- a/contrib/pg_stat_statements/expected/level_tracking.out
+++ b/contrib/pg_stat_statements/expected/level_tracking.out
@@ -202,3 +202,9 @@ SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
-------+------+-------
(0 rows)
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset
+--------------------------
+
+(1 row)
+
diff --git a/contrib/pg_stat_statements/expected/user_activity.out b/contrib/pg_stat_statements/expected/user_activity.out
index f06e5881e55d265a09e6b519691a9c27b84f6366..f3c6b6ab32625024b9119cc6e07c456172f4fb08 100644 (file)
--- a/contrib/pg_stat_statements/expected/user_activity.out
+++ b/contrib/pg_stat_statements/expected/user_activity.out
@@ -197,3 +197,9 @@ SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
--
DROP ROLE regress_stats_user1;
DROP ROLE regress_stats_user2;
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset
+--------------------------
+
+(1 row)
+
diff --git a/contrib/pg_stat_statements/expected/utility.out b/contrib/pg_stat_statements/expected/utility.out
index dbb8f661c01cd451582294a53376f85f70f20d2b..32b6136e241f7eaf08e2f1052e677a63d8054278 100644 (file)
--- a/contrib/pg_stat_statements/expected/utility.out
+++ b/contrib/pg_stat_statements/expected/utility.out
@@ -554,3 +554,9 @@ SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
1 | 0 | SET work_mem = '2MB'
(7 rows)
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset
+--------------------------
+
+(1 row)
+
diff --git a/contrib/pg_stat_statements/expected/wal.out b/contrib/pg_stat_statements/expected/wal.out
index f115fa0d5b3b0ab1623b54243f71fae5bdbff218..9896ba25363fbd7d4b9b8623a1150e132b6f2a0e 100644 (file)
--- a/contrib/pg_stat_statements/expected/wal.out
+++ b/contrib/pg_stat_statements/expected/wal.out
@@ -13,17 +13,14 @@ wal_bytes > 0 as wal_bytes_generated,
wal_records > 0 as wal_records_generated,
wal_records >= rows as wal_records_ge_rows
FROM pg_stat_statements ORDER BY query COLLATE "C";
- query | calls | rows | wal_bytes_generated | wal_records_generated | wal_records_ge_rows
-------------------------------------------------------------------------------+-------+------+---------------------+-----------------------+---------------------
- DELETE FROM pgss_wal_tab WHERE a > 1ドル | 1 | 1 | t | t | t
- DROP ROLE regress_stats_user1 | 1 | 0 | t | t | t
- DROP ROLE regress_stats_user2 | 1 | 0 | t | t | t
- INSERT INTO pgss_wal_tab VALUES(generate_series(1,ドル 2ドル), 3ドル) | 1 | 10 | t | t | t
- SELECT pg_stat_statements_reset(0,0,0) | 1 | 1 | f | f | f
- SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C" | 1 | 1 | f | f | f
- SET pg_stat_statements.track_utility = FALSE | 1 | 0 | f | f | t
- UPDATE pgss_wal_tab SET b = 1ドル WHERE a > 2ドル | 1 | 3 | t | t | t
-(8 rows)
+ query | calls | rows | wal_bytes_generated | wal_records_generated | wal_records_ge_rows
+--------------------------------------------------------------+-------+------+---------------------+-----------------------+---------------------
+ DELETE FROM pgss_wal_tab WHERE a > 1ドル | 1 | 1 | t | t | t
+ INSERT INTO pgss_wal_tab VALUES(generate_series(1,ドル 2ドル), 3ドル) | 1 | 10 | t | t | t
+ SELECT pg_stat_statements_reset() | 1 | 1 | f | f | f
+ SET pg_stat_statements.track_utility = FALSE | 1 | 0 | f | f | t
+ UPDATE pgss_wal_tab SET b = 1ドル WHERE a > 2ドル | 1 | 3 | t | t | t
+(5 rows)
SELECT pg_stat_statements_reset();
pg_stat_statements_reset
diff --git a/contrib/pg_stat_statements/sql/level_tracking.sql b/contrib/pg_stat_statements/sql/level_tracking.sql
index 2f95bf98e5c1293e206a602d207caa2fc25ccbf3..0c20b8ce69b71f0b4f5ff9d2d3d56b70e652e738 100644 (file)
--- a/contrib/pg_stat_statements/sql/level_tracking.sql
+++ b/contrib/pg_stat_statements/sql/level_tracking.sql
@@ -97,3 +97,4 @@ SELECT 1 AS "one";
SELECT 1 + 1 AS "two";
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+SELECT pg_stat_statements_reset();
diff --git a/contrib/pg_stat_statements/sql/user_activity.sql b/contrib/pg_stat_statements/sql/user_activity.sql
index f8b1ede67bbca2904dde6a38de64b9c9f1aa4a92..4b95edda89066c749ae206584c2b4656199de0aa 100644 (file)
--- a/contrib/pg_stat_statements/sql/user_activity.sql
+++ b/contrib/pg_stat_statements/sql/user_activity.sql
@@ -63,3 +63,4 @@ SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
--
DROP ROLE regress_stats_user1;
DROP ROLE regress_stats_user2;
+SELECT pg_stat_statements_reset();
diff --git a/contrib/pg_stat_statements/sql/utility.sql b/contrib/pg_stat_statements/sql/utility.sql
index 4c58a4c978e94fe08ccb9227833efecd0d545401..225d30a62a6455fce842d3cc7d5b457e2dc878be 100644 (file)
--- a/contrib/pg_stat_statements/sql/utility.sql
+++ b/contrib/pg_stat_statements/sql/utility.sql
@@ -276,3 +276,4 @@ SET enable_seqscan = on;
RESET enable_seqscan;
SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+SELECT pg_stat_statements_reset();
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /