Skip to content

Commit 7506f72

Browse files
author
Alexander Korotkov
committed
Fix xid vs integer comparison operators.
1 parent 5627776 commit 7506f72

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

‎src/include/catalog/pg_operator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ DESCR("concatenate");
144144

145145
DATA(insert OID = 352 ( "=" PGNSP PGUID b f t 28 28 16 352 3315 xideq eqsel eqjoinsel ));
146146
DESCR("equal");
147-
DATA(insert OID = 353 ( "=" PGNSP PGUID b f f 28 23 16 0 3316 xideqint4 eqsel eqjoinsel ));
147+
DATA(insert OID = 353 ( "=" PGNSP PGUID b f f 28 20 16 0 3316 xideqint8 eqsel eqjoinsel ));
148148
DESCR("equal");
149149
DATA(insert OID = 3315 ( "<>" PGNSP PGUID b f f 28 28 16 3315 352 xidneq neqsel neqjoinsel ));
150150
DESCR("not equal");
151-
DATA(insert OID = 3316 ( "<>" PGNSP PGUID b f f 28 23 16 0 353 xidneqint4 neqsel neqjoinsel ));
151+
DATA(insert OID = 3316 ( "<>" PGNSP PGUID b f f 28 20 16 0 353 xidneqint8 neqsel neqjoinsel ));
152152
DESCR("not equal");
153153
DATA(insert OID = 388 ( "!" PGNSP PGUID r f f 20 0 1700 0 0 numeric_fac - - ));
154154
DESCR("factorial");

‎src/include/catalog/pg_proc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,8 +1431,8 @@ DESCR("length");
14311431
DATA(insert OID = 1318 ( length PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "1042" _null_ _null_ _null_ _null_ _null_ bpcharlen _null_ _null_ _null_ ));
14321432
DESCR("character length");
14331433

1434-
DATA(insert OID = 1319 ( xideqint4 PGNSP PGUID 12 1 0 0 0 f f f t t f i s 2 0 16 "28 23" _null_ _null_ _null_ _null_ _null_ xideq _null_ _null_ _null_ ));
1435-
DATA(insert OID = 3309 ( xidneqint4 PGNSP PGUID 12 1 0 0 0 f f f t t f i s 2 0 16 "28 23" _null_ _null_ _null_ _null_ _null_ xidneq _null_ _null_ _null_ ));
1434+
DATA(insert OID = 1319 ( xideqint8 PGNSP PGUID 12 1 0 0 0 f f f t t f i s 2 0 16 "28 20" _null_ _null_ _null_ _null_ _null_ xideq _null_ _null_ _null_ ));
1435+
DATA(insert OID = 3309 ( xidneqint8 PGNSP PGUID 12 1 0 0 0 f f f t t f i s 2 0 16 "28 20" _null_ _null_ _null_ _null_ _null_ xidneq _null_ _null_ _null_ ));
14361436

14371437
DATA(insert OID = 1326 ( interval_div PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 1186 "1186 701" _null_ _null_ _null_ _null_ _null_ interval_div _null_ _null_ _null_ ));
14381438

‎src/test/regress/expected/alter_table.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,7 +2029,7 @@ from pg_locks l join pg_class c on l.relation = c.oid
20292029
where virtualtransaction = (
20302030
select virtualtransaction
20312031
from pg_locks
2032-
where transactionid = txid_current()::integer)
2032+
where transactionid = txid_current())
20332033
and locktype = 'relation'
20342034
and relnamespace != (select oid from pg_namespace where nspname = 'pg_catalog')
20352035
and c.relname != 'my_locks'
@@ -2192,7 +2192,7 @@ from pg_locks l join pg_class c on l.relation = c.oid
21922192
where virtualtransaction = (
21932193
select virtualtransaction
21942194
from pg_locks
2195-
where transactionid = txid_current()::integer)
2195+
where transactionid = txid_current())
21962196
and locktype = 'relation'
21972197
and relnamespace != (select oid from pg_namespace where nspname = 'pg_catalog')
21982198
and c.relname = 'my_locks'

‎src/test/regress/expected/opr_sanity.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ WHERE p1.oid != p2.oid AND
197197
ORDER BY 1, 2;
198198
proargtypes | proargtypes
199199
-------------+-------------
200-
23 | 28
200+
20 | 28
201201
1114 | 1184
202202
1560 | 1562
203203
(3 rows)
@@ -615,7 +615,7 @@ interval_gt(interval,interval)
615615
charlt("char","char")
616616
tidne(tid,tid)
617617
tideq(tid,tid)
618-
xideqint4(xid,integer)
618+
xideqint8(xid,bigint)
619619
timetz_eq(time with time zone,time with time zone)
620620
timetz_ne(time with time zone,time with time zone)
621621
timetz_lt(time with time zone,time with time zone)
@@ -684,7 +684,7 @@ uuid_ge(uuid,uuid)
684684
uuid_gt(uuid,uuid)
685685
uuid_ne(uuid,uuid)
686686
xidneq(xid,xid)
687-
xidneqint4(xid,integer)
687+
xidneqint8(xid,bigint)
688688
-- restore normal output mode
689689
\a\t
690690
-- List of functions used by libpq's fe-lobj.c

‎src/test/regress/sql/alter_table.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,7 +1335,7 @@ from pg_locks l join pg_class c on l.relation = c.oid
13351335
where virtualtransaction = (
13361336
select virtualtransaction
13371337
from pg_locks
1338-
where transactionid = txid_current()::integer)
1338+
where transactionid = txid_current())
13391339
and locktype = 'relation'
13401340
and relnamespace != (select oid from pg_namespace where nspname = 'pg_catalog')
13411341
and c.relname != 'my_locks'
@@ -1422,7 +1422,7 @@ from pg_locks l join pg_class c on l.relation = c.oid
14221422
where virtualtransaction = (
14231423
select virtualtransaction
14241424
from pg_locks
1425-
where transactionid = txid_current()::integer)
1425+
where transactionid = txid_current())
14261426
and locktype = 'relation'
14271427
and relnamespace != (select oid from pg_namespace where nspname = 'pg_catalog')
14281428
and c.relname = 'my_locks'

0 commit comments

Comments
 (0)