diff options
| author | Andres Freund <andres@anarazel.de> | 2022-03-27 21:39:43 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2022-03-27 21:46:23 -0700 |
| commit | 43a7dc96eb363f87286494223861301361ce766c (patch) | |
| tree | 32410d397df495ebd68de369485cb46817d9dd43 /src | |
| parent | 8af36427d4cc783a9efe8781889ea0936f1d48dd (diff) | |
| download | postgresql-43a7dc96eb363f87286494223861301361ce766c.tar.gz postgresql-43a7dc96eb363f87286494223861301361ce766c.zip | |
Fix NULL input behaviour of pg_stat_get_replication_slot().
pg_stat_get_replication_slot() accidentally was marked as non-strict, crashing
when called with NULL input. As it's already released, introduce an explicit
NULL check in 14, fix the catalog in HEAD.
Bumps catversion in HEAD.
Discussion: https://postgr.es/m/20220326212432.s5n2maw6kugnpyxw@alap3.anarazel.de
Backpatch: 14-, where replication slot stats were introduced
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.dat | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/stats.out | 7 | ||||
| -rw-r--r-- | src/test/regress/sql/stats.sql | 4 |
4 files changed, 13 insertions, 2 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index a3a49d39386..706475dfa80 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 202203241 +#define CATALOG_VERSION_NO 202203271 #endif diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index 5e612a6b67e..a26625f8233 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -5370,7 +5370,7 @@ proargnames => '{pid,status,receive_start_lsn,receive_start_tli,written_lsn,flushed_lsn,received_tli,last_msg_send_time,last_msg_receipt_time,latest_end_lsn,latest_end_time,slot_name,sender_host,sender_port,conninfo}', prosrc => 'pg_stat_get_wal_receiver' }, { oid => '6169', descr => 'statistics: information about replication slot', - proname => 'pg_stat_get_replication_slot', proisstrict => 'f', provolatile => 's', + proname => 'pg_stat_get_replication_slot', provolatile => 's', proparallel => 'r', prorettype => 'record', proargtypes => 'text', proallargtypes => '{text,text,int8,int8,int8,int8,int8,int8,int8,int8,timestamptz}', proargmodes => '{i,o,o,o,o,o,o,o,o,o,o}', diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out index b7416c8f8fb..dcf48112f64 100644 --- a/src/test/regress/expected/stats.out +++ b/src/test/regress/expected/stats.out @@ -255,4 +255,11 @@ SELECT pg_stat_get_tuples_hot_updated('brin_hot'::regclass::oid); DROP TABLE brin_hot; DROP FUNCTION wait_for_hot_stats(); +-- ensure that stats accessors handle NULL input correctly +SELECT pg_stat_get_replication_slot(NULL); + pg_stat_get_replication_slot +------------------------------ + +(1 row) + -- End of Stats Test diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql index dbc2dd28b6b..076c763451a 100644 --- a/src/test/regress/sql/stats.sql +++ b/src/test/regress/sql/stats.sql @@ -229,4 +229,8 @@ DROP TABLE brin_hot; DROP FUNCTION wait_for_hot_stats(); +-- ensure that stats accessors handle NULL input correctly +SELECT pg_stat_get_replication_slot(NULL); + + -- End of Stats Test |