Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit51f0f6d

Browse files
committed
Fix pg_operator entries for mergejoinable operators with different left and
right side data types. Correct the opr_sanity regress test to check theseentries properly. NOTE that opr_sanity will now fail until you do an initdb!
1 parentdc77be0 commit51f0f6d

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎src/include/catalog/pg_operator.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_operator.h,v 1.49 1999/02/13 23:21:11 momjian Exp $
10+
* $Id: pg_operator.h,v 1.50 1999/02/28 00:56:40 tgl Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -88,7 +88,7 @@ typedef FormData_pg_operator *Form_pg_operator;
8888
* ----------------
8989
*/
9090

91-
DATA(insertOID=15 ("="PGUID0btt232016416363737int48eqeqseleqjoinsel ));
91+
DATA(insertOID=15 ("="PGUID0btt2320164163697412int48eqeqseleqjoinsel ));
9292
DATA(insertOID=36 ("<>"PGUID0btt2320164171500int48neneqselneqjoinsel ));
9393
DATA(insertOID=37 ("<"PGUID0btf2320164198200int48ltintltselintltjoinsel ));
9494
DATA(insertOID=76 (">"PGUID0btf2320164188000int48gtintgtselintgtjoinsel ));
@@ -148,7 +148,7 @@ DATA(insert OID = 413 ( ">" PGUID 0 b t f 20 20 16 412 414 0 0 int8gt int
148148
DATA(insertOID=414 ("<="PGUID0btf20201641541300int8leintleselintlejoinsel ));
149149
DATA(insertOID=415 (">="PGUID0btf20201641441200int8geintgeselintgejoinsel ));
150150

151-
DATA(insertOID=416 ("="PGUID0btt20231615417418418int84eqeqseleqjoinsel ));
151+
DATA(insertOID=416 ("="PGUID0btt2023161541741297int84eqeqseleqjoinsel ));
152152
DATA(insertOID=417 ("<>"PGUID0btt2023163641600int84neneqselneqjoinsel ));
153153
DATA(insertOID=418 ("<"PGUID0btf2023167643000int84ltintltselintltjoinsel ));
154154
DATA(insertOID=419 (">"PGUID0btf2023163742000int84gtintgtselintgtjoinsel ));
@@ -203,8 +203,8 @@ DATA(insert OID = 528 ( "/" PGUID 0 b t f 23 23 23 0 0 0 0 int4div
203203
DATA(insertOID=529 ("%"PGUID0btf2121210000int2modintltselintltjoinsel ));
204204
DATA(insertOID=530 ("%"PGUID0btf2323230000int4modintltselintltjoinsel ));
205205
DATA(insertOID=531 ("<>"PGUID0btf2525165319800textneneqselneqjoinsel ));
206-
DATA(insertOID=532 ("="PGUID0btt212316533538534534int24eqeqseleqjoinsel ));
207-
DATA(insertOID=533 ("="PGUID0btt232116532539535535int42eqeqseleqjoinsel ));
206+
DATA(insertOID=532 ("="PGUID0btt2123165335389597int24eqeqseleqjoinsel ));
207+
DATA(insertOID=533 ("="PGUID0btt2321165325399795int42eqeqseleqjoinsel ));
208208
DATA(insertOID=534 ("<"PGUID0btf21231653754200int24ltintltselintltjoinsel ));
209209
DATA(insertOID=535 ("<"PGUID0btf23211653654300int42ltintltselintltjoinsel ));
210210
DATA(insertOID=536 (">"PGUID0btf21231653554000int24gtintgtselintgtjoinsel ));
@@ -481,7 +481,7 @@ DATA(insert OID = 1116 ( "+"PGUID 0 b t f 700 701 701 1126 0 0 0 float48pl
481481
DATA(insertOID=1117 ("-"PGUID0btf7007017010000float48mi-- ));
482482
DATA(insertOID=1118 ("/"PGUID0btf7007017010000float48div-- ));
483483
DATA(insertOID=1119 ("*"PGUID0btf7007017011129000float48mul-- ));
484-
DATA(insertOID=1120 ("="PGUID0btt700701161130112111221122float48eqeqseleqjoinsel ));
484+
DATA(insertOID=1120 ("="PGUID0btt7007011611301121622672float48eqeqseleqjoinsel ));
485485
DATA(insertOID=1121 ("<>"PGUID0btf700701161131112000float48neneqselneqjoinsel ));
486486
DATA(insertOID=1122 ("<"PGUID0btf700701161133112500float48ltintltselintltjoinsel ));
487487
DATA(insertOID=1123 (">"PGUID0btf700701161132112400float48gtintgtselintgtjoinsel ));
@@ -493,7 +493,7 @@ DATA(insert OID = 1126 ( "+"PGUID 0 b t f 701 700 701 1116 0 0 0 float84pl
493493
DATA(insertOID=1127 ("-"PGUID0btf7017007010000float84mi-- ));
494494
DATA(insertOID=1128 ("/"PGUID0btf7017007010000float84div-- ));
495495
DATA(insertOID=1129 ("*"PGUID0btf7017007011119000float84mul-- ));
496-
DATA(insertOID=1130 ("="PGUID0btt701700161120113111321132float84eqeqseleqjoinsel ));
496+
DATA(insertOID=1130 ("="PGUID0btt7017001611201131672622float84eqeqseleqjoinsel ));
497497
DATA(insertOID=1131 ("<>"PGUID0btf701700161121113000float84neneqselneqjoinsel ));
498498
DATA(insertOID=1132 ("<"PGUID0btf701700161123113500float84ltintltselintltjoinsel ));
499499
DATA(insertOID=1133 (">"PGUID0btf701700161122113400float84gtintgtselintgtjoinsel ));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ oid|oprcode|oid|oprcode
8383
QUERY: SELECT p1.oid, p1.oprcode, p2.oid, p2.oprcode
8484
FROM pg_operator AS p1, pg_operator AS p2
8585
WHERE p1.oprlsortop = p2.oid AND
86-
(p1.oprname != '=' OR
86+
(p1.oprname != '=' OR p2.oprname != '<' OR
8787
p1.oprkind != 'b' OR p2.oprkind != 'b' OR
8888
p1.oprleft != p2.oprleft OR
89-
p1.oprright != p2.oprright OR
89+
p1.oprleft != p2.oprright OR
9090
p1.oprresult != 16 OR
9191
p2.oprresult != 16 OR
9292
p1.oprrsortop = 0);
@@ -97,9 +97,9 @@ oid|oprcode|oid|oprcode
9797
QUERY: SELECT p1.oid, p1.oprcode, p2.oid, p2.oprcode
9898
FROM pg_operator AS p1, pg_operator AS p2
9999
WHERE p1.oprrsortop = p2.oid AND
100-
(p1.oprname != '=' OR
100+
(p1.oprname != '=' OR p2.oprname != '<' OR
101101
p1.oprkind != 'b' OR p2.oprkind != 'b' OR
102-
p1.oprleft != p2.oprleft OR
102+
p1.oprright != p2.oprleft OR
103103
p1.oprright != p2.oprright OR
104104
p1.oprresult != 16 OR
105105
p2.oprresult != 16 OR

‎src/test/regress/sql/opr_sanity.sql

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,28 +81,28 @@ WHERE p1.oprnegate = p2.oid AND
8181
p2.oprresult!=16OR
8282
p1.oid!=p2.oprnegate);
8383

84-
-- Look forsort operators that don't match.
85-
-- Asort linknormallyleads from an '='
86-
-- operatorto the matching'<' operator.
87-
--Sort links are not commutative.
84+
-- Look formergesort operators that don't match.
85+
-- Amergesort link leads from an '=' operator to the
86+
--sortoperator('<' operator) that's appropriate for
87+
--its left-side or right-side data type.
8888

8989
SELECTp1.oid,p1.oprcode,p2.oid,p2.oprcode
9090
FROM pg_operatorAS p1, pg_operatorAS p2
9191
WHEREp1.oprlsortop=p2.oidAND
92-
(p1.oprname!='='OR
92+
(p1.oprname!='='ORp2.oprname!='<'OR
9393
p1.oprkind!='b'ORp2.oprkind!='b'OR
9494
p1.oprleft!=p2.oprleftOR
95-
p1.oprright!=p2.oprrightOR
95+
p1.oprleft!=p2.oprrightOR
9696
p1.oprresult!=16OR
9797
p2.oprresult!=16OR
9898
p1.oprrsortop=0);
9999

100100
SELECTp1.oid,p1.oprcode,p2.oid,p2.oprcode
101101
FROM pg_operatorAS p1, pg_operatorAS p2
102102
WHEREp1.oprrsortop=p2.oidAND
103-
(p1.oprname!='='OR
103+
(p1.oprname!='='ORp2.oprname!='<'OR
104104
p1.oprkind!='b'ORp2.oprkind!='b'OR
105-
p1.oprleft!=p2.oprleftOR
105+
p1.oprright!=p2.oprleftOR
106106
p1.oprright!=p2.oprrightOR
107107
p1.oprresult!=16OR
108108
p2.oprresult!=16OR

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp