Date: Mon, 21 Feb 2022 14:36:33 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Postgres hackers <pgsql-hackers@lists.postgresql.org>
Cc: Amit Kapila <amit.kapila16@gmail.com>,
	Masahiko Sawada <sawada.mshk@gmail.com>
Subject: pg_stat_get_replication_slot and pg_stat_get_subscription_worker
 incorrectly marked as proretset
Message-ID: <YhMk4RjoMK3CCXy2@paquier.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="u61RLKbMaOh8LfXW"
Content-Disposition: inline
Archived-At: <https://www.postgresql.org/message-id/YhMk4RjoMK3CCXy2%40paquier.xyz>
Precedence: bulk


--u61RLKbMaOh8LfXW
Content-Type: multipart/mixed; boundary="J/aiLp8B5BwpSncl"
Content-Disposition: inline


--J/aiLp8B5BwpSncl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,
(Author and committer added in CC.)

While reviewing the code of a bunch of SRF functions in the core code,
I have noticed that the two functions mentioned in $subject are marked
as proretset but both functions don't return a set of tuples, just one
record for the object given in input.  It is also worth noting that
prorows is set to 1.

This looks like a copy-pasto error that has spread around.  The error
on pg_stat_get_subscription_worker is recent as of 8d74fc9, and the
one on pg_stat_get_replication_slot has been introduced in 3fa17d3,
meaning that REL_14_STABLE got it wrong for the second part.

I am aware about the discussions on the parent view for the first
case and its design issues, but it does not change the fact that we'd
better address the second case on HEAD IMO.

Thoughts?
--
Michael

--J/aiLp8B5BwpSncl
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="proc-proretset.patch"

diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index 7f1ee97f55..aa05b9665f 100644
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -5370,16 +5370,16 @@
   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', prorows => '1', proisstrict => 'f',
-  proretset => 't', provolatile => 's', proparallel => 'r',
+  proname => 'pg_stat_get_replication_slot', proisstrict => 'f',
+  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}',
   proargnames => '{slot_name,slot_name,spill_txns,spill_count,spill_bytes,stream_txns,stream_count,stream_bytes,total_txns,total_bytes,stats_reset}',
   prosrc => 'pg_stat_get_replication_slot' },
 { oid => '8523', descr => 'statistics: information about subscription worker',
-  proname => 'pg_stat_get_subscription_worker', prorows => '1', proisstrict => 'f',
-  proretset => 't', provolatile => 's', proparallel => 'r',
+  proname => 'pg_stat_get_subscription_worker', proisstrict => 'f',
+  provolatile => 's', proparallel => 'r',
   prorettype => 'record', proargtypes => 'oid oid',
   proallargtypes => '{oid,oid,oid,oid,oid,text,xid,int8,text,timestamptz}',
   proargmodes => '{i,i,o,o,o,o,o,o,o,o}',

--J/aiLp8B5BwpSncl--

--u61RLKbMaOh8LfXW
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmITJOEACgkQnvQgOdby
QH2AlRAAg6A9VynPb7DyOaQ604uLE4hI9RkoJrv+qDwmGKF0k85PLKhrghEiK+GF
HNFhKic9s8zyj6RyvLL0jg2xd/+BAVdcW9QdTm78FQav1MdQ/7gp6wpa/VL+CyKH
3SXuV4cpr33Cc/23l8bYJOR9/QqPBiZBOHQmAsECMdwE5BmvEjPYtMyB0cPwZXcm
v+IeeVxIGW5bWR8tKUA6RqMXgJusKfxqiPsLcob8OPQE6XwdZosX3G2vOg7tMwar
A2TOZO/RbpopPgxJQfZ9byJNDwPDj3eXk+SQfkanrtrGSvE797nqMa0sRl3Y9O/s
qRJQ14HCarvVR9fgGk9kpx33nXuV5cnAs4jhNi54RNTt9xa0sf9H5mybRRCDfum8
hP6YxH3lpaGcqczE79EfhXXcBd8MPYNwF76DDsHUkgHbwD8ktroA1u3zc0lb+2q8
0yEjzNlhCUYbsj0Mm6ztJXq2NvW6QXbHuDSkZkLvExqW3gn3dSnBVCYb3ysSPwxS
uRP1Bo+pNHoS5NRrh6+Qfc8d3Hp11jh+HUJ2rysZx5MOESdyr56ZGQkVnTiNPuTh
FA4gWDkdRGJZegL4zuYGb80bKhlv73RkXCGIyU/ZdMOEDUZdFPW8gjRE8HO5PSmb
5GzpO0n543YtcVuPc9dfqDQLhdKLmsJNX1/99AxOLbE8KrAnbKI=
=x51a
-----END PGP SIGNATURE-----

--u61RLKbMaOh8LfXW--