Do pre-release housekeeping on catalog data.

Run renumber_oids.pl to move high-numbered OIDs down, as per pre-beta
tasks specified by RELEASE_CHANGES.  For reference, the command was

./renumber_oids.pl --first-mapped-oid 8000 --target-oid 6300

This should have been done prior to beta1, but it was forgotten. This
will ensure we get the correct numbering for beta2 onward.

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index d63db42ed7b37d490133883f7d8d3d743a06e1c7..479629825f5b7683442c7e4c9bcc98a561d3949e 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -57,6 +57,6 @@
  */
 
 /*                         yyyymmddN */
-#define CATALOG_VERSION_NO 202506251
+#define CATALOG_VERSION_NO 202506291
 
 #endif

diff --git a/src/include/catalog/pg_authid.dat b/src/include/catalog/pg_authid.dat
index eb4dab5c6aa77ec7a21b3a62c2b2113b733be5fc..c881c13adf1bcc403a1db645f0d6c2a05293ef46 100644 (file)
--- a/src/include/catalog/pg_authid.dat
+++ b/src/include/catalog/pg_authid.dat
@@ -99,7 +99,7 @@
   rolcreaterole => 'f', rolcreatedb => 'f', rolcanlogin => 'f',
   rolreplication => 'f', rolbypassrls => 'f', rolconnlimit => '-1',
   rolpassword => '_null_', rolvaliduntil => '_null_' },
-{ oid => '8916', oid_symbol => 'ROLE_PG_SIGNAL_AUTOVACUUM_WORKER',
+{ oid => '6392', oid_symbol => 'ROLE_PG_SIGNAL_AUTOVACUUM_WORKER',
   rolname => 'pg_signal_autovacuum_worker', rolsuper => 'f', rolinherit => 't',
   rolcreaterole => 'f', rolcreatedb => 'f', rolcanlogin => 'f',
   rolreplication => 'f', rolbypassrls => 'f', rolconnlimit => '-1',

diff --git a/src/include/catalog/pg_collation.dat b/src/include/catalog/pg_collation.dat
index d8b5d5d2d856b98691d47d8f46f088db1ab087af..8cfd09f03140e145493d68d8315899fc2178ed40 100644 (file)
--- a/src/include/catalog/pg_collation.dat
+++ b/src/include/catalog/pg_collation.dat
@@ -33,7 +33,7 @@
   descr => 'sorts by Unicode code point; Unicode and POSIX character semantics',
   collname => 'pg_c_utf8', collprovider => 'b', collencoding => '6',
   colllocale => 'C.UTF-8', collversion => '1' },
-{ oid => '9535',
+{ oid => '6411',
   descr => 'sorts by Unicode code point; Unicode character semantics',
   collname => 'pg_unicode_fast', collprovider => 'b', collencoding => '6',
   colllocale => 'PG_UNICODE_FAST', collversion => '1' },

diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index 4392b9d221d5a9e06e7f562bd4d2bf70d32644e1..731d3938169e6a05147af30d1189438e2aba6ca6 100644 (file)
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -69,7 +69,7 @@ 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_TOAST_WITH_MACRO(pg_index, 6351, 6352, 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/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index 4efc1bc499ab5bc7473437f290b35b87094eae74..fb4f7f50350adb41c152982f67732c8b048fe610 100644 (file)
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -1004,7 +1004,7 @@
 { oid => '3129', descr => 'sort support',
   proname => 'btint2sortsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btint2sortsupport' },
-{ oid => '9290', descr => 'skip support',
+{ oid => '6402', descr => 'skip support',
   proname => 'btint2skipsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btint2skipsupport' },
 { oid => '351', descr => 'less-equal-greater',
@@ -1013,7 +1013,7 @@
 { oid => '3130', descr => 'sort support',
   proname => 'btint4sortsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btint4sortsupport' },
-{ oid => '9291', descr => 'skip support',
+{ oid => '6403', descr => 'skip support',
   proname => 'btint4skipsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btint4skipsupport' },
 { oid => '842', descr => 'less-equal-greater',
@@ -1022,7 +1022,7 @@
 { oid => '3131', descr => 'sort support',
   proname => 'btint8sortsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btint8sortsupport' },
-{ oid => '9292', descr => 'skip support',
+{ oid => '6404', descr => 'skip support',
   proname => 'btint8skipsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btint8skipsupport' },
 { oid => '354', descr => 'less-equal-greater',
@@ -1043,7 +1043,7 @@
 { oid => '3134', descr => 'sort support',
   proname => 'btoidsortsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btoidsortsupport' },
-{ oid => '9293', descr => 'skip support',
+{ oid => '6405', descr => 'skip support',
   proname => 'btoidskipsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btoidskipsupport' },
 { oid => '404', descr => 'less-equal-greater',
@@ -1052,7 +1052,7 @@
 { oid => '358', descr => 'less-equal-greater',
   proname => 'btcharcmp', proleakproof => 't', prorettype => 'int4',
   proargtypes => 'char char', prosrc => 'btcharcmp' },
-{ oid => '9294', descr => 'skip support',
+{ oid => '6406', descr => 'skip support',
   proname => 'btcharskipsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btcharskipsupport' },
 { oid => '359', descr => 'less-equal-greater',
@@ -1180,22 +1180,22 @@
   proname => 'name', proleakproof => 't', prorettype => 'name',
   proargtypes => 'bpchar', prosrc => 'bpchar_name' },
 
-{ oid => '8577', descr => 'convert int2 to bytea',
+{ oid => '6367', descr => 'convert int2 to bytea',
   proname => 'bytea', proleakproof => 't', prorettype => 'bytea',
   proargtypes => 'int2', prosrc => 'int2_bytea' },
-{ oid => '8578', descr => 'convert int4 to bytea',
+{ oid => '6368', descr => 'convert int4 to bytea',
   proname => 'bytea', proleakproof => 't', prorettype => 'bytea',
   proargtypes => 'int4', prosrc => 'int4_bytea' },
-{ oid => '8579', descr => 'convert int8 to bytea',
+{ oid => '6369', descr => 'convert int8 to bytea',
   proname => 'bytea', proleakproof => 't', prorettype => 'bytea',
   proargtypes => 'int8', prosrc => 'int8_bytea' },
-{ oid => '8580', descr => 'convert bytea to int2',
+{ oid => '6370', descr => 'convert bytea to int2',
   proname => 'int2', prorettype => 'int2', proargtypes => 'bytea',
   prosrc => 'bytea_int2' },
-{ oid => '8581', descr => 'convert bytea to int4',
+{ oid => '6371', descr => 'convert bytea to int4',
   proname => 'int4', prorettype => 'int4', proargtypes => 'bytea',
   prosrc => 'bytea_int4' },
-{ oid => '8582', descr => 'convert bytea to int8',
+{ oid => '6372', descr => 'convert bytea to int8',
   proname => 'int8', prorettype => 'int8', proargtypes => 'bytea',
   prosrc => 'bytea_int8' },
 
@@ -1259,10 +1259,10 @@
 { oid => '772', descr => 'hash',
   proname => 'hashvarlenaextended', prorettype => 'int8',
   proargtypes => 'internal int8', prosrc => 'hashvarlenaextended' },
-{ oid => '9708', descr => 'hash',
+{ oid => '6413', descr => 'hash',
   proname => 'hashbytea', prorettype => 'int4', proargtypes => 'bytea',
   prosrc => 'hashbytea' },
-{ oid => '9709', descr => 'hash',
+{ oid => '6414', descr => 'hash',
   proname => 'hashbyteaextended', prorettype => 'int8',
   proargtypes => 'bytea int8', prosrc => 'hashbyteaextended' },
 { oid => '457', descr => 'hash',
@@ -1301,34 +1301,34 @@
 { oid => '781', descr => 'hash',
   proname => 'hashmacaddr8extended', prorettype => 'int8',
   proargtypes => 'macaddr8 int8', prosrc => 'hashmacaddr8extended' },
-{ oid => '9710', descr => 'hash',
+{ oid => '6415', descr => 'hash',
   proname => 'hashdate', prorettype => 'int4', proargtypes => 'date',
   prosrc => 'hashdate' },
-{ oid => '9711', descr => 'hash',
+{ oid => '6416', descr => 'hash',
   proname => 'hashdateextended', prorettype => 'int8',
   proargtypes => 'date int8', prosrc => 'hashdateextended' },
-{ oid => '9712', descr => 'hash',
+{ oid => '6417', descr => 'hash',
   proname => 'hashbool', prorettype => 'int4', proargtypes => 'bool',
   prosrc => 'hashbool' },
-{ oid => '9713', descr => 'hash',
+{ oid => '6418', descr => 'hash',
   proname => 'hashboolextended', prorettype => 'int8',
   proargtypes => 'bool int8', prosrc => 'hashboolextended' },
-{ oid => '9714', descr => 'hash',
+{ oid => '6419', descr => 'hash',
   proname => 'hashxid', prorettype => 'int4', proargtypes => 'xid',
   prosrc => 'hashxid' },
-{ oid => '9715', descr => 'hash',
+{ oid => '6420', descr => 'hash',
   proname => 'hashxidextended', prorettype => 'int8', proargtypes => 'xid int8',
   prosrc => 'hashxidextended' },
-{ oid => '9716', descr => 'hash',
+{ oid => '6421', descr => 'hash',
   proname => 'hashxid8', prorettype => 'int4', proargtypes => 'xid8',
   prosrc => 'hashxid8' },
-{ oid => '9717', descr => 'hash',
+{ oid => '6422', descr => 'hash',
   proname => 'hashxid8extended', prorettype => 'int8',
   proargtypes => 'xid8 int8', prosrc => 'hashxid8extended' },
-{ oid => '9718', descr => 'hash',
+{ oid => '6423', descr => 'hash',
   proname => 'hashcid', prorettype => 'int4', proargtypes => 'cid',
   prosrc => 'hashcid' },
-{ oid => '9719', descr => 'hash',
+{ oid => '6424', descr => 'hash',
   proname => 'hashcidextended', prorettype => 'int8', proargtypes => 'cid int8',
   prosrc => 'hashcidextended' },
 
@@ -1348,10 +1348,10 @@
   proname => 'text_smaller', proleakproof => 't', prorettype => 'text',
   proargtypes => 'text text', prosrc => 'text_smaller' },
 
-{ oid => '8920', descr => 'larger of two',
+{ oid => '6393', descr => 'larger of two',
   proname => 'bytea_larger', proleakproof => 't', prorettype => 'bytea',
   proargtypes => 'bytea bytea', prosrc => 'bytea_larger' },
-{ oid => '8921', descr => 'smaller of two',
+{ oid => '6394', descr => 'smaller of two',
   proname => 'bytea_smaller', proleakproof => 't', prorettype => 'bytea',
   proargtypes => 'bytea bytea', prosrc => 'bytea_smaller' },
 
@@ -1533,7 +1533,7 @@
 { oid => '6163', descr => 'number of set bits',
   proname => 'bit_count', prorettype => 'int8', proargtypes => 'bytea',
   prosrc => 'bytea_bit_count' },
-{ oid => '8694', descr => 'reverse bytea',
+{ oid => '6382', descr => 'reverse bytea',
   proname => 'reverse', prorettype => 'bytea', proargtypes => 'bytea',
   prosrc => 'bytea_reverse' },
 
@@ -1638,7 +1638,7 @@
   proname => 'array_append', prosupport => 'array_append_support',
   proisstrict => 'f', prorettype => 'anycompatiblearray',
   proargtypes => 'anycompatiblearray anycompatible', prosrc => 'array_append' },
-{ oid => '8680', descr => 'planner support for array_append',
+{ oid => '6378', descr => 'planner support for array_append',
   proname => 'array_append_support', prorettype => 'internal',
   proargtypes => 'internal', prosrc => 'array_append_support' },
 { oid => '379', descr => 'prepend element onto front of array',
@@ -1646,7 +1646,7 @@
   proisstrict => 'f', prorettype => 'anycompatiblearray',
   proargtypes => 'anycompatible anycompatiblearray',
   prosrc => 'array_prepend' },
-{ oid => '8681', descr => 'planner support for array_prepend',
+{ oid => '6379', descr => 'planner support for array_prepend',
   proname => 'array_prepend_support', prorettype => 'internal',
   proargtypes => 'internal', prosrc => 'array_prepend_support' },
 { oid => '383',
@@ -1784,17 +1784,17 @@
 { oid => '6216', descr => 'take samples from array',
   proname => 'array_sample', provolatile => 'v', prorettype => 'anyarray',
   proargtypes => 'anyarray int4', prosrc => 'array_sample' },
-{ oid => '8686', descr => 'reverse array',
+{ oid => '6381', descr => 'reverse array',
   proname => 'array_reverse', prorettype => 'anyarray',
   proargtypes => 'anyarray', prosrc => 'array_reverse' },
-{ oid => '8810', descr => 'sort array',
+{ oid => '6388', descr => 'sort array',
   proname => 'array_sort', prorettype => 'anyarray', proargtypes => 'anyarray',
   prosrc => 'array_sort' },
-{ oid => '8811', descr => 'sort array',
+{ oid => '6389', descr => 'sort array',
   proname => 'array_sort', prorettype => 'anyarray',
   proargtypes => 'anyarray bool', proargnames => '{array,descending}',
   prosrc => 'array_sort_order' },
-{ oid => '8812', descr => 'sort array',
+{ oid => '6390', descr => 'sort array',
   proname => 'array_sort', prorettype => 'anyarray',
   proargtypes => 'anyarray bool bool',
   proargnames => '{array,descending,nulls_first}',
@@ -2315,7 +2315,7 @@
 { oid => '3136', descr => 'sort support',
   proname => 'date_sortsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'date_sortsupport' },
-{ oid => '9295', descr => 'skip support',
+{ oid => '6407', descr => 'skip support',
   proname => 'date_skipsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'date_skipsupport' },
 { oid => '4133', descr => 'window RANGE support',
@@ -3433,7 +3433,7 @@
   proname => 'pg_sequence_last_value', provolatile => 'v', proparallel => 'u',
   prorettype => 'int8', proargtypes => 'regclass',
   prosrc => 'pg_sequence_last_value' },
-{ oid => '9876', descr => 'return sequence tuple, for use by pg_dump',
+{ oid => '6427', descr => 'return sequence tuple, for use by pg_dump',
   proname => 'pg_get_sequence_data', provolatile => 'v', proparallel => 'u',
   prorettype => 'record', proargtypes => 'regclass',
   proallargtypes => '{regclass,int8,bool}', proargmodes => '{i,o,o}',
@@ -3594,10 +3594,10 @@
   proname => 'erfc', prorettype => 'float8', proargtypes => 'float8',
   prosrc => 'derfc' },
 
-{ oid => '8702', descr => 'gamma function',
+{ oid => '6383', descr => 'gamma function',
   proname => 'gamma', prorettype => 'float8', proargtypes => 'float8',
   prosrc => 'dgamma' },
-{ oid => '8703',
+{ oid => '6384',
   descr => 'natural logarithm of absolute value of gamma function',
   proname => 'lgamma', prorettype => 'float8', proargtypes => 'float8',
   prosrc => 'dlgamma' },
@@ -3689,7 +3689,7 @@
 { oid => '872', descr => 'capitalize each word',
   proname => 'initcap', prorettype => 'text', proargtypes => 'text',
   prosrc => 'initcap' },
-{ oid => '9569', descr => 'fold case',
+{ oid => '6412', descr => 'fold case',
   proname => 'casefold', prorettype => 'text', proargtypes => 'text',
   prosrc => 'casefold' },
 { oid => '873', descr => 'left-pad string to length',
@@ -4516,7 +4516,7 @@
 { oid => '1693', descr => 'less-equal-greater',
   proname => 'btboolcmp', proleakproof => 't', prorettype => 'int4',
   proargtypes => 'bool bool', prosrc => 'btboolcmp' },
-{ oid => '9296', descr => 'skip support',
+{ oid => '6408', descr => 'skip support',
   proname => 'btboolskipsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'btboolskipsupport' },
 
@@ -5451,17 +5451,17 @@
   prorettype => 'bool', proargtypes => 'oid text',
   prosrc => 'has_any_column_privilege_id' },
 
-{ oid => '8048',
+{ oid => '6348',
   descr => 'user privilege on large object by username, large object oid',
   proname => 'has_largeobject_privilege', procost => '10', provolatile => 's',
   prorettype => 'bool', proargtypes => 'name oid text',
   prosrc => 'has_largeobject_privilege_name_id' },
-{ oid => '8049',
+{ oid => '6349',
   descr => 'current user privilege on large object by large object oid',
   proname => 'has_largeobject_privilege', procost => '10', provolatile => 's',
   prorettype => 'bool', proargtypes => 'oid text',
   prosrc => 'has_largeobject_privilege_id' },
-{ oid => '8050',
+{ oid => '6350',
   descr => 'user privilege on large object by user oid, large object oid',
   proname => 'has_largeobject_privilege', procost => '10', provolatile => 's',
   prorettype => 'bool', proargtypes => 'oid oid text',
@@ -5612,19 +5612,19 @@
   proname => 'pg_stat_get_autoanalyze_count', provolatile => 's',
   proparallel => 'r', prorettype => 'int8', proargtypes => 'oid',
   prosrc => 'pg_stat_get_autoanalyze_count' },
-{ oid => '8406', descr => 'total vacuum time, in milliseconds',
+{ oid => '6358', descr => 'total vacuum time, in milliseconds',
   proname => 'pg_stat_get_total_vacuum_time', provolatile => 's',
   proparallel => 'r', prorettype => 'float8', proargtypes => 'oid',
   prosrc => 'pg_stat_get_total_vacuum_time' },
-{ oid => '8407', descr => 'total autovacuum time, in milliseconds',
+{ oid => '6359', descr => 'total autovacuum time, in milliseconds',
   proname => 'pg_stat_get_total_autovacuum_time', provolatile => 's',
   proparallel => 'r', prorettype => 'float8', proargtypes => 'oid',
   prosrc => 'pg_stat_get_total_autovacuum_time' },
-{ oid => '8408', descr => 'total analyze time, in milliseconds',
+{ oid => '6360', descr => 'total analyze time, in milliseconds',
   proname => 'pg_stat_get_total_analyze_time', provolatile => 's',
   proparallel => 'r', prorettype => 'float8', proargtypes => 'oid',
   prosrc => 'pg_stat_get_total_analyze_time' },
-{ oid => '8409', descr => 'total autoanalyze time, in milliseconds',
+{ oid => '6361', descr => 'total autoanalyze time, in milliseconds',
   proname => 'pg_stat_get_total_autoanalyze_time', provolatile => 's',
   proparallel => 'r', prorettype => 'float8', proargtypes => 'oid',
   prosrc => 'pg_stat_get_total_autoanalyze_time' },
@@ -5901,12 +5901,12 @@
   proname => 'pg_stat_get_db_sessions_killed', provolatile => 's',
   proparallel => 'r', prorettype => 'int8', proargtypes => 'oid',
   prosrc => 'pg_stat_get_db_sessions_killed' },
-{ oid => '8403',
+{ oid => '6355',
   descr => 'statistics: number of parallel workers planned to be launched by queries',
   proname => 'pg_stat_get_db_parallel_workers_to_launch', provolatile => 's',
   proparallel => 'r', prorettype => 'int8', proargtypes => 'oid',
   prosrc => 'pg_stat_get_db_parallel_workers_to_launch' },
-{ oid => '8404',
+{ oid => '6356',
   descr => 'statistics: number of parallel workers effectively launched by queries',
   proname => 'pg_stat_get_db_parallel_workers_launched', provolatile => 's',
   proparallel => 'r', prorettype => 'int8', proargtypes => 'oid',
@@ -5928,7 +5928,7 @@
   proname => 'pg_stat_get_checkpointer_num_requested', provolatile => 's',
   proparallel => 'r', prorettype => 'int8', proargtypes => '',
   prosrc => 'pg_stat_get_checkpointer_num_requested' },
-{ oid => '8599',
+{ oid => '6377',
   descr => 'statistics: number of checkpoints performed by the checkpointer',
   proname => 'pg_stat_get_checkpointer_num_performed', provolatile => 's',
   proparallel => 'r', prorettype => 'int8', proargtypes => '',
@@ -5955,7 +5955,7 @@
   proname => 'pg_stat_get_checkpointer_buffers_written', provolatile => 's',
   proparallel => 'r', prorettype => 'int8', proargtypes => '',
   prosrc => 'pg_stat_get_checkpointer_buffers_written' },
-{ oid => '8573',
+{ oid => '6366',
   descr => 'statistics: number of SLRU buffers written during checkpoints and restartpoints',
   proname => 'pg_stat_get_checkpointer_slru_written', provolatile => 's',
   proparallel => 'r', prorettype => 'int8', proargtypes => '',
@@ -6001,7 +6001,7 @@
   proargnames => '{backend_type,object,context,reads,read_bytes,read_time,writes,write_bytes,write_time,writebacks,writeback_time,extends,extend_bytes,extend_time,hits,evictions,reuses,fsyncs,fsync_time,stats_reset}',
   prosrc => 'pg_stat_get_io' },
 
-{ oid => '8806', descr => 'statistics: backend IO statistics',
+{ oid => '6386', descr => 'statistics: backend IO statistics',
   proname => 'pg_stat_get_backend_io', prorows => '5', proretset => 't',
   provolatile => 'v', proparallel => 'r', prorettype => 'record',
   proargtypes => 'int4',
@@ -6017,7 +6017,7 @@
   proargmodes => '{o,o,o,o,o}',
   proargnames => '{wal_records,wal_fpi,wal_bytes,wal_buffers_full,stats_reset}',
   prosrc => 'pg_stat_get_wal' },
-{ oid => '8037', descr => 'statistics: backend WAL activity',
+{ oid => '6313', descr => 'statistics: backend WAL activity',
   proname => 'pg_stat_get_backend_wal', provolatile => 'v', proparallel => 'r',
   prorettype => 'record', proargtypes => 'int4',
   proallargtypes => '{int4,int8,int8,numeric,int8,timestamptz}',
@@ -6156,7 +6156,7 @@
   proname => 'pg_stat_reset_single_function_counters', provolatile => 'v',
   prorettype => 'void', proargtypes => 'oid',
   prosrc => 'pg_stat_reset_single_function_counters' },
-{ oid => '8807', descr => 'statistics: reset statistics for a single backend',
+{ oid => '6387', descr => 'statistics: reset statistics for a single backend',
   proname => 'pg_stat_reset_backend_stats', provolatile => 'v',
   prorettype => 'void', proargtypes => 'int4',
   prosrc => 'pg_stat_reset_backend_stats' },
@@ -6370,10 +6370,10 @@
 { oid => '3411', descr => 'hash',
   proname => 'timestamp_hash_extended', prorettype => 'int8',
   proargtypes => 'timestamp int8', prosrc => 'timestamp_hash_extended' },
-{ oid => '9720', descr => 'hash',
+{ oid => '6425', descr => 'hash',
   proname => 'timestamptz_hash', prorettype => 'int4',
   proargtypes => 'timestamptz', prosrc => 'timestamptz_hash' },
-{ oid => '9721', descr => 'hash',
+{ oid => '6426', descr => 'hash',
   proname => 'timestamptz_hash_extended', prorettype => 'int8',
   proargtypes => 'timestamptz int8', prosrc => 'timestamptz_hash_extended' },
 { oid => '2041', descr => 'intervals overlap?',
@@ -6398,7 +6398,7 @@
 { oid => '3137', descr => 'sort support',
   proname => 'timestamp_sortsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'timestamp_sortsupport' },
-{ oid => '9297', descr => 'skip support',
+{ oid => '6409', descr => 'skip support',
   proname => 'timestamp_skipsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'timestamp_skipsupport' },
 
@@ -6594,7 +6594,7 @@
   proname => 'pg_describe_object', provolatile => 's', prorettype => 'text',
   proargtypes => 'oid oid int4', prosrc => 'pg_describe_object' },
 
-{ oid => '8730', descr => 'get ACL for SQL object',
+{ oid => '6385', descr => 'get ACL for SQL object',
   proname => 'pg_get_acl', provolatile => 's', prorettype => '_aclitem',
   proargtypes => 'oid oid int4', proargnames => '{classid,objid,objsubid}',
   prosrc => 'pg_get_acl' },
@@ -6793,7 +6793,7 @@
   proargnames => '{rm_id, rm_name, rm_builtin}',
   prosrc => 'pg_get_wal_resource_managers' },
 
-{ oid => '8303', descr => 'get info about loaded modules',
+{ oid => '6353', descr => 'get info about loaded modules',
   proname => 'pg_get_loaded_modules', prorows => '10', proretset => 't',
   provolatile => 'v', proparallel => 'r', prorettype => 'record',
   proargtypes => '', proallargtypes => '{text,text,text}',
@@ -6993,7 +6993,7 @@
   proname => 'max', prokind => 'a', proisstrict => 'f',
   prorettype => 'anyarray', proargtypes => 'anyarray',
   prosrc => 'aggregate_dummy' },
-{ oid => '8595', descr => 'maximum value of all record input values',
+{ oid => '6373', descr => 'maximum value of all record input values',
   proname => 'max', prokind => 'a', proisstrict => 'f', prorettype => 'record',
   proargtypes => 'record', prosrc => 'aggregate_dummy' },
 { oid => '2244', descr => 'maximum value of all bpchar input values',
@@ -7011,7 +7011,7 @@
 { oid => '5099', descr => 'maximum value of all xid8 input values',
   proname => 'max', prokind => 'a', proisstrict => 'f', prorettype => 'xid8',
   proargtypes => 'xid8', prosrc => 'aggregate_dummy' },
-{ oid => '8922', descr => 'maximum value of all bytea input values',
+{ oid => '6395', descr => 'maximum value of all bytea input values',
   proname => 'max', prokind => 'a', proisstrict => 'f', prorettype => 'bytea',
   proargtypes => 'bytea', prosrc => 'aggregate_dummy' },
 
@@ -7069,7 +7069,7 @@
   proname => 'min', prokind => 'a', proisstrict => 'f',
   prorettype => 'anyarray', proargtypes => 'anyarray',
   prosrc => 'aggregate_dummy' },
-{ oid => '8596', descr => 'minimum value of all record input values',
+{ oid => '6374', descr => 'minimum value of all record input values',
   proname => 'min', prokind => 'a', proisstrict => 'f', prorettype => 'record',
   proargtypes => 'record', prosrc => 'aggregate_dummy' },
 { oid => '2245', descr => 'minimum value of all bpchar input values',
@@ -7087,7 +7087,7 @@
 { oid => '5100', descr => 'minimum value of all xid8 input values',
   proname => 'min', prokind => 'a', proisstrict => 'f', prorettype => 'xid8',
   proargtypes => 'xid8', prosrc => 'aggregate_dummy' },
-{ oid => '8923', descr => 'minimum value of all bytea input values',
+{ oid => '6396', descr => 'minimum value of all bytea input values',
   proname => 'min', prokind => 'a', proisstrict => 'f', prorettype => 'bytea',
   proargtypes => 'bytea', prosrc => 'aggregate_dummy' },
 
@@ -7950,10 +7950,10 @@
   proargtypes => 'internal', prosrc => 'tsm_system_handler' },
 
 # CRC variants
-{ oid => '8571', descr => 'CRC-32 value',
+{ oid => '6364', descr => 'CRC-32 value',
   proname => 'crc32', proleakproof => 't', prorettype => 'int8',
   proargtypes => 'bytea', prosrc => 'crc32_bytea' },
-{ oid => '8572', descr => 'CRC-32C value',
+{ oid => '6365', descr => 'CRC-32C value',
   proname => 'crc32c', proleakproof => 't', prorettype => 'int8',
   proargtypes => 'bytea', prosrc => 'crc32c_bytea' },
 
@@ -8497,7 +8497,7 @@
   proargmodes => '{o,o,o,o,o,o}',
   proargnames => '{name,statement,is_holdable,is_binary,is_scrollable,creation_time}',
   prosrc => 'pg_cursor' },
-{ oid => '9221', descr => 'get abbreviations from current timezone',
+{ oid => '6401', descr => 'get abbreviations from current timezone',
   proname => 'pg_timezone_abbrevs_zone', prorows => '10', proretset => 't',
   provolatile => 's', prorettype => 'record', proargtypes => '',
   proallargtypes => '{text,interval,bool}', proargmodes => '{o,o,o}',
@@ -8609,7 +8609,7 @@
   prosupport => 'generate_series_numeric_support', proretset => 't',
   prorettype => 'numeric', proargtypes => 'numeric numeric',
   prosrc => 'generate_series_numeric' },
-{ oid => '8405', descr => 'planner support for generate_series',
+{ oid => '6357', descr => 'planner support for generate_series',
   proname => 'generate_series_numeric_support', prorettype => 'internal',
   proargtypes => 'internal', prosrc => 'generate_series_numeric_support' },
 { oid => '938', descr => 'non-persistent series generator',
@@ -8629,7 +8629,7 @@
   prorettype => 'timestamptz',
   proargtypes => 'timestamptz timestamptz interval text',
   prosrc => 'generate_series_timestamptz_at_zone' },
-{ oid => '8402', descr => 'planner support for generate_series',
+{ oid => '6354', descr => 'planner support for generate_series',
   proname => 'generate_series_timestamp_support', prorettype => 'internal',
   proargtypes => 'internal', prosrc => 'generate_series_timestamp_support' },
 
@@ -9468,7 +9468,7 @@
 { oid => '3300', descr => 'sort support',
   proname => 'uuid_sortsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'uuid_sortsupport' },
-{ oid => '9298', descr => 'skip support',
+{ oid => '6410', descr => 'skip support',
   proname => 'uuid_skipsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'uuid_skipsupport' },
 { oid => '2961', descr => 'I/O',
@@ -9486,13 +9486,13 @@
 { oid => '3432', descr => 'generate random UUID',
   proname => 'gen_random_uuid', provolatile => 'v', prorettype => 'uuid',
   proargtypes => '', prosrc => 'gen_random_uuid' },
-{ oid => '9895', descr => 'generate UUID version 4',
+{ oid => '6428', descr => 'generate UUID version 4',
   proname => 'uuidv4', provolatile => 'v', prorettype => 'uuid',
   proargtypes => '', prosrc => 'gen_random_uuid' },
-{ oid => '9896', descr => 'generate UUID version 7',
+{ oid => '6429', descr => 'generate UUID version 7',
   proname => 'uuidv7', provolatile => 'v', prorettype => 'uuid',
   proargtypes => '', prosrc => 'uuidv7' },
-{ oid => '9897',
+{ oid => '6430',
   descr => 'generate UUID version 7 with a timestamp shifted by specified interval',
   proname => 'uuidv7', provolatile => 'v', prorettype => 'uuid',
   proargtypes => 'interval', proargnames => '{shift}',
@@ -10654,10 +10654,10 @@
 { oid => '2987', descr => 'less-equal-greater',
   proname => 'btrecordcmp', prorettype => 'int4',
   proargtypes => 'record record', prosrc => 'btrecordcmp' },
-{ oid => '8597', descr => 'larger of two',
+{ oid => '6375', descr => 'larger of two',
   proname => 'record_larger', prorettype => 'record',
   proargtypes => 'record record', prosrc => 'record_larger' },
-{ oid => '8598', descr => 'smaller of two',
+{ oid => '6376', descr => 'smaller of two',
   proname => 'record_smaller', prorettype => 'record',
   proargtypes => 'record record', prosrc => 'record_smaller' },
 
@@ -10897,7 +10897,7 @@
 { oid => '3870', descr => 'less-equal-greater',
   proname => 'range_cmp', prorettype => 'int4',
   proargtypes => 'anyrange anyrange', prosrc => 'range_cmp' },
-{ oid => '8849', descr => 'sort support',
+{ oid => '6391', descr => 'sort support',
   proname => 'range_sortsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'range_sortsupport' },
 { oid => '3871',
@@ -12316,7 +12316,7 @@
   proname => 'array_subscript_handler',
   prosupport => 'array_subscript_handler_support', prorettype => 'internal',
   proargtypes => 'internal', prosrc => 'array_subscript_handler' },
-{ oid => '8682', descr => 'planner support for array_subscript_handler',
+{ oid => '6380', descr => 'planner support for array_subscript_handler',
   proname => 'array_subscript_handler_support', prorettype => 'internal',
   proargtypes => 'internal', prosrc => 'array_subscript_handler_support' },
 { oid => '6180', descr => 'raw array subscripting support',
@@ -12355,7 +12355,7 @@
   provolatile => 'v', prorettype => 'record', proargtypes => '',
   proallargtypes => '{text,int8,timestamptz}', proargmodes => '{o,o,o}',
   proargnames => '{name,size,modification}', prosrc => 'pg_ls_waldir' },
-{ oid => '9220', descr => 'list of files in the pg_wal/summaries directory',
+{ oid => '6400', descr => 'list of files in the pg_wal/summaries directory',
   proname => 'pg_ls_summariesdir', procost => '10', prorows => '20',
   proretset => 't', provolatile => 'v', prorettype => 'record',
   proargtypes => '', proallargtypes => '{text,int8,timestamptz}',
@@ -12511,21 +12511,21 @@
   proargnames => '{summarized_tli,summarized_lsn,pending_lsn,summarizer_pid}',
   prosrc => 'pg_get_wal_summarizer_state' },
 # Statistics Import
-{ oid => '8459', descr => 'restore statistics on relation',
+{ oid => '6362', descr => 'restore statistics on relation',
   proname => 'pg_restore_relation_stats', provariadic => 'any',
   proisstrict => 'f', provolatile => 'v', proparallel => 'u',
   prorettype => 'bool', proargtypes => 'any', proargmodes => '{v}',
   proargnames => '{kwargs}', prosrc => 'pg_restore_relation_stats' },
-{ oid => '9160', descr => 'clear statistics on relation',
+{ oid => '6397', descr => 'clear statistics on relation',
   proname => 'pg_clear_relation_stats', proisstrict => 'f', provolatile => 'v',
   proparallel => 'u', prorettype => 'void', proargtypes => 'text text',
   proargnames => '{schemaname,relname}', prosrc => 'pg_clear_relation_stats' },
-{ oid => '8461', descr => 'restore statistics on attribute',
+{ oid => '6363', descr => 'restore statistics on attribute',
   proname => 'pg_restore_attribute_stats', provariadic => 'any',
   proisstrict => 'f', provolatile => 'v', proparallel => 'u',
   prorettype => 'bool', proargtypes => 'any', proargmodes => '{v}',
   proargnames => '{kwargs}', prosrc => 'pg_restore_attribute_stats' },
-{ oid => '9162', descr => 'clear statistics on attribute',
+{ oid => '6398', descr => 'clear statistics on attribute',
   proname => 'pg_clear_attribute_stats', proisstrict => 'f', provolatile => 'v',
   proparallel => 'u', prorettype => 'void',
   proargtypes => 'text text text bool',
@@ -12533,12 +12533,12 @@
   prosrc => 'pg_clear_attribute_stats' },
 
 # GiST stratnum implementations
-{ oid => '8047', descr => 'GiST support',
+{ oid => '6347', descr => 'GiST support',
   proname => 'gist_translate_cmptype_common', prorettype => 'int2',
   proargtypes => 'int4', prosrc => 'gist_translate_cmptype_common' },
 
 # AIO related functions
-{ oid => '9200', descr => 'information about in-progress asynchronous IOs',
+{ oid => '6399', descr => 'information about in-progress asynchronous IOs',
   proname => 'pg_get_aios', prorows => '100', proretset => 't',
   provolatile => 'v', proparallel => 'r', prorettype => 'record',
   proargtypes => '',