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/access/transam/commit_ts.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/access/transam/commit_ts.c')
| -rw-r--r-- | src/backend/access/transam/commit_ts.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index 9aa4675cb79..5c30de57ac8 100644 --- a/src/backend/access/transam/commit_ts.c +++ b/src/backend/access/transam/commit_ts.c @@ -422,18 +422,8 @@ pg_last_committed_xact(PG_FUNCTION_ARGS) /* and construct a tuple with our data */ xid = GetLatestCommitTsData(&ts, &nodeid); - /* - * Construct a tuple descriptor for the result row. This must match this - * function's pg_proc entry! - */ - tupdesc = CreateTemplateTupleDesc(3); - TupleDescInitEntry(tupdesc, (AttrNumber) 1, "xid", - XIDOID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 2, "timestamp", - TIMESTAMPTZOID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 3, "roident", - OIDOID, -1, 0); - tupdesc = BlessTupleDesc(tupdesc); + if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) + elog(ERROR, "return type must be a row type"); if (!TransactionIdIsNormal(xid)) { @@ -476,16 +466,8 @@ pg_xact_commit_timestamp_origin(PG_FUNCTION_ARGS) found = TransactionIdGetCommitTsData(xid, &ts, &nodeid); - /* - * Construct a tuple descriptor for the result row. This must match this - * function's pg_proc entry! - */ - tupdesc = CreateTemplateTupleDesc(2); - TupleDescInitEntry(tupdesc, (AttrNumber) 1, "timestamp", - TIMESTAMPTZOID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 2, "roident", - OIDOID, -1, 0); - tupdesc = BlessTupleDesc(tupdesc); + if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) + elog(ERROR, "return type must be a row type"); if (!found) { |