index 62fc9cbea3dc74302ec057c186e08f36d57cfc89..ed61752e7fa585cdd684afceeaaa85d471353e4b 100644 (file)
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>
index 93cf6d4368579ed0f253cb37ef0146336ff694ea..be88eb1be61101d57cc3d3001e9573a05dea520a 100644 (file)
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.
index 7d6acaed92c9e6fd5227f782c454341cf092b08a..9be6423e4493ad8c826208e336b66c87ef01459d 100644 (file)
#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"
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 ||
index c40d25b3012c8285c3121ccfc52117034689da2d..f1850436bd74552f9663bf1081168fd101b1ddd9 100644 (file)
/*
* 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())
index 9e5e9a15be0a8cc02b170a7f8f63b671fc288a3f..1f863cb5edf579766feb0d19ba9fb3416034aac4 100755 (executable)
@@ -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);
index 8cac7ec878940feb80e0a567af96ccab78625b09..e73ca23ef2ab1da5263090bf63bb7fea0e6d6aba 100644 (file)
*/
#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. */
/*
index 457ca1844480345c22b86914c782cb49bddd02a5..52b82815941c9d09e27db1c2fb43bb19a6001150 100644 (file)
@@ -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
/*
index 7b661df3119c6c5bcee00e05df62dda92a8086c4..0ac27574fd3ebb781c391ad0ab8f87f73ee44ce1 100644 (file)
@@ -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 */
index 88a5373080a1cd0ce36c6585ba09d7abf4d9878c..310dc6b8a586b1acb865525fa8c3caf21177d36f 100644 (file)
@@ -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 */
index 9600ece93c525c31f3bee132e250aef3a237f69f..6db4bf6ce32df5a0b44f0e60baaa3165e77ae10e 100644 (file)
@@ -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 */
index f623ee81b77bec08513573ac7742d86052257003..58bf3c10842121c83816ada728a6e502469ceaf1 100644 (file)
@@ -80,4 +80,8 @@ CATALOG(pg_database,1262,DatabaseRelationId) BKI_SHARED_RELATION BKI_ROWTYPE_OID
*/
typedef FormData_pg_database *Form_pg_database;
+DECLARE_TOAST(pg_database, 4177, 4178);
+#define PgDatabaseToastTable 4177
+#define PgDatabaseToastIndex 4178
+
#endif /* PG_DATABASE_H */
index 5713fa23153dfee4cf36d9be89dc510947613ac1..5b0771e5f91828457ca38b7ce51bc94649525e00 100644 (file)
@@ -43,6 +43,10 @@ CATALOG(pg_db_role_setting,2964,DbRoleSettingRelationId) BKI_SHARED_RELATION
typedef FormData_pg_db_role_setting * Form_pg_db_role_setting;
+DECLARE_TOAST(pg_db_role_setting, 2966, 2967);
+#define PgDbRoleSettingToastTable 2966
+#define PgDbRoleSettingToastIndex 2967
+
/*
* prototypes for functions in pg_db_role_setting.h
*/
index 2bac5e23e1c703d6ddd8911d7639ae50fe0e9dea..e22ee897f8c08fefc7c8e2542f3439eedfed18de 100644 (file)
@@ -47,6 +47,8 @@ CATALOG(pg_default_acl,826,DefaultAclRelationId)
*/
typedef FormData_pg_default_acl *Form_pg_default_acl;
+DECLARE_TOAST(pg_default_acl, 4143, 4144);
+
#ifdef EXPOSE_TO_CLIENT_CODE
/*
index eeafbbe8d7c86bdfb1679a9cf4292f34bdc918be..f55ec0c8fe871154ea7fd629542e1c08daa6757c 100644 (file)
@@ -73,4 +73,6 @@ CATALOG(pg_depend,2608,DependRelationId)
*/
typedef FormData_pg_depend *Form_pg_depend;
+DECLARE_TOAST(pg_depend, 8888, 8889);
+
#endif /* PG_DEPEND_H */
index c40e8b73739efc79b35ff53801a801caee444e25..93eb041bacfbda35ed7777d75e8be5bb0aaee96a 100644 (file)
@@ -63,4 +63,6 @@ CATALOG(pg_description,2609,DescriptionRelationId)
*/
typedef FormData_pg_description * Form_pg_description;
+DECLARE_TOAST(pg_description, 2834, 2835);
+
#endif /* PG_DESCRIPTION_H */
index 24e4b1a1819fb77057b646817e21bcc690bb845a..abe92cf49942407c194212ec0cf88fc920f6dee2 100644 (file)
@@ -48,4 +48,6 @@ CATALOG(pg_event_trigger,3466,EventTriggerRelationId)
*/
typedef FormData_pg_event_trigger *Form_pg_event_trigger;
+DECLARE_TOAST(pg_event_trigger, 4145, 4146);
+
#endif /* PG_EVENT_TRIGGER_H */
index b6f4128cf3c0c4e8587357f3d4743c2678046f1c..57e1272cd2d1039fb137db40e7a2426de532a897 100644 (file)
@@ -49,4 +49,6 @@ CATALOG(pg_extension,3079,ExtensionRelationId)
*/
typedef FormData_pg_extension *Form_pg_extension;
+DECLARE_TOAST(pg_extension, 4147, 4148);
+
#endif /* PG_EXTENSION_H */
index 44d8558c419bf9602dfe16a732e8a45b58decaf2..3f0d0b0249fb8790548949ccf9d6ce5f899b5071 100644 (file)
@@ -47,4 +47,6 @@ CATALOG(pg_foreign_data_wrapper,2328,ForeignDataWrapperRelationId)
*/
typedef FormData_pg_foreign_data_wrapper *Form_pg_foreign_data_wrapper;
+DECLARE_TOAST(pg_foreign_data_wrapper, 4149, 4150);
+
#endif /* PG_FOREIGN_DATA_WRAPPER_H */
index 5c17004151bb561ba89b0fc3aad7698adebde131..d24af91c806e4e22907f199d0e4e1550750beadc 100644 (file)
@@ -47,4 +47,6 @@ CATALOG(pg_foreign_server,1417,ForeignServerRelationId)
*/
typedef FormData_pg_foreign_server *Form_pg_foreign_server;
+DECLARE_TOAST(pg_foreign_server, 4151, 4152);
+
#endif /* PG_FOREIGN_SERVER_H */
index 31c1faed03c94b2dbb99680f81388f5cca2b6d1e..1f01c552d6247278fbb9ef5b6ecbb56a2cabc265 100644 (file)
@@ -42,4 +42,6 @@ CATALOG(pg_foreign_table,3118,ForeignTableRelationId)
*/
typedef FormData_pg_foreign_table *Form_pg_foreign_table;
+DECLARE_TOAST(pg_foreign_table, 4153, 4154);
+
#endif /* PG_FOREIGN_TABLE_H */
index 7734b72c0489e453025890ac1319107dc4c6bb3f..314e83daefda9470cbc03cd77f4638206e851358 100644 (file)
@@ -62,6 +62,8 @@ CATALOG(pg_init_privs,3394,InitPrivsRelationId)
*/
typedef FormData_pg_init_privs * Form_pg_init_privs;
+DECLARE_TOAST(pg_init_privs, 4155, 4156);
+
/*
* It is important to know if the initial privileges are from initdb or from an
* extension. This enum is used to provide that differentiation and the two
index 937bacbf98946d4252806765cfc2b9462637cbac..d38ba7a8a6a00fbd8b7141b3b4db4418ac86ed38 100644 (file)
@@ -64,4 +64,6 @@ CATALOG(pg_language,2612,LanguageRelationId)
*/
typedef FormData_pg_language *Form_pg_language;
+DECLARE_TOAST(pg_language, 4157, 4158);
+
#endif /* PG_LANGUAGE_H */
index db93b270150767c70a906708320ad26551539dd8..da380e17a8be8831a1b86490bfbd5aea6aa6cddd 100644 (file)
@@ -51,6 +51,8 @@ CATALOG(pg_namespace,2615,NamespaceRelationId)
*/
typedef FormData_pg_namespace *Form_pg_namespace;
+DECLARE_TOAST(pg_namespace, 4163, 4164);
+
/*
* prototypes for functions in pg_namespace.c
*/
index 7ee0419373ca6df35cb6961b32bfb0546917113f..cf92234d7e7dc4a6c08ab475e255a03bf19b6ced 100644 (file)
@@ -64,4 +64,6 @@ CATALOG(pg_partitioned_table,3350,PartitionedRelationId)
*/
typedef FormData_pg_partitioned_table *Form_pg_partitioned_table;
+DECLARE_TOAST(pg_partitioned_table, 4165, 4166);
+
#endif /* PG_PARTITIONED_TABLE_H */
index 97954cdc8a69e52ecfc3a4fd6ceeb6a77e729dba..22018acfd1a0e3913ea443477b4becc8a6eb07a2 100644 (file)
@@ -49,4 +49,6 @@ CATALOG(pg_policy,3256,PolicyRelationId)
*/
typedef FormData_pg_policy *Form_pg_policy;
+DECLARE_TOAST(pg_policy, 4167, 4168);
+
#endif /* PG_POLICY_H */
index 268c81089653f15ee07b8437b4b902e514fc4961..bcdef18c34333c957c7c22028bb2dec50139c6a0 100644 (file)
@@ -132,6 +132,8 @@ CATALOG(pg_proc,1255,ProcedureRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(81,Proce
*/
typedef FormData_pg_proc *Form_pg_proc;
+DECLARE_TOAST(pg_proc, 2836, 2837);
+
#ifdef EXPOSE_TO_CLIENT_CODE
/*
index 7477ce49ccba2ec6c4224405e093c620eaeeadf5..fb07116adaf2dbf1db777cacc902e4d93bd5cb5d 100644 (file)
@@ -54,4 +54,8 @@ CATALOG(pg_replication_origin,6000,ReplicationOriginRelationId) BKI_SHARED_RELAT
typedef FormData_pg_replication_origin *Form_pg_replication_origin;
+DECLARE_TOAST(pg_replication_origin, 4181, 4182);
+#define PgReplicationOriginToastTable 4181
+#define PgReplicationOriginToastIndex 4182
+
#endif /* PG_REPLICATION_ORIGIN_H */
index 4369fc87c671cf7098ba9c928b9954eef67a9dac..cba92d95cc8ba11e8aab549a72e729b93b359cfa 100644 (file)
@@ -51,4 +51,6 @@ CATALOG(pg_rewrite,2618,RewriteRelationId)
*/
typedef FormData_pg_rewrite *Form_pg_rewrite;
+DECLARE_TOAST(pg_rewrite, 2838, 2839);
+
#endif /* PG_REWRITE_H */
index 07d4bff119eddaa0a914812e237caa8accec7f55..b92118cb6701fd1e9813ebec1a350e631a01823c 100644 (file)
@@ -37,4 +37,6 @@ CATALOG(pg_seclabel,3596,SecLabelRelationId)
#endif
} FormData_pg_seclabel;
+DECLARE_TOAST(pg_seclabel, 3598, 3599);
+
#endif /* PG_SECLABEL_H */
index a8238aa7933a86c9ec8a088a7fba5d52a4c73030..ba8f4f795b08f3641513aed250dba27be53176ea 100644 (file)
@@ -55,4 +55,8 @@ CATALOG(pg_shdescription,2396,SharedDescriptionRelationId) BKI_SHARED_RELATION
*/
typedef FormData_pg_shdescription * Form_pg_shdescription;
+DECLARE_TOAST(pg_shdescription, 2846, 2847);
+#define PgShdescriptionToastTable 2846
+#define PgShdescriptionToastIndex 2847
+
#endif /* PG_SHDESCRIPTION_H */
index 331e0664485f70f52a223de19bbe9440f1c2e1f3..7dae0d8b2a31ab5d81df8275c0e3f947f51498ec 100644 (file)
@@ -38,4 +38,8 @@ CATALOG(pg_shseclabel,3592,SharedSecLabelRelationId) BKI_SHARED_RELATION BKI_ROW
typedef FormData_pg_shseclabel * Form_pg_shseclabel;
+DECLARE_TOAST(pg_shseclabel, 4060, 4061);
+#define PgShseclabelToastTable 4060
+#define PgShseclabelToastIndex 4061
+
#endif /* PG_SHSECLABEL_H */
index 40a7260165eca8403e472d53a5a708994f97ac81..262ab7be7fe4b5ddbf5955935ac977c59d309ef8 100644 (file)
@@ -133,6 +133,8 @@ CATALOG(pg_statistic,2619,StatisticRelationId)
*/
typedef FormData_pg_statistic *Form_pg_statistic;
+DECLARE_TOAST(pg_statistic, 2840, 2841);
+
#ifdef EXPOSE_TO_CLIENT_CODE
/*
index 8747903fc735acbc29f99ae61d180a9d12fad2c3..346482b16fff06a4ad409a7f3831a82b172f14e3 100644 (file)
@@ -63,6 +63,8 @@ CATALOG(pg_statistic_ext,3381,StatisticExtRelationId)
*/
typedef FormData_pg_statistic_ext *Form_pg_statistic_ext;
+DECLARE_TOAST(pg_statistic_ext, 3439, 3440);
+
#ifdef EXPOSE_TO_CLIENT_CODE
#define STATS_EXT_NDISTINCT 'd'
index 0ef4ecb64a653339fb07bd5b1413e1542c3a4245..a92ef85fb7d040142c2f5cb7bbd10fd5f88c9ed6 100644 (file)
@@ -49,4 +49,6 @@ CATALOG(pg_statistic_ext_data,3429,StatisticExtDataRelationId)
*/
typedef FormData_pg_statistic_ext_data * Form_pg_statistic_ext_data;
+DECLARE_TOAST(pg_statistic_ext_data, 3430, 3431);
+
#endif /* PG_STATISTIC_EXT_DATA_H */
index 9ebec7bf0bff03878e7064ba6f95a278cf3b7e91..c5fbc9e53578710dd31cf42a981101154d2cc303 100644 (file)
@@ -70,6 +70,10 @@ CATALOG(pg_subscription,6100,SubscriptionRelationId) BKI_SHARED_RELATION BKI_ROW
typedef FormData_pg_subscription *Form_pg_subscription;
+DECLARE_TOAST(pg_subscription, 4183, 4184);
+#define PgSubscriptionToastTable 4183
+#define PgSubscriptionToastIndex 4184
+
typedef struct Subscription
{
Oid oid; /* Oid of the subscription */
index 1daf2dd9c207bd04d0c28b2247e527fa886be102..22f294ed6fbf61e929b888c6aca28b5dc727cffc 100644 (file)
@@ -45,4 +45,8 @@ CATALOG(pg_tablespace,1213,TableSpaceRelationId) BKI_SHARED_RELATION
*/
typedef FormData_pg_tablespace *Form_pg_tablespace;
+DECLARE_TOAST(pg_tablespace, 4185, 4186);
+#define PgTablespaceToastTable 4185
+#define PgTablespaceToastIndex 4186
+
#endif /* PG_TABLESPACE_H */
index fa5761b784599cc2cb9670a2f5b825afd3b4ff92..078fd0641cee5be4c3ac759b83c26276ce4e07e7 100644 (file)
@@ -72,6 +72,8 @@ CATALOG(pg_trigger,2620,TriggerRelationId)
*/
typedef FormData_pg_trigger *Form_pg_trigger;
+DECLARE_TOAST(pg_trigger, 2336, 2337);
+
#ifdef EXPOSE_TO_CLIENT_CODE
/* Bits within tgtype */
index 38128a313feca0014b2ccae2423985dd7529185d..1b7cc308288e5729485a0e3b620530d922a0e526 100644 (file)
@@ -51,4 +51,6 @@ CATALOG(pg_ts_dict,3600,TSDictionaryRelationId)
typedef FormData_pg_ts_dict *Form_pg_ts_dict;
+DECLARE_TOAST(pg_ts_dict, 4169, 4170);
+
#endif /* PG_TS_DICT_H */
index d228efffc9b320de9e9911abeba55e9a14277ca5..f515531521282713bd89838b85b451848209266b 100644 (file)
@@ -254,6 +254,8 @@ CATALOG(pg_type,1247,TypeRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(71,TypeRelati
*/
typedef FormData_pg_type *Form_pg_type;
+DECLARE_TOAST(pg_type, 4171, 4172);
+
#ifdef EXPOSE_TO_CLIENT_CODE
/*
index f5ccdb857a7f0298ce9c805aac1e8947748c7dec..65558e3333d5aaa084548121a64ce21af8832adb 100644 (file)
@@ -45,4 +45,6 @@ CATALOG(pg_user_mapping,1418,UserMappingRelationId)
*/
typedef FormData_pg_user_mapping *Form_pg_user_mapping;
+DECLARE_TOAST(pg_user_mapping, 4173, 4174);
+
#endif /* PG_USER_MAPPING_H */
index 690869d404a4701afb9d3bfc0cdd5ed56255d7a7..ee6409b57f69821223bbbf2e9f61312f3a61f803 100755 (executable)
@@ -61,7 +61,7 @@ if ($output_path ne '' && substr($output_path, -1) ne '/')
}
# Collect all the existing assigned OIDs (including those to be remapped).
-my @header_files = (glob("pg_*.h"), qw(indexing.h toasting.h));
+my @header_files = (glob("pg_*.h"), qw(indexing.h));
my $oids = Catalog::FindAllOidsFromHeaders(@header_files);
# Hash-ify the existing OIDs for convenient lookup.
}
}
- # In indexing.h and toasting.h only, check for #define SYM nnnn,
+ # In indexing.h only, check for #define SYM nnnn,
# and replace if within mapped range.
elsif ($line =~ m/^(\s*#\s*define\s+\w+\s+)(\d+)\b/)
{
index e320d822039b28305e27be62afe63e9668bdc881..a80c620c5b191552633f52a24a8bb521c1acdfb7 100644 (file)
* toasting.h
* This file provides some definitions to support creation of toast tables
*
- * Caution: all #define's with numeric values in this file had better be
- * object OIDs, else renumber_oids.pl might change them inappropriately.
- *
*
* Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
@@ -30,76 +27,4 @@ extern void AlterTableCreateToastTable(Oid relOid, Datum reloptions,
extern void BootstrapToastTable(char *relName,
Oid toastOid, Oid toastIndexOid);
-
-/*
- * This macro is just to keep the C compiler from spitting up on the
- * upcoming commands for Catalog.pm.
- */
-#define DECLARE_TOAST(name,toastoid,indexoid) extern int no_such_variable
-
-
-/*
- * What follows are lines 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.
- */
-
-/* normal catalogs */
-DECLARE_TOAST(pg_aggregate, 4159, 4160);
-DECLARE_TOAST(pg_attrdef, 2830, 2831);
-DECLARE_TOAST(pg_constraint, 2832, 2833);
-DECLARE_TOAST(pg_default_acl, 4143, 4144);
-DECLARE_TOAST(pg_depend, 8888, 8889);
-DECLARE_TOAST(pg_description, 2834, 2835);
-DECLARE_TOAST(pg_event_trigger, 4145, 4146);
-DECLARE_TOAST(pg_extension, 4147, 4148);
-DECLARE_TOAST(pg_foreign_data_wrapper, 4149, 4150);
-DECLARE_TOAST(pg_foreign_server, 4151, 4152);
-DECLARE_TOAST(pg_foreign_table, 4153, 4154);
-DECLARE_TOAST(pg_init_privs, 4155, 4156);
-DECLARE_TOAST(pg_language, 4157, 4158);
-DECLARE_TOAST(pg_namespace, 4163, 4164);
-DECLARE_TOAST(pg_partitioned_table, 4165, 4166);
-DECLARE_TOAST(pg_policy, 4167, 4168);
-DECLARE_TOAST(pg_proc, 2836, 2837);
-DECLARE_TOAST(pg_rewrite, 2838, 2839);
-DECLARE_TOAST(pg_seclabel, 3598, 3599);
-DECLARE_TOAST(pg_statistic, 2840, 2841);
-DECLARE_TOAST(pg_statistic_ext, 3439, 3440);
-DECLARE_TOAST(pg_statistic_ext_data, 3430, 3431);
-DECLARE_TOAST(pg_trigger, 2336, 2337);
-DECLARE_TOAST(pg_ts_dict, 4169, 4170);
-DECLARE_TOAST(pg_type, 4171, 4172);
-DECLARE_TOAST(pg_user_mapping, 4173, 4174);
-
-/* shared catalogs */
-DECLARE_TOAST(pg_authid, 4175, 4176);
-#define PgAuthidToastTable 4175
-#define PgAuthidToastIndex 4176
-DECLARE_TOAST(pg_database, 4177, 4178);
-#define PgDatabaseToastTable 4177
-#define PgDatabaseToastIndex 4178
-DECLARE_TOAST(pg_db_role_setting, 2966, 2967);
-#define PgDbRoleSettingToastTable 2966
-#define PgDbRoleSettingToastIndex 2967
-DECLARE_TOAST(pg_replication_origin, 4181, 4182);
-#define PgReplicationOriginToastTable 4181
-#define PgReplicationOriginToastIndex 4182
-DECLARE_TOAST(pg_shdescription, 2846, 2847);
-#define PgShdescriptionToastTable 2846
-#define PgShdescriptionToastIndex 2847
-DECLARE_TOAST(pg_shseclabel, 4060, 4061);
-#define PgShseclabelToastTable 4060
-#define PgShseclabelToastIndex 4061
-DECLARE_TOAST(pg_subscription, 4183, 4184);
-#define PgSubscriptionToastTable 4183
-#define PgSubscriptionToastIndex 4184
-DECLARE_TOAST(pg_tablespace, 4185, 4186);
-#define PgTablespaceToastTable 4185
-#define PgTablespaceToastIndex 4186
-
#endif /* TOASTING_H */
index 83adbd577497ccfc8087b512060c4ce27074ef95..d120703f4acbcd811c7293ebefb2abf9bc2e9e40 100755 (executable)
@@ -28,7 +28,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);
index bc8904732f017b335ae15e97d8949ee38897819d..fb738e90e1c2092687acb35a4eb881bf51e337a9 100644 (file)
$mf =~ /^CATALOG_HEADERS\s*:?=(.*)$/gm
|| croak "Could not find CATALOG_HEADERS in Makefile\n";
my @bki_srcs = split /\s+/, 1ドル;
- push @bki_srcs, 'toasting.h';
push @bki_srcs, 'indexing.h';
$mf =~ /^POSTGRES_BKI_DATA\s*:?=[^,]+,(.*)\)$/gm
|| croak "Could not find POSTGRES_BKI_DATA in Makefile\n";