From c60cf6ec100aae062cbaa9cab1639eb077bca6ed Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Mon, 13 Sep 2021 16:29:50 -0400 Subject: [PATCH v7 3/3] Rename pg_stat_buffer_actions to pg_stat_buffers Also, rename all members of view to allow for future expansion of buffer types covered. --- doc/src/sgml/monitoring.sgml | 32 +++++++++++++-------------- src/backend/catalog/system_views.sql | 12 +++++----- src/backend/storage/buffer/freelist.c | 4 ++-- src/include/catalog/pg_proc.dat | 2 +- src/test/regress/expected/rules.out | 14 ++++++------ src/test/regress/sql/stats.sql | 2 +- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index 96258ada18..1ee46694f0 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -445,11 +445,11 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser - pg_stat_buffer_actionspg_stat_buffer_actions + pg_stat_bufferspg_stat_buffers One row for each backend type showing statistics about backend buffer activity. See - pg_stat_buffer_actions for details. + pg_stat_buffers for details. @@ -3441,19 +3441,19 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - <structname>pg_stat_buffer_actions</structname> + <structname>pg_stat_buffers</structname> - pg_stat_buffer_actions + pg_stat_buffers - The pg_stat_buffer_actions view has a row for each + The pg_stat_buffers view has a row for each backend type, containing global data for the cluster for that backend type. - - <structname>pg_stat_buffer_actions</structname> View +
+ <structname>pg_stat_buffers</structname> View @@ -3477,43 +3477,43 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - buffers_alloc integer + shared_buffers_alloc integer - Number of buffers allocated. + Number of shared buffers allocated. - buffers_extend integer + shared_buffers_extend integer - Number of buffers extended. + Number of shared buffers extended. - buffers_fsync integer + shared_buffers_fsync integer - Number of buffers fsynced. TODO: is this only shared buffers? + Number of shared buffers fsynced. - buffers_write integer + shared_buffers_write integer - Number of buffers written. + Number of shared buffers written. - buffers_write_strat integer + strategy_buffers_write integer Number of buffers written as part of a buffer access strategy. diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index a5d7972687..ff668fb256 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -1067,14 +1067,14 @@ CREATE VIEW pg_stat_bgwriter AS pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean, pg_stat_get_bgwriter_stat_reset_time() AS stats_reset; -CREATE VIEW pg_stat_buffer_actions AS +CREATE VIEW pg_stat_buffers AS SELECT b.backend_type, - b.buffers_alloc, - b.buffers_extend, - b.buffers_fsync, - b.buffers_write, - b.buffers_write_strat + b.shared_buffers_alloc, + b.shared_buffers_extend, + b.shared_buffers_fsync, + b.shared_buffers_write, + b.strategy_buffers_write FROM pg_stat_get_buffer_actions() b; CREATE VIEW pg_stat_wal AS diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 17b76e9c2c..c85ec3eec0 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -690,7 +690,7 @@ StrategyRejectBuffer(BufferAccessStrategy strategy, BufferDesc *buf, bool *from_ { /* * If we decide to use the dirty buffer selected by StrategyGetBuffer, then - * ensure that we count it as such in pg_stat_buffer_actions view. + * ensure that we count it as such in pg_stat_buffers view. */ *from_ring = true; @@ -713,7 +713,7 @@ StrategyRejectBuffer(BufferAccessStrategy strategy, BufferDesc *buf, bool *from_ * Since we will not be writing out a dirty buffer from the ring, set * from_ring to false so that the caller does not count this write as a * "strategy write" and can do proper bookkeeping for - * pg_stat_buffer_actions. + * pg_stat_buffers. */ *from_ring = false; diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index afab94ca96..02d161aa5c 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -5626,7 +5626,7 @@ proparallel => 'r', prorettype => 'record', proargtypes => '', proallargtypes => '{text,int8,int8,int8,int8,int8}', proargmodes => '{o,o,o,o,o,o}', - proargnames => '{backend_type,buffers_alloc,buffers_extend,buffers_fsync,buffers_write,buffers_write_strat}', + proargnames => '{backend_type,shared_buffers_alloc,shared_buffers_extend,shared_buffers_fsync,shared_buffers_write,strategy_buffers_write}', prosrc => 'pg_stat_get_buffer_actions' }, { oid => '1136', descr => 'statistics: information about WAL activity', diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index f88c060370..8a61ef93e1 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -1823,13 +1823,13 @@ pg_stat_bgwriter| SELECT pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints pg_stat_get_checkpoint_sync_time() AS checkpoint_sync_time, pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean, pg_stat_get_bgwriter_stat_reset_time() AS stats_reset; -pg_stat_buffer_actions| SELECT b.backend_type, - b.buffers_alloc, - b.buffers_extend, - b.buffers_fsync, - b.buffers_write, - b.buffers_write_strat - FROM pg_stat_get_buffer_actions() b(backend_type, buffers_alloc, buffers_extend, buffers_fsync, buffers_write, buffers_write_strat); +pg_stat_buffers| SELECT b.backend_type, + b.shared_buffers_alloc, + b.shared_buffers_extend, + b.shared_buffers_fsync, + b.shared_buffers_write, + b.strategy_buffers_write + FROM pg_stat_get_buffer_actions() b(backend_type, shared_buffers_alloc, shared_buffers_extend, shared_buffers_fsync, shared_buffers_write, strategy_buffers_write); pg_stat_database| SELECT d.oid AS datid, d.datname, CASE diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql index fb4b613d4b..e908ac2591 100644 --- a/src/test/regress/sql/stats.sql +++ b/src/test/regress/sql/stats.sql @@ -176,5 +176,5 @@ FROM prevstats AS pr; DROP TABLE trunc_stats_test, trunc_stats_test1, trunc_stats_test2, trunc_stats_test3, trunc_stats_test4; DROP TABLE prevstats; -SELECT * FROM pg_stat_buffer_actions; +SELECT * FROM pg_stat_buffers; -- End of Stats Test -- 2.27.0