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

Commit8a3ef74

Browse files
committed
Clean up various minor irregularities detected by type_sanity
and newly expanded opr_sanity tests.
1 parent79e1d1d commit8a3ef74

File tree

7 files changed

+64
-53
lines changed

7 files changed

+64
-53
lines changed

‎src/include/catalog/pg_amop.h

Lines changed: 2 additions & 2 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_amop.h,v 1.21 1999/03/26 07:32:40 tgl Exp $
10+
* $Id: pg_amop.h,v 1.22 1999/03/28 02:01:38 tgl Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -349,7 +349,7 @@ DATA(insert OID = 0 ( 405423 670 1 hashsel hashnpage ));
349349
/* int4_ops */
350350
DATA(insertOID=0 (405426961hashselhashnpage ));
351351
/* int8_ops */
352-
DATA(insertOID=0 (405426961hashselhashnpage ));
352+
DATA(insertOID=0 (405754961hashselhashnpage ));
353353
/* oid_ops */
354354
DATA(insertOID=0 (4054276071hashselhashnpage ));
355355
/* oid8_ops */

‎src/include/catalog/pg_attribute.h

Lines changed: 12 additions & 1 deletion
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_attribute.h,v 1.45 1999/02/13 23:21:07 momjian Exp $
10+
* $Id: pg_attribute.h,v 1.46 1999/03/28 02:01:38 tgl Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -471,4 +471,15 @@ DATA(insert OID = 0 ( 1264 varfoo26 0 4 1 0 -1 -1 t f i f f));
471471

472472
DATA(insertOID=0 (1269logfoo260410-1-1tfiff));
473473

474+
/* ----------------
475+
*pg_xactlock - this relation is modified by special purpose access
476+
* method code.The following is garbage but is needed
477+
* so that the reldesc code works properly.
478+
* ----------------
479+
*/
480+
#defineSchema_pg_xactlock \
481+
{ 376, {"xactlockfoo"}, 26, 0, 4, 1, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }
482+
483+
DATA(insertOID=0 (376xactlockfoo260410-1-1tfiff));
484+
474485
#endif/* PG_ATTRIBUTE_H */

‎src/include/catalog/pg_class.h

Lines changed: 2 additions & 2 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_class.h,v 1.27 1999/02/13 23:21:08 momjian Exp $
10+
* $Id: pg_class.h,v 1.28 1999/03/28 02:01:38 tgl Exp $
1111
*
1212
* NOTES
1313
* ``pg_relation'' is being replaced by ``pg_class''. currently
@@ -140,7 +140,7 @@ DATA(insert OID = 1261 ( pg_group 87 PGUID 0 0 0 f t s 3 0 0 0 0 0 f f _nul
140140
DESCR("");
141141
DATA(insertOID=1262 (pg_database88PGUID000ftr400000ff_null_ ));
142142
DESCR("");
143-
DATA(insertOID=1264 (pg_variable90PGUID000fts200000ff_null_ ));
143+
DATA(insertOID=1264 (pg_variable90PGUID000fts100000ff_null_ ));
144144
DESCR("");
145145
DATA(insertOID=1269 (pg_log99PGUID000fts100000ff_null_ ));
146146
DESCR("");

‎src/include/catalog/pg_opclass.h

Lines changed: 2 additions & 2 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_opclass.h,v 1.17 1999/03/14 05:08:59 momjian Exp $
10+
* $Id: pg_opclass.h,v 1.18 1999/03/28 02:01:38 tgl Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -85,7 +85,7 @@ DATA(insert OID = 431 (text_ops 25 ));
8585
DESCR("");
8686
DATA(insertOID=432 (abstime_ops702 ));
8787
DESCR("");
88-
DATA(insertOID=433 (bigbox_ops0 ));
88+
DATA(insertOID=433 (bigbox_ops603 ));
8989
DESCR("");
9090
DATA(insertOID=434 (poly_ops604 ));
9191
DESCR("");

‎src/include/catalog/pg_operator.h

Lines changed: 42 additions & 42 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.52 1999/03/26 07:32:41 tgl Exp $
10+
* $Id: pg_operator.h,v 1.53 1999/03/28 02:01:38 tgl Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -150,7 +150,7 @@ DATA(insert OID = 419 ( ">" PGUID 0 b t f 20 23 16 37 420 0 0 int84gt in
150150
DATA(insertOID=420 ("<="PGUID0btf2023168241900int84leintleselintlejoinsel ));
151151
DATA(insertOID=430 (">="PGUID0btf2023168041800int84geintgeselintgejoinsel ));
152152

153-
DATA(insertOID=484 ("-"PGUID0ltf020200000int8umintltselintltjoinsel ));
153+
DATA(insertOID=484 ("-"PGUID0ltf020200000int8um-- ));
154154
DATA(insertOID=485 ("<<"PGUID0btf604604160000poly_leftintltselintltjoinsel ));
155155
DATA(insertOID=486 ("&<"PGUID0btf604604160000poly_overleftintltselintltjoinsel ));
156156
DATA(insertOID=487 ("&>"PGUID0btf604604160000poly_overrightintltselintltjoinsel ));
@@ -179,11 +179,11 @@ DATA(insert OID = 509 ( "<^" PGUID 0 b t f 600 600 16 0 0 0 0 point
179179
DATA(insertOID=510 ("~="PGUID0btf60060016510000point_eqintltselintltjoinsel ));
180180
DATA(insertOID=511 ("@"PGUID0btf600603160000on_pbintltselintltjoinsel ));
181181
DATA(insertOID=512 ("@"PGUID0btf60060216755000on_ppathintltselintltjoinsel ));
182-
DATA(insertOID=513 ("@@"PGUID0ltf06036000000box_centerintltselintltjoinsel ));
183-
DATA(insertOID=514 ("*"PGUID0btf232323514000int4mulintltselintltjoinsel ));
184-
DATA(insertOID=515 ("!"PGUID0rtf230230000int4facintltselintltjoinsel ));
185-
DATA(insertOID=516 ("!!"PGUID0ltf023230000int4facintltselintltjoinsel ));
186-
DATA(insertOID=517 ("<->"PGUID0btf600600701517000point_distanceintltselintltjoinsel ));
182+
DATA(insertOID=513 ("@@"PGUID0ltf06036000000box_center-- ));
183+
DATA(insertOID=514 ("*"PGUID0btf232323514000int4mul-- ));
184+
DATA(insertOID=515 ("!"PGUID0rtf230230000int4fac-- ));
185+
DATA(insertOID=516 ("!!"PGUID0ltf023230000int4fac-- ));
186+
DATA(insertOID=517 ("<->"PGUID0btf600600701517000point_distance-- ));
187187
DATA(insertOID=518 ("<>"PGUID0btf2323165189600int4neneqselneqjoinsel ));
188188
DATA(insertOID=519 ("<>"PGUID0btf2121165199400int2neneqselneqjoinsel ));
189189
DATA(insertOID=520 (">"PGUID0btf2121169552200int2gtintgtselintgtjoinsel ));
@@ -192,11 +192,11 @@ DATA(insert OID = 522 ( "<=" PGUID 0 b t f 21 21 16 524 520 0 0 int2le
192192
DATA(insertOID=523 ("<="PGUID0btf23231652552100int4leintltselintltjoinsel ));
193193
DATA(insertOID=524 (">="PGUID0btf2121165229500int2geintgtselintgtjoinsel ));
194194
DATA(insertOID=525 (">="PGUID0btf2323165239700int4geintgtselintgtjoinsel ));
195-
DATA(insertOID=526 ("*"PGUID0btf212121526000int2mulintltselintltjoinsel ));
196-
DATA(insertOID=527 ("/"PGUID0btf2121210000int2divintltselintltjoinsel ));
197-
DATA(insertOID=528 ("/"PGUID0btf2323230000int4divintltselintltjoinsel ));
198-
DATA(insertOID=529 ("%"PGUID0btf2121210000int2modintltselintltjoinsel ));
199-
DATA(insertOID=530 ("%"PGUID0btf2323230000int4modintltselintltjoinsel ));
195+
DATA(insertOID=526 ("*"PGUID0btf212121526000int2mul-- ));
196+
DATA(insertOID=527 ("/"PGUID0btf2121210000int2div-- ));
197+
DATA(insertOID=528 ("/"PGUID0btf2323230000int4div-- ));
198+
DATA(insertOID=529 ("%"PGUID0btf2121210000int2mod-- ));
199+
DATA(insertOID=530 ("%"PGUID0btf2323230000int4mod-- ));
200200
DATA(insertOID=531 ("<>"PGUID0btf2525165319800textneneqselneqjoinsel ));
201201
DATA(insertOID=532 ("="PGUID0btt2123165335389597int24eqeqseleqjoinsel ));
202202
DATA(insertOID=533 ("="PGUID0btt2321165325399795int42eqeqseleqjoinsel ));
@@ -210,22 +210,22 @@ DATA(insert OID = 540 ( "<=" PGUID 0 b t f 21 23 16 543 536 0 0 int24le
210210
DATA(insertOID=541 ("<="PGUID0btf23211654253700int42leintltselintltjoinsel ));
211211
DATA(insertOID=542 (">="PGUID0btf21231654153400int24geintgtselintgtjoinsel ));
212212
DATA(insertOID=543 (">="PGUID0btf23211654053500int42geintgtselintgtjoinsel ));
213-
DATA(insertOID=544 ("*"PGUID0btf212323545000int24mulintltselintltjoinsel ));
214-
DATA(insertOID=545 ("*"PGUID0btf232123544000int42mulintltselintltjoinsel ));
215-
DATA(insertOID=546 ("/"PGUID0btf2123230000int24divintltselintltjoinsel ));
216-
DATA(insertOID=547 ("/"PGUID0btf2321230000int42divintltselintltjoinsel ));
217-
DATA(insertOID=548 ("%"PGUID0btf2123230000int24modintltselintltjoinsel ));
218-
DATA(insertOID=549 ("%"PGUID0btf2321230000int42modintltselintltjoinsel ));
219-
DATA(insertOID=550 ("+"PGUID0btf212121550000int2plintltselintltjoinsel ));
220-
DATA(insertOID=551 ("+"PGUID0btf232323551000int4plintltselintltjoinsel ));
221-
DATA(insertOID=552 ("+"PGUID0btf212323553000int24plintltselintltjoinsel ));
222-
DATA(insertOID=553 ("+"PGUID0btf232123552000int42plintltselintltjoinsel ));
223-
DATA(insertOID=554 ("-"PGUID0btf2121210000int2miintltselintltjoinsel ));
224-
DATA(insertOID=555 ("-"PGUID0btf2323230000int4miintltselintltjoinsel ));
225-
DATA(insertOID=556 ("-"PGUID0btf2123230000int24miintltselintltjoinsel ));
226-
DATA(insertOID=557 ("-"PGUID0btf2321230000int42miintltselintltjoinsel ));
227-
DATA(insertOID=558 ("-"PGUID0ltf023230000int4umintltselintltjoinsel ));
228-
DATA(insertOID=559 ("-"PGUID0ltf021210000int2umintltselintltjoinsel ));
213+
DATA(insertOID=544 ("*"PGUID0btf212323545000int24mul-- ));
214+
DATA(insertOID=545 ("*"PGUID0btf232123544000int42mul-- ));
215+
DATA(insertOID=546 ("/"PGUID0btf2123230000int24div-- ));
216+
DATA(insertOID=547 ("/"PGUID0btf2321230000int42div-- ));
217+
DATA(insertOID=548 ("%"PGUID0btf2123230000int24mod-- ));
218+
DATA(insertOID=549 ("%"PGUID0btf2321230000int42mod-- ));
219+
DATA(insertOID=550 ("+"PGUID0btf212121550000int2pl-- ));
220+
DATA(insertOID=551 ("+"PGUID0btf232323551000int4pl-- ));
221+
DATA(insertOID=552 ("+"PGUID0btf212323553000int24pl-- ));
222+
DATA(insertOID=553 ("+"PGUID0btf232123552000int42pl-- ));
223+
DATA(insertOID=554 ("-"PGUID0btf2121210000int2mi-- ));
224+
DATA(insertOID=555 ("-"PGUID0btf2323230000int4mi-- ));
225+
DATA(insertOID=556 ("-"PGUID0btf2123230000int24mi-- ));
226+
DATA(insertOID=557 ("-"PGUID0btf2321230000int42mi-- ));
227+
DATA(insertOID=558 ("-"PGUID0ltf023230000int4um-- ));
228+
DATA(insertOID=559 ("-"PGUID0ltf021210000int2um-- ));
229229
DATA(insertOID=560 ("="PGUID0btt70270216560561562562abstimeeqeqseleqjoinsel ));
230230
DATA(insertOID=561 ("<>"PGUID0btf7027021656156000abstimeneneqselneqjoinsel ));
231231
DATA(insertOID=562 ("<"PGUID0btf7027021656356500abstimeltintltselintltjoinsel ));
@@ -309,10 +309,10 @@ DATA(insert OID = 632 ( "<=" PGUID 0 b t f 18 18 16 634 633 0 0 charle i
309309
DATA(insertOID=633 (">"PGUID0btf18181663163200chargtintltselintltjoinsel ));
310310
DATA(insertOID=634 (">="PGUID0btf18181663263100chargeintltselintltjoinsel ));
311311

312-
DATA(insertOID=635 ("+"PGUID0btf1818180000charpleqseleqjoinsel ));
313-
DATA(insertOID=636 ("-"PGUID0btf1818180000charmieqseleqjoinsel ));
314-
DATA(insertOID=637 ("*"PGUID0btf1818180000charmuleqseleqjoinsel ));
315-
DATA(insertOID=638 ("/"PGUID0btf1818180000chardiveqseleqjoinsel ));
312+
DATA(insertOID=635 ("+"PGUID0btf1818180000charpl-- ));
313+
DATA(insertOID=636 ("-"PGUID0btf1818180000charmi-- ));
314+
DATA(insertOID=637 ("*"PGUID0btf1818180000charmul-- ));
315+
DATA(insertOID=638 ("/"PGUID0btf1818180000chardiv-- ));
316316

317317
DATA(insertOID=639 ("~"PGUID0btf192516064000nameregexeqeqseleqjoinsel ));
318318
DATA(insertOID=640 ("!~"PGUID0btf192516063900nameregexneneqselneqjoinsel ));
@@ -350,11 +350,11 @@ DATA(insert OID = 693 ( "-" PGUID 0 b t f 23 20 20 0 0 0 0 int48m
350350
DATA(insertOID=694 ("*"PGUID0btf232020690000int48mul-- ));
351351
DATA(insertOID=695 ("/"PGUID0btf2320200000int48div-- ));
352352

353-
DATA(insertOID=706 ("<->"PGUID0btf603603701706000box_distanceintltselintltjoinsel ));
354-
DATA(insertOID=707 ("<->"PGUID0btf602602701707000path_distanceintltselintltjoinsel ));
355-
DATA(insertOID=708 ("<->"PGUID0btf628628701708000line_distanceintltselintltjoinsel ));
356-
DATA(insertOID=709 ("<->"PGUID0btf601601701709000lseg_distanceintltselintltjoinsel ));
357-
DATA(insertOID=712 ("<->"PGUID0btf604604701712000poly_distanceintltselintltjoinsel ));
353+
DATA(insertOID=706 ("<->"PGUID0btf603603701706000box_distance-- ));
354+
DATA(insertOID=707 ("<->"PGUID0btf602602701707000path_distance-- ));
355+
DATA(insertOID=708 ("<->"PGUID0btf628628701708000line_distance-- ));
356+
DATA(insertOID=709 ("<->"PGUID0btf601601701709000lseg_distance-- ));
357+
DATA(insertOID=712 ("<->"PGUID0btf604604701712000poly_distance-- ));
358358

359359
/* add translation/rotation/scaling operators for geometric types. - thomas 97/05/10 */
360360
DATA(insertOID=731 ("+"PGUID0btf600600600731000point_add-- ));
@@ -422,8 +422,8 @@ DATA(insert OID = 917 ( "*" PGUID 0 b t f 23 790790 912 0 0 0 int4_
422422
DATA(insertOID=918 ("*"PGUID0btf21790790914000int2_mul_cash-- ));
423423

424424
DATA(insertOID=965 ("^"PGUID0btf7017017010000dpow-- ));
425-
DATA(insertOID=966 ("+"PGUID0btf1034103310340000aclinsertintltselintltjoinsel ));
426-
DATA(insertOID=967 ("-"PGUID0btf1034103310340000aclremoveintltselintltjoinsel ));
425+
DATA(insertOID=966 ("+"PGUID0btf1034103310340000aclinsert-- ));
426+
DATA(insertOID=967 ("-"PGUID0btf1034103310340000aclremove-- ));
427427
DATA(insertOID=968 ("~"PGUID0btf10341033160000aclcontainsintltselintltjoinsel ));
428428

429429
/* additional geometric operators - thomas 1997-07-09 */
@@ -576,10 +576,10 @@ DATA(insert OID = 1517 ( "-" PGUID 0 b t f 718 600 718 0 00 0 circl
576576
DATA(insertOID=1518 ("*"PGUID0btf7186007180000circle_mul_pt-- ));
577577
DATA(insertOID=1519 ("/"PGUID0btf7186007180000circle_div_pt-- ));
578578

579-
DATA(insertOID=1520 ("<->"PGUID0btf7187187011520000circle_distanceintltselintltjoinsel ));
579+
DATA(insertOID=1520 ("<->"PGUID0btf7187187011520000circle_distance-- ));
580580
DATA(insertOID=1521 ("#"PGUID0ltf0604230000poly_npoints-- ));
581-
DATA(insertOID=1522 ("<->"PGUID0btf6007187010000dist_pcintltselintltjoinsel ));
582-
DATA(insertOID=1523 ("<->"PGUID0btf7186047010000dist_cpolyintltselintltjoinsel ));
581+
DATA(insertOID=1522 ("<->"PGUID0btf6007187010000dist_pc-- ));
582+
DATA(insertOID=1523 ("<->"PGUID0btf7186047010000dist_cpoly-- ));
583583

584584
/* additional geometric operators - thomas 1997-07-09 */
585585
DATA(insertOID=1524 ("<->"PGUID0btf6286037010000dist_lb-- ));

‎src/include/catalog/pg_proc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: pg_proc.h,v 1.92 1999/03/14 16:32:46 momjian Exp $
9+
* $Id: pg_proc.h,v 1.93 1999/03/28 02:01:39 tgl Exp $
1010
*
1111
* NOTES
1212
* The script catalog/genbki.sh reads this file and generates .bki
@@ -295,7 +295,7 @@ DATA(insert OID = 138 ( box_center PGUID 11 f t f 1 f 600 "603" 100 1 0 100
295295
DESCR("center of");
296296
DATA(insertOID=139 (areaselPGUID11ftf5f701"26 26 21 0 23"10000100foobar ));
297297
DESCR("selectivity");
298-
DATA(insertOID=140 (areajoinselPGUID11ftf5f701"26 26 210 23"10000100foobar ));
298+
DATA(insertOID=140 (areajoinselPGUID11ftf5f701"26 26 2126 21"10000100foobar ));
299299
DESCR("selectivity");
300300
DATA(insertOID=141 (int4mulPGUID11ftf2f23"23 23"10000100foobar ));
301301
DESCR("multiply");

‎src/include/catalog/pg_type.h

Lines changed: 2 additions & 2 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_type.h,v 1.57 1999/03/26 07:32:42 tgl Exp $
10+
* $Id: pg_type.h,v 1.58 1999/03/28 02:01:39 tgl Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -216,7 +216,7 @@ DESCR("command identifier type, sequence in transaction id");
216216

217217
DATA(insertOID=30 (oid8PGUID3289fbt \054026oid8inoid8outoid8inoid8outi_null_ ));
218218
DESCR("array of 8 oid, used in system tables");
219-
DATA(insertOID=32 (SETPGUID-1-1frt \05400textintextouttextintextouti_null_ ));
219+
DATA(insertOID=32 (SETPGUID-1-1fbt \05400textintextouttextintextouti_null_ ));
220220
DESCR("set of tuples");
221221

222222
DATA(insertOID=71 (pg_typePGUID44tct \05412470foobarfoobari_null_));

0 commit comments

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