From 9aabc976bad3e2b131d27fcb9b8770b9d54642a8 Mon Sep 17 00:00:00 2001 From: Fujii Masao Date: Thu, 12 Mar 2026 12:15:32 +0900 Subject: [PATCH v4] Add stats_reset column to pg_stat_database_conflicts. This commit adds a stats_reset column to pg_stat_database_conflicts, allowing users to see when the statistics in this view were last reset. This makes the view consistent with pg_stat_database and other statistics views. Catalog version bumped. Author: Shihao Zhong Reviewed-by: Sami Imseih Reviewed-by: Kirill Reshke Discussion: https://postgr.es/m/CAGRkXqS98OebEWjax99_LVAECsxCB8i=BfsdAL34i-5QHfwyOQ@mail.gmail.com --- doc/src/sgml/monitoring.sgml | 9 +++++++++ src/backend/catalog/system_views.sql | 3 ++- src/test/regress/expected/rules.out | 3 ++- src/test/regress/expected/stats.out | 21 ++++++++++++++------- src/test/regress/sql/stats.sql | 15 +++++++++++---- 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index cc014564c97..7ef9fbba874 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -4036,6 +4036,15 @@ description | Waiting for a newly initialized WAL file to reach durable storage on the primary + + + + stats_reset timestamp with time zone + + + Time at which these statistics were last reset + + diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index 339c016e510..90d48bc9c80 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -1163,7 +1163,8 @@ CREATE VIEW pg_stat_database_conflicts AS pg_stat_get_db_conflict_snapshot(D.oid) AS confl_snapshot, pg_stat_get_db_conflict_bufferpin(D.oid) AS confl_bufferpin, pg_stat_get_db_conflict_startup_deadlock(D.oid) AS confl_deadlock, - pg_stat_get_db_conflict_logicalslot(D.oid) AS confl_active_logicalslot + pg_stat_get_db_conflict_logicalslot(D.oid) AS confl_active_logicalslot, + pg_stat_get_db_stat_reset_time(D.oid) AS stats_reset FROM pg_database D; CREATE VIEW pg_stat_user_functions AS diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index f373ad704b6..71d7262049e 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -1921,7 +1921,8 @@ pg_stat_database_conflicts| SELECT oid AS datid, pg_stat_get_db_conflict_snapshot(oid) AS confl_snapshot, pg_stat_get_db_conflict_bufferpin(oid) AS confl_bufferpin, pg_stat_get_db_conflict_startup_deadlock(oid) AS confl_deadlock, - pg_stat_get_db_conflict_logicalslot(oid) AS confl_active_logicalslot + pg_stat_get_db_conflict_logicalslot(oid) AS confl_active_logicalslot, + pg_stat_get_db_stat_reset_time(oid) AS stats_reset FROM pg_database d; pg_stat_gssapi| SELECT pid, gss_auth AS gss_authenticated, diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out index cd00f35bf7a..ba23db66eb6 100644 --- a/src/test/regress/expected/stats.out +++ b/src/test/regress/expected/stats.out @@ -1131,25 +1131,32 @@ SELECT stats_reset > :'wal_reset_ts'::timestamptz FROM pg_stat_wal; SELECT pg_stat_reset_shared('unknown'); ERROR: unrecognized reset target: "unknown" HINT: Target must be "archiver", "bgwriter", "checkpointer", "io", "recovery_prefetch", "slru", or "wal". --- Test that reset works for pg_stat_database --- Since pg_stat_database stats_reset starts out as NULL, reset it once first so we have something to compare it to +-- Test that reset works for pg_stat_database and pg_stat_database_conflicts +-- Since stats_reset in pg_stat_database and pg_stat_database_conflicts starts +-- out as NULL, reset it once first so we have something to compare it to SELECT pg_stat_reset(); pg_stat_reset --------------- (1 row) -SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset +SELECT D.stats_reset AS db_reset_ts, DC.stats_reset AS dbc_reset_ts +FROM pg_stat_database D, pg_stat_database_conflicts DC +WHERE D.datname = (SELECT current_database()) AND D.datname = DC.datname \gset SELECT pg_stat_reset(); pg_stat_reset --------------- (1 row) -SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = (SELECT current_database()); - ?column? ----------- - t +SELECT D.stats_reset > :'db_reset_ts'::timestamptz, + DC.stats_reset > :'dbc_reset_ts'::timestamptz, + D.stats_reset = DC.stats_reset +FROM pg_stat_database D, pg_stat_database_conflicts DC +WHERE D.datname = (SELECT current_database()) AND D.datname = DC.datname; + ?column? | ?column? | ?column? +----------+----------+---------- + t | t | t (1 row) ---- diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql index 8768e0f27fd..c04b898d861 100644 --- a/src/test/regress/sql/stats.sql +++ b/src/test/regress/sql/stats.sql @@ -523,13 +523,20 @@ SELECT stats_reset > :'wal_reset_ts'::timestamptz FROM pg_stat_wal; -- Test error case for reset_shared with unknown stats type SELECT pg_stat_reset_shared('unknown'); --- Test that reset works for pg_stat_database +-- Test that reset works for pg_stat_database and pg_stat_database_conflicts --- Since pg_stat_database stats_reset starts out as NULL, reset it once first so we have something to compare it to +-- Since stats_reset in pg_stat_database and pg_stat_database_conflicts starts +-- out as NULL, reset it once first so we have something to compare it to SELECT pg_stat_reset(); -SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset +SELECT D.stats_reset AS db_reset_ts, DC.stats_reset AS dbc_reset_ts +FROM pg_stat_database D, pg_stat_database_conflicts DC +WHERE D.datname = (SELECT current_database()) AND D.datname = DC.datname \gset SELECT pg_stat_reset(); -SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = (SELECT current_database()); +SELECT D.stats_reset > :'db_reset_ts'::timestamptz, + DC.stats_reset > :'dbc_reset_ts'::timestamptz, + D.stats_reset = DC.stats_reset +FROM pg_stat_database D, pg_stat_database_conflicts DC +WHERE D.datname = (SELECT current_database()) AND D.datname = DC.datname; ---- -- 2.51.2