upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-07-15 04:40:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify redundant current_database() subqueries in stats.sql regression test

Browse source 
Previously the stats.sql regression test used conditions like
"datname = (SELECT current_database())" to check the current database name.

The subquery is unnecessary, so this commit simplifies these expressions to
"datname = current_database()".

Author: Chao Li <lic@highgo.com>
Reviewed-by: Fujii Masao <masao.fujii@gmail.com>
Discussion: https://postgr.es/m/A1535A8F-65AF-4C3D-ACBE-25891CB5D38B@gmail.com
This commit is contained in:
Fujii Masao 2026-04-06 13:19:45 +09:00
parent 3a08a2a8b4
commit d78a4f0bf0
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/test/regress/expected/stats.out
View file

@ -947,7 +947,7 @@ SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
-- Test that various stats views are being properly populated
-----
-- Test that sessions is incremented when a new session is started in pg_stat_database
SELECT sessions AS db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset
SELECT sessions AS db_stat_sessions FROM pg_stat_database WHERE datname = current_database() \gset
\c
SELECT pg_stat_force_next_flush();
pg_stat_force_next_flush
@ -955,7 +955,7 @@ SELECT pg_stat_force_next_flush();
(1 row)
SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database());
SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = current_database();
?column?
----------
t
@ -1157,8 +1157,8 @@ SELECT pg_stat_reset();
(1 row)
SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset
SELECT stats_reset AS dbc_reset_ts FROM pg_stat_database_conflicts WHERE datname = (SELECT current_database()) \gset
SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = current_database() \gset
SELECT stats_reset AS dbc_reset_ts FROM pg_stat_database_conflicts WHERE datname = current_database() \gset
SELECT :'db_reset_ts'::timestamptz = :'dbc_reset_ts'::timestamptz;
?column?
----------
@ -1171,13 +1171,13 @@ SELECT pg_stat_reset();
(1 row)
SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = (SELECT current_database());
SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = current_database();
?column?
----------
t
(1 row)
SELECT stats_reset > :'dbc_reset_ts'::timestamptz FROM pg_stat_database_conflicts WHERE datname = (SELECT current_database());
SELECT stats_reset > :'dbc_reset_ts'::timestamptz FROM pg_stat_database_conflicts WHERE datname = current_database();
?column?
----------
t

12
src/test/regress/sql/stats.sql
View file

@ -432,10 +432,10 @@ SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables
-----
-- Test that sessions is incremented when a new session is started in pg_stat_database
SELECT sessions AS db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset
SELECT sessions AS db_stat_sessions FROM pg_stat_database WHERE datname = current_database() \gset
\c
SELECT pg_stat_force_next_flush();
SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database());
SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = current_database();
-- Test pg_stat_checkpointer checkpointer-related stats, together with pg_stat_wal
SELECT num_requested AS rqst_ckpts_before FROM pg_stat_checkpointer \gset
@ -529,12 +529,12 @@ SELECT pg_stat_reset_shared('unknown');
-- have a baseline for comparison. The same for pg_stat_database_conflicts as it shares
-- the same stats_reset as pg_stat_database.
SELECT pg_stat_reset();
SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset
SELECT stats_reset AS dbc_reset_ts FROM pg_stat_database_conflicts WHERE datname = (SELECT current_database()) \gset
SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = current_database() \gset
SELECT stats_reset AS dbc_reset_ts FROM pg_stat_database_conflicts WHERE datname = current_database() \gset
SELECT :'db_reset_ts'::timestamptz = :'dbc_reset_ts'::timestamptz;
SELECT pg_stat_reset();
SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = (SELECT current_database());
SELECT stats_reset > :'dbc_reset_ts'::timestamptz FROM pg_stat_database_conflicts WHERE datname = (SELECT current_database());
SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = current_database();
SELECT stats_reset > :'dbc_reset_ts'::timestamptz FROM pg_stat_database_conflicts WHERE datname = current_database();
-- Test that reset works for pg_statio_all_sequences