From b52c4fc3c09ec0ec9c1f9aa676f6d74304cc2f6f Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Wed, 18 Sep 2024 14:42:57 -0500 Subject: [PATCH] Add TOAST table to pg_index. This change allows pg_index rows to use out-of-line storage for the "indexprs" and "indpred" columns, which enables use-cases such as very large index expressions. This system catalog was previously not given a TOAST table due to a fear of circularity issues (see commit 96cdeae07f). Testing has not revealed any such problems, and it seems unlikely that the entries for system indexes could ever need out-of-line storage. In any case, it is still early in the v18 development cycle, so committing this now will hopefully increase the chances of finding any unexpected problems prior to release. Bumps catversion. Reported-by: Jonathan Katz Reviewed-by: Tom Lane Discussion: https://postgr.es/m/b611015f-b423-458c-aa2d-be0e655cc1b4%40postgresql.org --- src/include/catalog/catversion.h | 2 +- src/include/catalog/pg_index.h | 2 ++ src/test/regress/expected/misc_sanity.out | 8 +++----- src/test/regress/sql/misc_sanity.sql | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 1d54ef6edce..2d0b36eaab5 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -57,6 +57,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 202409181 +#define CATALOG_VERSION_NO 202409182 #endif diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h index 3462572eb55..6c89639a9e4 100644 --- a/src/include/catalog/pg_index.h +++ b/src/include/catalog/pg_index.h @@ -69,6 +69,8 @@ CATALOG(pg_index,2610,IndexRelationId) BKI_SCHEMA_MACRO */ typedef FormData_pg_index *Form_pg_index; +DECLARE_TOAST_WITH_MACRO(pg_index, 8149, 8150, PgIndexToastTable, PgIndexToastIndex); + DECLARE_INDEX(pg_index_indrelid_index, 2678, IndexIndrelidIndexId, pg_index, btree(indrelid oid_ops)); DECLARE_UNIQUE_INDEX_PKEY(pg_index_indexrelid_index, 2679, IndexRelidIndexId, pg_index, btree(indexrelid oid_ops)); diff --git a/src/test/regress/expected/misc_sanity.out b/src/test/regress/expected/misc_sanity.out index ad88cbd5c4c..45e74928775 100644 --- a/src/test/regress/expected/misc_sanity.out +++ b/src/test/regress/expected/misc_sanity.out @@ -35,8 +35,8 @@ WHERE refclassid = 0 OR refobjid = 0 OR -- Look for system tables with varlena columns but no toast table. All -- system tables with toastable columns should have toast tables, with -- the following exceptions: --- 1. pg_class, pg_attribute, and pg_index, due to fear of recursive --- dependencies as toast tables depend on them. +-- 1. pg_class and pg_attribute, due to fear of recursive dependencies as +-- toast tables depend on them. -- 2. pg_largeobject and pg_largeobject_metadata. Large object catalogs -- and toast tables are mutually exclusive and large object data is handled -- as user data by pg_upgrade, which would cause failures. @@ -56,11 +56,9 @@ ORDER BY 1, 2; pg_class | relacl | aclitem[] pg_class | reloptions | text[] pg_class | relpartbound | pg_node_tree - pg_index | indexprs | pg_node_tree - pg_index | indpred | pg_node_tree pg_largeobject | data | bytea pg_largeobject_metadata | lomacl | aclitem[] -(11 rows) +(9 rows) -- system catalogs without primary keys -- diff --git a/src/test/regress/sql/misc_sanity.sql b/src/test/regress/sql/misc_sanity.sql index cda760bd5ef..16f3a7c0c19 100644 --- a/src/test/regress/sql/misc_sanity.sql +++ b/src/test/regress/sql/misc_sanity.sql @@ -38,8 +38,8 @@ WHERE refclassid = 0 OR refobjid = 0 OR -- Look for system tables with varlena columns but no toast table. All -- system tables with toastable columns should have toast tables, with -- the following exceptions: --- 1. pg_class, pg_attribute, and pg_index, due to fear of recursive --- dependencies as toast tables depend on them. +-- 1. pg_class and pg_attribute, due to fear of recursive dependencies as +-- toast tables depend on them. -- 2. pg_largeobject and pg_largeobject_metadata. Large object catalogs -- and toast tables are mutually exclusive and large object data is handled -- as user data by pg_upgrade, which would cause failures. -- 2.30.2