From e07ea0385ad10b7a017b34d4876f06686bb293f2 Mon Sep 17 00:00:00 2001 From: Bertrand Drouvot Date: Wed, 5 Feb 2025 15:55:36 +0000 Subject: [PATCH v3 2/4] Allow pg_stat_statements to track WAL buffers full Now that wal_buffers_full is part of the WalUsage struct, let's report it in pg_stat_statements. This commit doesn't bump the version of pg_stat_statements as the same is done for this release in commit cf54a2c00254. --- contrib/pg_stat_statements/expected/oldextversions.out | 1 + .../pg_stat_statements--1.11--1.12.sql | 1 + contrib/pg_stat_statements/pg_stat_statements.c | 8 ++++++-- doc/src/sgml/pgstatstatements.sgml | 9 +++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) 10.0% contrib/pg_stat_statements/expected/ 56.9% contrib/pg_stat_statements/ 33.0% doc/src/sgml/ diff --git a/contrib/pg_stat_statements/expected/oldextversions.out b/contrib/pg_stat_statements/expected/oldextversions.out index 0c60fc81274..de679b19711 100644 --- a/contrib/pg_stat_statements/expected/oldextversions.out +++ b/contrib/pg_stat_statements/expected/oldextversions.out @@ -385,6 +385,7 @@ AlTER EXTENSION pg_stat_statements UPDATE TO '1.12'; wal_records | bigint | | | wal_fpi | bigint | | | wal_bytes | numeric | | | + wal_buffers_full | bigint | | | jit_functions | bigint | | | jit_generation_time | double precision | | | jit_inlining_count | bigint | | | diff --git a/contrib/pg_stat_statements/pg_stat_statements--1.11--1.12.sql b/contrib/pg_stat_statements/pg_stat_statements--1.11--1.12.sql index 80e6be25445..4343d83f0b8 100644 --- a/contrib/pg_stat_statements/pg_stat_statements--1.11--1.12.sql +++ b/contrib/pg_stat_statements/pg_stat_statements--1.11--1.12.sql @@ -50,6 +50,7 @@ CREATE FUNCTION pg_stat_statements(IN showtext boolean, OUT wal_records int8, OUT wal_fpi int8, OUT wal_bytes numeric, + OUT wal_buffers_full int8, OUT jit_functions int8, OUT jit_generation_time float8, OUT jit_inlining_count int8, diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index bebf8134eb0..16e4f642464 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -187,6 +187,7 @@ typedef struct Counters int64 wal_records; /* # of WAL records generated */ int64 wal_fpi; /* # of WAL full page images generated */ uint64 wal_bytes; /* total amount of WAL generated in bytes */ + int64 wal_buffers_full; /* # of times the WAL buffers became full */ int64 jit_functions; /* total number of JIT functions emitted */ double jit_generation_time; /* total time to generate jit code */ int64 jit_inlining_count; /* number of times inlining time has been @@ -1465,6 +1466,7 @@ pgss_store(const char *query, uint64 queryId, entry->counters.wal_records += walusage->wal_records; entry->counters.wal_fpi += walusage->wal_fpi; entry->counters.wal_bytes += walusage->wal_bytes; + entry->counters.wal_buffers_full += walusage->wal_buffers_full; if (jitusage) { entry->counters.jit_functions += jitusage->created_functions; @@ -1557,8 +1559,8 @@ pg_stat_statements_reset(PG_FUNCTION_ARGS) #define PG_STAT_STATEMENTS_COLS_V1_9 33 #define PG_STAT_STATEMENTS_COLS_V1_10 43 #define PG_STAT_STATEMENTS_COLS_V1_11 49 -#define PG_STAT_STATEMENTS_COLS_V1_12 51 -#define PG_STAT_STATEMENTS_COLS 51 /* maximum of above */ +#define PG_STAT_STATEMENTS_COLS_V1_12 52 +#define PG_STAT_STATEMENTS_COLS 52 /* maximum of above */ /* * Retrieve statement statistics. @@ -1955,6 +1957,8 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo, Int32GetDatum(-1)); values[i++] = wal_bytes; } + if (api_version >= PGSS_V1_12) + values[i++] = Int64GetDatumFast(tmp.wal_buffers_full); if (api_version >= PGSS_V1_10) { values[i++] = Int64GetDatumFast(tmp.jit_functions); diff --git a/doc/src/sgml/pgstatstatements.sgml b/doc/src/sgml/pgstatstatements.sgml index 501b468e9af..e2ac1c2d501 100644 --- a/doc/src/sgml/pgstatstatements.sgml +++ b/doc/src/sgml/pgstatstatements.sgml @@ -436,6 +436,15 @@ + + + wal_buffers_full bigint + + + Number of times the WAL buffers became full + + + jit_functions bigint -- 2.34.1