Move catalog toast table declarations

Move the system catalog toast table declarations from
catalog/toasting.h to the respective parent tables' catalog/pg_*.h
files.  The original reason for having it split was that the old
genbki system produced the output in the order of the catalog files it
read, so all the toasting stuff needed to come separately.  But this
is no longer the case, and keeping it together makes more sense.

Reviewed-by: John Naylor <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/[email protected]

Author: petere

doc/src/sgml/bki.sgml

@@ -24,8 +24,7 @@
   the catalog has, as well as some other basic properties such as its OID.
   Other critical files defining the catalog structure
   include <filename>indexing.h</filename>, which defines the indexes present
-  on all the system catalogs, and <filename>toasting.h</filename>, which
-  defines TOAST tables for catalogs that need one.
+  on all the system catalogs.
  </para>
 
  <para>

src/backend/catalog/Makefile

@@ -72,11 +72,8 @@ CATALOG_HEADERS := \
 
 GENERATED_HEADERS := $(CATALOG_HEADERS:%.h=%_d.h) schemapg.h
 
-# In the list of headers used to assemble postgres.bki, indexing.h needs
-# be last, and toasting.h just before it.  This ensures we don't try to
-# create indexes or toast tables before their catalogs exist.
 POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
-	$(CATALOG_HEADERS) toasting.h indexing.h \
+	$(CATALOG_HEADERS) indexing.h \
 	)
 
 # The .dat files we need can just be listed alphabetically.

src/backend/catalog/catalog.c

@@ -40,7 +40,6 @@
 #include "catalog/pg_subscription.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_type.h"
-#include "catalog/toasting.h"
 #include "miscadmin.h"
 #include "storage/fd.h"
 #include "utils/fmgroids.h"
@@ -268,7 +267,7 @@ IsSharedRelation(Oid relationId)
 		relationId == SubscriptionObjectIndexId ||
 		relationId == SubscriptionNameIndexId)
 		return true;
-	/* These are their toast tables and toast indexes (see toasting.h) */
+	/* These are their toast tables and toast indexes */
 	if (relationId == PgAuthidToastTable ||
 		relationId == PgAuthidToastIndex ||
 		relationId == PgDatabaseToastTable ||

src/backend/catalog/toasting.c

@@ -391,7 +391,7 @@ needs_toast_table(Relation rel)
 	/*
 	 * Ignore attempts to create toast tables on catalog tables after initdb.
 	 * Which catalogs get toast tables is explicitly chosen in
-	 * catalog/toasting.h.  (We could get here via some ALTER TABLE command if
+	 * catalog/pg_*.h.  (We could get here via some ALTER TABLE command if
 	 * the catalog doesn't have a toast table.)
 	 */
 	if (IsCatalogRelation(rel) && !IsBootstrapProcessingMode())

src/include/catalog/duplicate_oids

@@ -26,7 +26,7 @@ chdir $FindBin::RealBin or die "could not cd to $FindBin::RealBin: $!\n";
 use lib "$FindBin::RealBin/../../backend/catalog/";
 use Catalog;
 
-my @input_files = (glob("pg_*.h"), qw(indexing.h toasting.h));
+my @input_files = (glob("pg_*.h"), qw(indexing.h));
 
 my $oids = Catalog::FindAllOidsFromHeaders(@input_files);
 

src/include/catalog/genbki.h

@@ -41,6 +41,19 @@
  */
 #define BKI_LOOKUP(catalog)
 
+/*
+ * These lines are processed by genbki.pl to create the statements
+ * the bootstrap parser will turn into BootstrapToastTable commands.
+ * Each line specifies the system catalog that needs a toast table,
+ * the OID to assign to the toast table, and the OID to assign to the
+ * toast table's index.  The reason we hard-wire these OIDs is that we
+ * need stable OIDs for shared relations, and that includes toast tables
+ * of shared relations.
+ *
+ * The macro definition is just to keep the C compiler from spitting up.
+ */
+#define DECLARE_TOAST(name,toastoid,indexoid) extern int no_such_variable
+
 /* The following are never defined; they are here only for documentation. */
 
 /*

src/include/catalog/pg_aggregate.h

@@ -108,6 +108,8 @@ CATALOG(pg_aggregate,2600,AggregateRelationId)
  */
 typedef FormData_pg_aggregate *Form_pg_aggregate;
 
+DECLARE_TOAST(pg_aggregate, 4159, 4160);
+
 #ifdef EXPOSE_TO_CLIENT_CODE
 
 /*

src/include/catalog/pg_attrdef.h

@@ -46,4 +46,6 @@ CATALOG(pg_attrdef,2604,AttrDefaultRelationId)
  */
 typedef FormData_pg_attrdef *Form_pg_attrdef;
 
+DECLARE_TOAST(pg_attrdef, 2830, 2831);
+
 #endif							/* PG_ATTRDEF_H */

src/include/catalog/pg_authid.h

@@ -55,4 +55,8 @@ CATALOG(pg_authid,1260,AuthIdRelationId) BKI_SHARED_RELATION BKI_ROWTYPE_OID(284
  */
 typedef FormData_pg_authid *Form_pg_authid;
 
+DECLARE_TOAST(pg_authid, 4175, 4176);
+#define PgAuthidToastTable 4175
+#define PgAuthidToastIndex 4176
+
 #endif							/* PG_AUTHID_H */

src/include/catalog/pg_constraint.h

@@ -153,6 +153,8 @@ CATALOG(pg_constraint,2606,ConstraintRelationId)
  */
 typedef FormData_pg_constraint *Form_pg_constraint;
 
+DECLARE_TOAST(pg_constraint, 2832, 2833);
+
 #ifdef EXPOSE_TO_CLIENT_CODE
 
 /* Valid values for contype */