Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9a714b9

Browse files
committed
Improve cleanup phases in regression tests of pg_stat_statements
As shaped, two DROP ROLE queries included in "user_activity" wereshowing in the reports for "wal". The intention is to keep each testisolated and independent, so this is incorrect. This commit adds somecalls to pg_stat_statements_reset() to clean up the statistics once eachtest finishes, so as there are no risks of overlap in the reports forindividial scenarios.The addition in "user_activity" fixes the output of "wal". The newresets done in "level_tracking" and "utility" are added for consistencywith the rest, though they do not affect the stats generated in theother tests.Oversight in d0028e3.Reported-by: Andrei ZubkovDiscussion:https://postgr.es/m/7beb722dd016bf54f1c78bfd6d44a684e28da624.camel@moonset.ru
1 parent7fee787 commit9a714b9

File tree

7 files changed

+29
-11
lines changed

7 files changed

+29
-11
lines changed

‎contrib/pg_stat_statements/expected/level_tracking.out

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,9 @@ SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
202202
-------+------+-------
203203
(0 rows)
204204

205+
SELECT pg_stat_statements_reset();
206+
pg_stat_statements_reset
207+
--------------------------
208+
209+
(1 row)
210+

‎contrib/pg_stat_statements/expected/user_activity.out

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,9 @@ SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
197197
--
198198
DROP ROLE regress_stats_user1;
199199
DROP ROLE regress_stats_user2;
200+
SELECT pg_stat_statements_reset();
201+
pg_stat_statements_reset
202+
--------------------------
203+
204+
(1 row)
205+

‎contrib/pg_stat_statements/expected/utility.out

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,3 +554,9 @@ SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
554554
1 | 0 | SET work_mem = '2MB'
555555
(7 rows)
556556

557+
SELECT pg_stat_statements_reset();
558+
pg_stat_statements_reset
559+
--------------------------
560+
561+
(1 row)
562+

‎contrib/pg_stat_statements/expected/wal.out

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@ wal_bytes > 0 as wal_bytes_generated,
1313
wal_records > 0 as wal_records_generated,
1414
wal_records >= rows as wal_records_ge_rows
1515
FROM pg_stat_statements ORDER BY query COLLATE "C";
16-
query | calls | rows | wal_bytes_generated | wal_records_generated | wal_records_ge_rows
17-
------------------------------------------------------------------------------+-------+------+---------------------+-----------------------+---------------------
18-
DELETE FROM pgss_wal_tab WHERE a > $1 | 1 | 1 | t | t | t
19-
DROP ROLE regress_stats_user1 | 1 | 0 | t | t | t
20-
DROP ROLE regress_stats_user2 | 1 | 0 | t | t | t
21-
INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) | 1 | 10 | t | t | t
22-
SELECT pg_stat_statements_reset(0,0,0) | 1 | 1 | f | f | f
23-
SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C" | 1 | 1 | f | f | f
24-
SET pg_stat_statements.track_utility = FALSE | 1 | 0 | f | f | t
25-
UPDATE pgss_wal_tab SET b = $1 WHERE a > $2 | 1 | 3 | t | t | t
26-
(8 rows)
16+
query | calls | rows | wal_bytes_generated | wal_records_generated | wal_records_ge_rows
17+
--------------------------------------------------------------+-------+------+---------------------+-----------------------+---------------------
18+
DELETE FROM pgss_wal_tab WHERE a > $1 | 1 | 1 | t | t | t
19+
INSERT INTO pgss_wal_tab VALUES(generate_series($1, $2), $3) | 1 | 10 | t | t | t
20+
SELECT pg_stat_statements_reset() | 1 | 1 | f | f | f
21+
SET pg_stat_statements.track_utility = FALSE | 1 | 0 | f | f | t
22+
UPDATE pgss_wal_tab SET b = $1 WHERE a > $2 | 1 | 3 | t | t | t
23+
(5 rows)
2724

2825
SELECT pg_stat_statements_reset();
2926
pg_stat_statements_reset

‎contrib/pg_stat_statements/sql/level_tracking.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,4 @@ SELECT 1 AS "one";
9797
SELECT1+1AS"two";
9898

9999
SELECT calls, rows, queryFROM pg_stat_statementsORDER BY query COLLATE"C";
100+
SELECT pg_stat_statements_reset();

‎contrib/pg_stat_statements/sql/user_activity.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ SELECT query, calls, rows FROM pg_stat_statements ORDER BY query COLLATE "C";
6363
--
6464
DROP ROLE regress_stats_user1;
6565
DROP ROLE regress_stats_user2;
66+
SELECT pg_stat_statements_reset();

‎contrib/pg_stat_statements/sql/utility.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,3 +276,4 @@ SET enable_seqscan = on;
276276
RESET enable_seqscan;
277277

278278
SELECT calls, rows, queryFROM pg_stat_statementsORDER BY query COLLATE"C";
279+
SELECT pg_stat_statements_reset();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp