From 8dbb3c1caaa0adefafab8483dd7827ce45157a20 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Wed, 15 May 2024 22:03:22 +0200 Subject: [PATCH] Cache typarray for fast lookups in binary upgrade mode When upgrading a large schema it adds significant overhead to perform individual catalog lookups per relation in order to retrieve Oid for preserving Oid calls. This instead adds the typarray to the TypeInfo cache which then allows for fast lookups using the existing API. --- src/bin/pg_dump/pg_dump.c | 20 ++++++++------------ src/bin/pg_dump/pg_dump.h | 1 + 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index ac920f64c7..5fb4453712 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -5304,23 +5304,15 @@ binary_upgrade_set_type_oids_by_type_oid(Archive *fout, Oid pg_type_array_oid; Oid pg_type_multirange_oid; Oid pg_type_multirange_array_oid; + TypeInfo *tinfo; appendPQExpBufferStr(upgrade_buffer, "\n-- For binary upgrade, must preserve pg_type oid\n"); appendPQExpBuffer(upgrade_buffer, "SELECT pg_catalog.binary_upgrade_set_next_pg_type_oid('%u'::pg_catalog.oid);\n\n", pg_type_oid); - appendPQExpBuffer(upgrade_query, - "SELECT typarray " - "FROM pg_catalog.pg_type " - "WHERE oid = '%u'::pg_catalog.oid;", - pg_type_oid); - - res = ExecuteSqlQueryForSingleRow(fout, upgrade_query->data); - - pg_type_array_oid = atooid(PQgetvalue(res, 0, PQfnumber(res, "typarray"))); - - PQclear(res); + tinfo = findTypeByOid(pg_type_oid); + pg_type_array_oid = tinfo->typarray; if (!OidIsValid(pg_type_array_oid) && force_array_type) pg_type_array_oid = get_next_possible_free_pg_type_oid(fout, upgrade_query); @@ -5785,6 +5777,7 @@ getTypes(Archive *fout, int *numTypes) int i_typtype; int i_typisdefined; int i_isarray; + int i_typarray; /* * we include even the built-in types because those may be used as array @@ -5805,7 +5798,7 @@ getTypes(Archive *fout, int *numTypes) "typnamespace, typacl, " "acldefault('T', typowner) AS acldefault, " "typowner, " - "typelem, typrelid, " + "typelem, typrelid, typarray, " "CASE WHEN typrelid = 0 THEN ' '::\"char\" " "ELSE (SELECT relkind FROM pg_class WHERE oid = typrelid) END AS typrelkind, " "typtype, typisdefined, " @@ -5832,6 +5825,7 @@ getTypes(Archive *fout, int *numTypes) i_typtype = PQfnumber(res, "typtype"); i_typisdefined = PQfnumber(res, "typisdefined"); i_isarray = PQfnumber(res, "isarray"); + i_typarray = PQfnumber(res, "typarray"); for (i = 0; i < ntups; i++) { @@ -5864,6 +5858,8 @@ getTypes(Archive *fout, int *numTypes) else tyinfo[i].isArray = false; + tyinfo[i].typarray = atooid(PQgetvalue(res, i, i_typarray)); + if (tyinfo[i].typtype == TYPTYPE_MULTIRANGE) tyinfo[i].isMultirange = true; else diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index f518a1e6d2..135219bf4a 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -200,6 +200,7 @@ typedef struct _typeInfo const char *rolname; Oid typelem; Oid typrelid; + Oid typarray; char typrelkind; /* 'r', 'v', 'c', etc */ char typtype; /* 'b', 'c', etc */ bool isArray; /* true if auto-generated array type */ -- 2.39.3 (Apple Git-146)