Reduce the range of OIDs reserved for genbki.pl.

Commit ab596105b increased FirstBootstrapObjectId from 12000 to 13000,
but we've had some push-back about that.  It's worrisome to reduce the
daylight between there and FirstNormalObjectId, because the number of
OIDs consumed during initdb for collation objects is hard to predict.

We can improve the situation by abandoning the assumption that these
OIDs must be globally unique.  It should be sufficient for them to be
unique per-catalog.  (Any code that's unhappy about that is broken
anyway, since no more than per-catalog uniqueness can be guaranteed
once the OID counter wraps around.)  With that change, the largest OID
assigned during genbki.pl (starting from a base of 10000) is a bit
under 11000.  This allows reverting FirstBootstrapObjectId to 12000
with reasonable confidence that that will be sufficient for many years
to come.

We are not, at this time, abandoning the expectation that
hand-assigned OIDs (below 10000) are globally unique.  Someday that'll
likely be necessary, but the need seems years away still.

This is late for v14, but it seems worth doing it now so that
downstream software doesn't have to deal with the consequences of
a change in FirstBootstrapObjectId.  In any case, we already
bought into forcing an initdb for beta2, so another catversion
bump won't hurt.

Discussion: https://postgr.es/m/1665197.1622065382@sss.pgh.pa.us

diff --git a/doc/src/sgml/bki.sgml b/doc/src/sgml/bki.sgml
index b33e59d5e42c5289f9bc68bb01bc540efcd07e28..db1b3d5e9a028a435c17cce252a14f4a54f0c2ff 100644 (file)
--- a/doc/src/sgml/bki.sgml
+++ b/doc/src/sgml/bki.sgml
@@ -418,11 +418,11 @@
    
     If genbki.pl needs to assign an OID to a catalog
     entry that does not have a manually-assigned OID, it will use a value in
-    the range 10000—12999.  The server's OID counter is set to 13000
+    the range 10000—11999.  The server's OID counter is set to 12000
     at the start of a bootstrap run.  Thus objects created by regular SQL
     commands during the later phases of bootstrap, such as objects created
     while running the information_schema.sql script,
-    receive OIDs of 13000 or above.
+    receive OIDs of 12000 or above.
    
 
    

diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index f893ae4f4532885d96369b7812371d146c512147..81363a0710dcdf7bc86f9426178ac65f1d52dbae 100644 (file)
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -167,15 +167,17 @@ foreach my $oid (keys %oidcounts)
 die "found $found duplicate OID(s) in catalog data\n" if $found;
 
 
-# Oids not specified in the input files are automatically assigned,
+# OIDs not specified in the input files are automatically assigned,
 # starting at FirstGenbkiObjectId, extending up to FirstBootstrapObjectId.
+# We allow such OIDs to be assigned independently within each catalog.
 my $FirstGenbkiObjectId =
   Catalog::FindDefinedSymbol('access/transam.h', $include_path,
    'FirstGenbkiObjectId');
 my $FirstBootstrapObjectId =
   Catalog::FindDefinedSymbol('access/transam.h', $include_path,
    'FirstBootstrapObjectId');
-my $GenbkiNextOid = $FirstGenbkiObjectId;
+# Hash of next available OID, indexed by catalog name.
+my %GenbkiNextOids;
 
 
 # Fetch some special data that we will substitute into the output file.
@@ -563,8 +565,7 @@ EOM
            # Assign oid if oid column exists and no explicit assignment in row
            if ($attname eq "oid" and not defined $bki_values{$attname})
            {
-               $bki_values{$attname} = $GenbkiNextOid;
-               $GenbkiNextOid++;
+               $bki_values{$attname} = assign_next_oid($catname);
            }
 
            # Replace OID synonyms with OIDs per the appropriate lookup rule.
@@ -669,11 +670,6 @@ foreach my $declaration (@index_decls)
 # last command in the BKI file: build the indexes declared above
 print $bki "build indices\n";
 
-# check that we didn't overrun available OIDs
-die
-  "genbki OID counter reached $GenbkiNextOid, overrunning FirstBootstrapObjectId\n"
-  if $GenbkiNextOid > $FirstBootstrapObjectId;
-
 # Now generate system_constraints.sql
 
 foreach my $c (@system_constraints)
@@ -1079,6 +1075,25 @@ sub form_pg_type_symbol
    return $name . $arraystr . 'OID';
 }
 
+# Assign an unused OID within the specified catalog.
+sub assign_next_oid
+{
+   my $catname = shift;
+
+   # Initialize, if no previous request for this catalog.
+   $GenbkiNextOids{$catname} = $FirstGenbkiObjectId
+     if !defined($GenbkiNextOids{$catname});
+
+   my $result = $GenbkiNextOids{$catname}++;
+
+   # Check that we didn't overrun available OIDs
+   die
+     "genbki OID counter for $catname reached $result, overrunning FirstBootstrapObjectId\n"
+     if $result >= $FirstBootstrapObjectId;
+
+   return $result;
+}
+
 sub usage
 {
    die <


diff --git a/src/include/access/transam.h b/src/include/access/transam.h

index 05c6fbffe44a695e1d8bafe418eee5b8dec73b66..2fe8a59110523a6ce4cd40d4f3109e177ecc6766 100644 (file)

--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -161,18 +161,20 @@ FullTransactionIdAdvance(FullTransactionId *dest)
  *     development purposes (such as in-progress patches and forks);
  *     they should not appear in released versions.
  *
- *     OIDs 10000-12999 are reserved for assignment by genbki.pl, for use
+ *     OIDs 10000-11999 are reserved for assignment by genbki.pl, for use
  *     when the .dat files in src/include/catalog/ do not specify an OID
- *     for a catalog entry that requires one.
+ *     for a catalog entry that requires one.  Note that genbki.pl assigns
+ *     these OIDs independently in each catalog, so they're not guaranteed
+ *     to be globally unique.
  *
- *     OIDS 13000-16383 are reserved for assignment during initdb
- *     using the OID generator.  (We start the generator at 13000.)
+ *     OIDS 12000-16383 are reserved for assignment during initdb
+ *     using the OID generator.  (We start the generator at 12000.)
  *
  *     OIDs beginning at 16384 are assigned from the OID generator
  *     during normal multiuser operation.  (We force the generator up to
  *     16384 as soon as we are in normal operation.)
  *
- * The choices of 8000, 10000 and 13000 are completely arbitrary, and can be
+ * The choices of 8000, 10000 and 12000 are completely arbitrary, and can be
  * moved if we run low on OIDs in any category.  Changing the macros below,
  * and updating relevant documentation (see bki.sgml and RELEASE_CHANGES),
  * should be sufficient to do this.  Moving the 16384 boundary between
@@ -186,7 +188,7 @@ FullTransactionIdAdvance(FullTransactionId *dest)
  * ----------
  */
 #define FirstGenbkiObjectId        10000
-#define FirstBootstrapObjectId 13000
+#define FirstBootstrapObjectId 12000
 #define FirstNormalObjectId        16384
 
 /*


diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h

index 9fe49fa2911d6841906650ed35aa4fe90320e428..1fa30abb2986d02a97a66641fb8038265ca645a7 100644 (file)

--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                         yyyymmddN */
-#define CATALOG_VERSION_NO 202105271
+#define CATALOG_VERSION_NO 202105272
 
 #endif

diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 05c6fbffe44a695e1d8bafe418eee5b8dec73b66..2fe8a59110523a6ce4cd40d4f3109e177ecc6766 100644 (file)
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -161,18 +161,20 @@ FullTransactionIdAdvance(FullTransactionId *dest)
  *     development purposes (such as in-progress patches and forks);
  *     they should not appear in released versions.
  *
- *     OIDs 10000-12999 are reserved for assignment by genbki.pl, for use
+ *     OIDs 10000-11999 are reserved for assignment by genbki.pl, for use
  *     when the .dat files in src/include/catalog/ do not specify an OID
- *     for a catalog entry that requires one.
+ *     for a catalog entry that requires one.  Note that genbki.pl assigns
+ *     these OIDs independently in each catalog, so they're not guaranteed
+ *     to be globally unique.
  *
- *     OIDS 13000-16383 are reserved for assignment during initdb
- *     using the OID generator.  (We start the generator at 13000.)
+ *     OIDS 12000-16383 are reserved for assignment during initdb
+ *     using the OID generator.  (We start the generator at 12000.)
  *
  *     OIDs beginning at 16384 are assigned from the OID generator
  *     during normal multiuser operation.  (We force the generator up to
  *     16384 as soon as we are in normal operation.)
  *
- * The choices of 8000, 10000 and 13000 are completely arbitrary, and can be
+ * The choices of 8000, 10000 and 12000 are completely arbitrary, and can be
  * moved if we run low on OIDs in any category.  Changing the macros below,
  * and updating relevant documentation (see bki.sgml and RELEASE_CHANGES),
  * should be sufficient to do this.  Moving the 16384 boundary between
@@ -186,7 +188,7 @@ FullTransactionIdAdvance(FullTransactionId *dest)
  * ----------
  */
 #define FirstGenbkiObjectId        10000
-#define FirstBootstrapObjectId 13000
+#define FirstBootstrapObjectId 12000
 #define FirstNormalObjectId        16384
 
 /*

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 9fe49fa2911d6841906650ed35aa4fe90320e428..1fa30abb2986d02a97a66641fb8038265ca645a7 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                         yyyymmddN */
-#define CATALOG_VERSION_NO 202105271
+#define CATALOG_VERSION_NO 202105272
 
 #endif