Skip to content

Commit 7b48f1b

Browse files
committed
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.)
1 parent 2793bbe commit 7b48f1b

File tree

8 files changed

+134
-135
lines changed

8 files changed

+134
-135
lines changed

src/include/catalog/catversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/* yyyymmddN */
56-
#define CATALOG_VERSION_NO 202004241
56+
#define CATALOG_VERSION_NO 202005121
5757

5858
#endif

src/include/catalog/pg_amop.dat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,8 +1028,9 @@
10281028
amopstrategy => '1', amopopr => '=(xid,xid)', amopmethod => 'hash' },
10291029

10301030
# xid8_ops
1031-
{ amopfamily => 'hash/xid8_ops', amoplefttype => 'xid8', amoprighttype => 'xid8',
1032-
amopstrategy => '1', amopopr => '=(xid8,xid8)', amopmethod => 'hash' },
1031+
{ amopfamily => 'hash/xid8_ops', amoplefttype => 'xid8',
1032+
amoprighttype => 'xid8', amopstrategy => '1', amopopr => '=(xid8,xid8)',
1033+
amopmethod => 'hash' },
10331034

10341035
# cid_ops
10351036
{ amopfamily => 'hash/cid_ops', amoplefttype => 'cid', amoprighttype => 'cid',

src/include/catalog/pg_operator.dat

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,28 +193,28 @@
193193
oprname => '<>', oprleft => 'xid', oprright => 'int4', oprresult => 'bool',
194194
oprnegate => '=(xid,int4)', oprcode => 'xidneqint4', oprrest => 'neqsel',
195195
oprjoin => 'neqjoinsel' },
196-
{ oid => '9418', descr => 'equal',
196+
{ oid => '5068', descr => 'equal',
197197
oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'xid8',
198198
oprright => 'xid8', oprresult => 'bool', oprcom => '=(xid8,xid8)',
199199
oprnegate => '<>(xid8,xid8)', oprcode => 'xid8eq', oprrest => 'eqsel',
200200
oprjoin => 'eqjoinsel' },
201-
{ oid => '9422', descr => 'not equal',
202-
oprname => '<>', oprleft => 'xid8', oprright => 'xid8',
203-
oprresult => 'bool', oprcom => '<>(xid8,xid8)', oprnegate => '=(xid8,xid8)',
204-
oprcode => 'xid8ne', oprrest => 'neqsel', oprjoin => 'neqjoinsel' },
205-
{ oid => '9432', descr => 'less than',
201+
{ oid => '5072', descr => 'not equal',
202+
oprname => '<>', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
203+
oprcom => '<>(xid8,xid8)', oprnegate => '=(xid8,xid8)', oprcode => 'xid8ne',
204+
oprrest => 'neqsel', oprjoin => 'neqjoinsel' },
205+
{ oid => '5073', descr => 'less than',
206206
oprname => '<', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
207207
oprcom => '>(xid8,xid8)', oprnegate => '>=(xid8,xid8)', oprcode => 'xid8lt',
208208
oprrest => 'scalarltsel', oprjoin => 'scalarltjoinsel' },
209-
{ oid => '9433', descr => 'greater than',
209+
{ oid => '5074', descr => 'greater than',
210210
oprname => '>', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
211211
oprcom => '<(xid8,xid8)', oprnegate => '<=(xid8,xid8)', oprcode => 'xid8gt',
212212
oprrest => 'scalargtsel', oprjoin => 'scalargtjoinsel' },
213-
{ oid => '9434', descr => 'less than or equal',
213+
{ oid => '5075', descr => 'less than or equal',
214214
oprname => '<=', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
215215
oprcom => '>=(xid8,xid8)', oprnegate => '>(xid8,xid8)', oprcode => 'xid8le',
216216
oprrest => 'scalarlesel', oprjoin => 'scalarlejoinsel' },
217-
{ oid => '9435', descr => 'greater than or equal',
217+
{ oid => '5076', descr => 'greater than or equal',
218218
oprname => '>=', oprleft => 'xid8', oprright => 'xid8', oprresult => 'bool',
219219
oprcom => '<=(xid8,xid8)', oprnegate => '<(xid8,xid8)', oprcode => 'xid8ge',
220220
oprrest => 'scalargesel', oprjoin => 'scalargejoinsel' },

src/include/catalog/pg_opfamily.dat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@
110110
opfmethod => 'btree', opfname => 'tid_ops' },
111111
{ oid => '2225',
112112
opfmethod => 'hash', opfname => 'xid_ops' },
113-
{ oid => '8164',
113+
{ oid => '5032',
114114
opfmethod => 'hash', opfname => 'xid8_ops' },
115-
{ oid => '9322',
115+
{ oid => '5067',
116116
opfmethod => 'btree', opfname => 'xid8_ops' },
117117
{ oid => '2226',
118118
opfmethod => 'hash', opfname => 'cid_ops' },

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy