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=5032

Also run reformat_dat_file.pl while I'm here.

Renumbering recently-added types changed some results in the opr_sanity
test.  To make those a bit easier to eyeball-verify, change the queries
to show regtype not just bare type OIDs.  (I think we didn't have
regtype when these queries were written.)

Author: tglsfdc

src/include/catalog/catversion.h

@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	202004241
+#define CATALOG_VERSION_NO	202005121
 
 #endif

src/include/catalog/pg_amop.dat

@@ -1028,8 +1028,9 @@
   amopstrategy => '1', amopopr => '=(xid,xid)', amopmethod => 'hash' },
 
 # xid8_ops
-{ amopfamily => 'hash/xid8_ops', amoplefttype => 'xid8', amoprighttype => 'xid8',
-  amopstrategy => '1', amopopr => '=(xid8,xid8)', amopmethod => 'hash' },
+{ amopfamily => 'hash/xid8_ops', amoplefttype => 'xid8',
+  amoprighttype => 'xid8', amopstrategy => '1', amopopr => '=(xid8,xid8)',
+  amopmethod => 'hash' },
 
 # cid_ops
 { amopfamily => 'hash/cid_ops', amoplefttype => 'cid', amoprighttype => 'cid',

src/include/catalog/pg_operator.dat

@@ -193,28 +193,28 @@
   oprname => '<>', oprleft => 'xid', oprright => 'int4', oprresult => 'bool',
   oprnegate => '=(xid,int4)', oprcode => 'xidneqint4', oprrest => 'neqsel',
   oprjoin => 'neqjoinsel' },
-{ oid => '9418', descr => 'equal',
+{ oid => '5068', descr => 'equal',
   oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'xid8',
   oprright => 'xid8', oprresult => 'bool', oprcom => '=(xid8,xid8)',
   oprnegate => '<>(xid8,xid8)', oprcode => 'xid8eq', oprrest => 'eqsel',
   oprjoin => 'eqjoinsel' },
-{ oid => '9422', descr => 'not equal',
-  oprname => '<>', oprleft => 'xid8', oprright => 'xid8',
-  oprresult => 'bool', oprcom => '<>(xid8,xid8)', oprnegate => '=(xid8,xid8)',
-  oprcode => 'xid8ne', oprrest => 'neqsel', oprjoin => 'neqjoinsel' },
-{ oid => '9432', descr => 'less than',
+{ oid => '5072', descr => 'not equal',
+  oprname => '<>', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
+  oprcom => '<>(xid8,xid8)', oprnegate => '=(xid8,xid8)', oprcode => 'xid8ne',
+  oprrest => 'neqsel', oprjoin => 'neqjoinsel' },
+{ oid => '5073', descr => 'less than',
   oprname => '<', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
   oprcom => '>(xid8,xid8)', oprnegate => '>=(xid8,xid8)', oprcode => 'xid8lt',
   oprrest => 'scalarltsel', oprjoin => 'scalarltjoinsel' },
-{ oid => '9433', descr => 'greater than',
+{ oid => '5074', descr => 'greater than',
   oprname => '>', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
   oprcom => '<(xid8,xid8)', oprnegate => '<=(xid8,xid8)', oprcode => 'xid8gt',
   oprrest => 'scalargtsel', oprjoin => 'scalargtjoinsel' },
-{ oid => '9434', descr => 'less than or equal',
+{ oid => '5075', descr => 'less than or equal',
   oprname => '<=', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
   oprcom => '>=(xid8,xid8)', oprnegate => '>(xid8,xid8)', oprcode => 'xid8le',
   oprrest => 'scalarlesel', oprjoin => 'scalarlejoinsel' },
-{ oid => '9435', descr => 'greater than or equal',
+{ oid => '5076', descr => 'greater than or equal',
   oprname => '>=', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
   oprcom => '<=(xid8,xid8)', oprnegate => '<(xid8,xid8)', oprcode => 'xid8ge',
   oprrest => 'scalargesel', oprjoin => 'scalargejoinsel' },

src/include/catalog/pg_opfamily.dat

@@ -110,9 +110,9 @@
   opfmethod => 'btree', opfname => 'tid_ops' },
 { oid => '2225',
   opfmethod => 'hash', opfname => 'xid_ops' },
-{ oid => '8164',
+{ oid => '5032',
   opfmethod => 'hash', opfname => 'xid8_ops' },
-{ oid => '9322',
+{ oid => '5067',
   opfmethod => 'btree', opfname => 'xid8_ops' },
 { oid => '2226',
   opfmethod => 'hash', opfname => 'cid_ops' },