diff options
author | Michael Paquier <michael@paquier.xyz> | 2022-12-21 10:11:22 +0900 |
---|---|---|
committer | Michael Paquier <michael@paquier.xyz> | 2022-12-21 10:11:22 +0900 |
commit | 22e3b558052aa209cba2a8fec192d76b5faef19e (patch) | |
tree | b4626ba839fad837c50e039ce56e6819a5e0f9f6 /src/backend/commands/sequence.c | |
parent | f03bd5717eaf31569ca797a2f7d65608f88ac2a2 (diff) | |
download | postgresql-22e3b558052aa209cba2a8fec192d76b5faef19e.tar.gz postgresql-22e3b558052aa209cba2a8fec192d76b5faef19e.zip |
Switch some system functions to use get_call_result_type()
This shaves some code by replacing the combinations of
CreateTemplateTupleDesc()/TupleDescInitEntry() hardcoding a mapping of
the attributes listed in pg_proc.dat by get_call_result_type() to build
the TupleDesc needed for the rows generated.
get_call_result_type() is more expensive than the former style, but this
removes some duplication with the lists of OUT parameters (pg_proc.dat
and the attributes hardcoded in these code paths). This is applied to
functions that are not considered as critical (aka that could be called
repeatedly for monitoring purposes).
Author: Bharath Rupireddy
Reviewed-by: Robert Haas, Álvaro Herrera, Tom Lane, Michael Paquier
Discussion: https://postgr.es/m/CALj2ACV23HW5HP5hFjd89FNS-z5X8r2jNXdMXcpN2BgTtKd87w@mail.gmail.com
Diffstat (limited to 'src/backend/commands/sequence.c')
-rw-r--r-- | src/backend/commands/sequence.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 99c9f91cba5..c31c9b891a5 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -1762,23 +1762,8 @@ pg_sequence_parameters(PG_FUNCTION_ARGS) errmsg("permission denied for sequence %s", get_rel_name(relid)))); - tupdesc = CreateTemplateTupleDesc(7); - TupleDescInitEntry(tupdesc, (AttrNumber) 1, "start_value", - INT8OID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 2, "minimum_value", - INT8OID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 3, "maximum_value", - INT8OID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 4, "increment", - INT8OID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 5, "cycle_option", - BOOLOID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 6, "cache_size", - INT8OID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 7, "data_type", - OIDOID, -1, 0); - - BlessTupleDesc(tupdesc); + if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) + elog(ERROR, "return type must be a row type"); memset(isnull, 0, sizeof(isnull)); |