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

Commit57f5503

Browse files
author
Thomas G. Lockhart
committed
Add type conversion functions between floats and integers.
Include some additional path functions which were coded but omitted here.Add translation and rotation/scaling operators for some geometric types.Fix bugs in some geometry comparison operator declarations.
1 parent407cd4e commit57f5503

File tree

2 files changed

+50
-11
lines changed

2 files changed

+50
-11
lines changed

‎src/include/catalog/pg_operator.h

Lines changed: 19 additions & 5 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.10 1997/04/2719:22:41 thomas Exp $
10+
* $Id: pg_operator.h,v 1.11 1997/05/11 15:19:30 thomas Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -289,6 +289,8 @@ DATA(insert OID = 616 ( "<===>" PGUID 0 b t f 600 603 701 616 0 0 0 dist_
289289
DATA(insertOID=617 ("<===>"PGUID0btf601603701617000dist_sbintltselintltjoinsel ));
290290
DATA(insertOID=618 ("<===>"PGUID0btf600602701618000dist_ppthintltselintltjoinsel ));
291291

292+
DATA(insertOID=619 ("<"PGUID0btf704704160000intervalct-- ));
293+
292294
DATA(insertOID=620 ("="PGUID0btt70070016620621622622float4eqeqseleqjoinsel ));
293295
DATA(insertOID=621 ("<>"PGUID0btf7007001662162000float4neneqselneqjoinsel ));
294296
DATA(insertOID=622 ("<"PGUID0btf7007001662362500float4ltintltselintltjoinsel ));
@@ -356,6 +358,17 @@ DATA(insert OID = 707 ( "<===>" PGUID 0 b t f 602 602 701 707 0 0 0 path_
356358
DATA(insertOID=708 ("<===>"PGUID0btf603603701708000line_distanceintltselintltjoinsel ));
357359
DATA(insertOID=709 ("<===>"PGUID0btf601601701709000lseg_distanceintltselintltjoinsel ));
358360

361+
/* add translation/rotation/scaling operators for geometric types. - thomas 97/05/10 */
362+
DATA(insertOID=731 ("+"PGUID0btf600600600731000point_add-- ));
363+
DATA(insertOID=732 ("-"PGUID0btf6006006000000point_sub-- ));
364+
DATA(insertOID=733 ("*"PGUID0btf600600600733000point_mul-- ));
365+
DATA(insertOID=734 ("/"PGUID0btf6006006000000point_div-- ));
366+
DATA(insertOID=735 ("+"PGUID0btf602602602735000path_add-- ));
367+
DATA(insertOID=736 ("+"PGUID0btf602600602736000path_add_pt-- ));
368+
DATA(insertOID=737 ("-"PGUID0btf6026006020000path_sub_pt-- ));
369+
DATA(insertOID=738 ("*"PGUID0btf602600602738000path_mul_pt-- ));
370+
DATA(insertOID=739 ("/"PGUID0btf6026006020000path_div_pt-- ));
371+
359372
DATA(insertOID=830 ("<"PGUID0btf8108101683483300oidint2ltintltselintltjoinsel ));
360373
DATA(insertOID=831 ("<="PGUID0btf8108101683383400oidint2leintltselintltjoinsel ));
361374
DATA(insertOID=832 ("="PGUID0btf8108101683283500oidint2eqintltselintltjoinsel ));
@@ -527,10 +540,10 @@ DATA(insert OID = 1305 ( ">=" PGUID 0 b t f 1296 1296 16 1304 1302 0 0 ti
527540
/* additional geometric operators - tgl 97/04/18 */
528541
DATA(insertOID=1500 ("="PGUID0btt718718161500150115021502circle_eqeqseleqjoinsel ));
529542
DATA(insertOID=1501 ("<>"PGUID0btf718718161501150000circle_neneqselneqjoinsel ));
530-
DATA(insertOID=1502 ("<"PGUID0btf718718161503150500circle_eqeqseleqjoinsel ));
531-
DATA(insertOID=1503 (">"PGUID0btf718718161502150400circle_eqeqseleqjoinsel ));
532-
DATA(insertOID=1504 ("<="PGUID0btf718718161505150300circle_eqeqseleqjoinsel ));
533-
DATA(insertOID=1505 (">="PGUID0btf718718161504150200circle_eqeqseleqjoinsel ));
543+
DATA(insertOID=1502 ("<"PGUID0btf718718160000circle_ltareaselareajoinsel ));
544+
DATA(insertOID=1503 (">"PGUID0btf718718160000circle_gtareaselareajoinsel ));
545+
DATA(insertOID=1504 ("<="PGUID0btf718718160000circle_leareaselareajoinsel ));
546+
DATA(insertOID=1505 (">="PGUID0btf718718160000circle_geareaselareajoinsel ));
534547

535548
DATA(insertOID=1506 ("<<"PGUID0btf718718160000circle_leftintltselintltjoinsel ));
536549
DATA(insertOID=1507 ("&<"PGUID0btf718718160000circle_overleftintltselintltjoinsel ));
@@ -550,6 +563,7 @@ DATA(insert OID = 1519 ( "/" PGUID 0 b t f 718 600 718 0 0 0
550563

551564
DATA(insertOID=1520 ("<===>"PGUID0btf7187187011520000circle_distanceintltselintltjoinsel ));
552565
DATA(insertOID=1521 ("#"PGUID0ltf0604230000poly_npoints-- ));
566+
DATA(insertOID=1522 ("<===>"PGUID0btf6007187011522000dist_pcintltselintltjoinsel ));
553567

554568
/*
555569
* function prototypes

‎src/include/catalog/pg_proc.h

Lines changed: 31 additions & 6 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.20 1997/05/06 07:20:53 thomas Exp $
9+
* $Id: pg_proc.h,v 1.21 1997/05/11 15:19:33 thomas Exp $
1010
*
1111
* NOTES
1212
* The script catalog/genbki.sh reads this file and generates .bki
@@ -304,7 +304,12 @@ DATA(insert OID = 231 ( dcbrt PGUID 11 f t f 1 f 701 "701" 100 0 0
304304
DATA(insertOID=232 (dpowPGUID11ftf2f701"701"10000100foobar ));
305305
DATA(insertOID=233 (dexpPGUID11ftf1f701"701"10000100foobar ));
306306
DATA(insertOID=234 (dlog1PGUID11ftf1f701"701"10000100foobar ));
307-
307+
308+
DATA(insertOID=235 (i2todPGUID11ftf1f701"21"10000100foobar ));
309+
DATA(insertOID=236 (i2tofPGUID11ftf1f700"21"10000100foobar ));
310+
DATA(insertOID=237 (dtoi2PGUID11ftf1f21"701"10000100foobar ));
311+
DATA(insertOID=238 (ftoi2PGUID11ftf1f21"700"10000100foobar ));
312+
308313
DATA(insertOID=240 (nabstimeinPGUID11ftf1f702"0"10000100foobar ));
309314
DATA(insertOID=241 (nabstimeoutPGUID11ftf1f23"0"10000100foobar ));
310315
DATA(insertOID=242 (reltimeinPGUID11ftf1f703"0"10000100foobar ));
@@ -384,9 +389,13 @@ DATA(insert OID = 310 ( float84ge PGUID 11 f t f 2 f 16 "701 700" 100 0
384389

385390
DATA(insertOID=311 (ftodPGUID11ftf2f701"700"10000100foobar ));
386391
DATA(insertOID=312 (dtofPGUID11ftf2f700"701"10000100foobar ));
387-
DATA(insertOID=313 (i2toi4PGUID11ftf2f23"21"10000100foobar ));
388-
DATA(insertOID=314 (i4toi2PGUID11ftf2f21"23"10000100foobar ));
389-
DATA(insertOID=315 (keyfirsteqPGUID11ftf2f16"0 21"10000100foobar ));
392+
DATA(insertOID=313 (i2toi4PGUID11ftf1f23"21"10000100foobar ));
393+
DATA(insertOID=314 (i4toi2PGUID11ftf1f21"23"10000100foobar ));
394+
DATA(insertOID=315 (keyfirsteqPGUID11ftf2f16"0 21"10000100foobar ));
395+
DATA(insertOID=316 (itodPGUID11ftf1f701"23"10000100foobar ));
396+
DATA(insertOID=317 (dtoiPGUID11ftf1f23"701"10000100foobar ));
397+
DATA(insertOID=318 (itofPGUID11ftf1f700"23"10000100foobar ));
398+
DATA(insertOID=319 (ftoiPGUID11ftf1f23"700"10000100foobar ));
390399

391400
DATA(insertOID=320 (rtinsertPGUID11ftf5f23"0"10000100foobar ));
392401
DATA(insertOID=321 (rtdeletePGUID11ftf2f23"0"10000100foobar ));
@@ -896,6 +905,21 @@ DATA(insert OID = 1403 ( float4 PGUID 14 f t f 1 f 700 "701" 100 0 0 10
896905
DATA(insertOID=1404 (intPGUID14ftf1f23"23"10000100"select $1"- ));
897906
DATA(insertOID=1405 (int2PGUID14ftf1f21"21"10000100"select $1"- ));
898907

908+
DATA(insertOID=1406 (float8PGUID14ftf1f701"701"10000100"select $1"- ));
909+
DATA(insertOID=1407 (float8PGUID14ftf1f701"700"10000100"select ftod($1)"- ));
910+
DATA(insertOID=1408 (float8PGUID14ftf1f701"23"10000100"select itod($1)"- ));
911+
DATA(insertOID=1409 (float8PGUID14ftf1f701"21"10000100"select i2tod($1)"- ));
912+
DATA(insertOID=1410 (float4PGUID14ftf1f700"23"10000100"select itof($1)"- ));
913+
DATA(insertOID=1411 (float4PGUID14ftf1f700"21"10000100"select i2tof($1)"- ));
914+
DATA(insertOID=1412 (int4PGUID14ftf1f23"23"10000100"select $1"- ));
915+
DATA(insertOID=1413 (int4PGUID14ftf1f23"701"10000100"select dtoi($1)"- ));
916+
DATA(insertOID=1414 (int4PGUID14ftf1f23"21"10000100"select i2toi4($1)"- ));
917+
DATA(insertOID=1415 (int4PGUID14ftf1f23"700"10000100"select ftoi($1)"- ));
918+
DATA(insertOID=1416 (int2PGUID14ftf1f21"21"10000100"select $1"- ));
919+
DATA(insertOID=1417 (int2PGUID14ftf1f21"23"10000100"select i4toi2($1)"- ));
920+
DATA(insertOID=1418 (int2PGUID14ftf1f21"701"10000100"select dtoi2($1)"- ));
921+
DATA(insertOID=1419 (int2PGUID14ftf1f21"700"10000100"select ftoi2($1)"- ));
922+
899923
DATA(insertOID=1421 (boxPGUID11ftf2f603"600 600"10000100foobar ));
900924
DATA(insertOID=1422 (box_addPGUID11ftf2f603"603 600"10000100foobar ));
901925
DATA(insertOID=1423 (box_subPGUID11ftf2f603"603 600"10000100foobar ));
@@ -951,11 +975,12 @@ DATA(insert OID = 1472 ( circle_center PGUID 11 f t f 1 f 600 "718" 100 0 1
951975
DATA(insertOID=1473 (circlePGUID11ftf2f718"600 701"100010foobar ));
952976
DATA(insertOID=1474 (poly_circlePGUID11ftf1f718"604"100010foobar ));
953977
DATA(insertOID=1475 (circle_polyPGUID11ftf2f604"23 718"100010foobar ));
978+
DATA(insertOID=1476 (dist_pcPGUID11ftf2f604"600 718"100010foobar ));
954979

955980
DATA(insertOID=1530 (pointPGUID14ftf2f600"601 601"10000100"select lseg_interpt($1, $2)"- ));
956981
DATA(insertOID=1531 (pointPGUID14ftf1f600"718"10000100"select circle_center($1)"- ));
957982
DATA(insertOID=1532 (isverticalPGUID14ftf2f16"600 600"10000100"select point_vert($1, $2)"- ));
958-
DATA(insertOID=1533 (ishorizonalPGUID14ftf2f16"600 600"10000100"select point_horiz($1, $2)"- ));
983+
DATA(insertOID=1533 (ishorizontalPGUID14ftf2f16"600 600"10000100"select point_horiz($1, $2)"- ));
959984
DATA(insertOID=1534 (slopePGUID14ftf2f701"600 600"10000100"select point_slope($1, $2)"- ));
960985

961986
DATA(insertOID=1540 (lsegPGUID14ftf2f601"600 600"10000100"select lseg_construct($1, $2)"- ));

0 commit comments

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