Skip to content

Commit 622af87

Browse files
author
Thomas G. Lockhart
committed
Results from initial changes to add new functions and for bug fixes.
Not all cleaned up yet.
1 parent 3d5dd9b commit 622af87

File tree

8 files changed

+673
-634
lines changed

8 files changed

+673
-634
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,17 @@ QUERY: SELECT '' AS ten, ABSTIME_TBL.f1 AS abstime, RELTIME_TBL.f1 AS reltime
143143
WHERE (ABSTIME_TBL.f1 + RELTIME_TBL.f1)
144144
< 'Jan 14 14:00:00 1971'::abstime
145145
ORDER BY abstime, reltime;
146-
ten|abstime |reltime
147-
---+----------------------------+----------------
148-
|Sat May 10 23:59:12 1947 PST|@ 14 seconds ago
149-
|Sat May 10 23:59:12 1947 PST|@ 1 minute
150-
|Sat May 10 23:59:12 1947 PST|@ 5 hours
151-
|Sat May 10 23:59:12 1947 PST|@ 10 days
152-
|Sat May 10 23:59:12 1947 PST|@ 3 months
153-
|epoch |@ 14 seconds ago
154-
|epoch |@ 1 minute
155-
|epoch |@ 5 hours
156-
|epoch |@ 10 days
157-
|epoch |@ 3 months
146+
ten|abstime |reltime
147+
---+----------------------------+-------------
148+
|Sat May 10 23:59:12 1947 PST|@ 14 secs ago
149+
|Sat May 10 23:59:12 1947 PST|@ 1 min
150+
|Sat May 10 23:59:12 1947 PST|@ 5 hours
151+
|Sat May 10 23:59:12 1947 PST|@ 10 days
152+
|Sat May 10 23:59:12 1947 PST|@ 3 mons
153+
|epoch |@ 14 secs ago
154+
|epoch |@ 1 min
155+
|epoch |@ 5 hours
156+
|epoch |@ 10 days
157+
|epoch |@ 3 mons
158158
(10 rows)
159159

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ four|f1
7474
|<(100,0),100>
7575
(4 rows)
7676

77-
QUERY: SELECT '' as five, c1.f1 AS one, c2.f1 AS two, (c1.f1 <===> c2.f1) AS distance
77+
QUERY: SELECT '' as five, c1.f1 AS one, c2.f1 AS two, (c1.f1 <-> c2.f1) AS distance
7878
FROM CIRCLE_TBL c1, CIRCLE_TBL c2
79-
WHERE (c1.f1 < c2.f1) AND ((c1.f1 <===> c2.f1) > 0)
79+
WHERE (c1.f1 < c2.f1) AND ((c1.f1 <-> c2.f1) > 0)
8080
ORDER BY distance, one, two;
8181
five|one |two | distance
8282
----+--------------+--------------+----------------

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -505,30 +505,30 @@ three|abstime |datetime
505505

506506
QUERY: SELECT '' AS ten, f1 AS timespan, reltime( f1) AS reltime
507507
FROM TIMESPAN_TBL;
508-
ten|timespan |reltime
509-
---+-----------------------------+----------------
510-
|@ 1 min |@ 1 minute
511-
|@ 5 hours |@ 5 hours
512-
|@ 10 days |@ 10 days
513-
|@ 34 years |@ 408 months
514-
|@ 3 mons |@ 3 months
515-
|@ 14 secs ago |@ 14 seconds ago
516-
|@ 1 day 2 hours 3 mins 4 secs|@ 93784 seconds
517-
|@ 6 years |@ 72 months
518-
|@ 5 mons |@ 5 months
519-
|@ 5 mons 12 hours |@ 3612 hours
508+
ten|timespan |reltime
509+
---+-----------------------------+-----------------------------
510+
|@ 1 min |@ 1 min
511+
|@ 5 hours |@ 5 hours
512+
|@ 10 days |@ 10 days
513+
|@ 34 years |@ 34 years
514+
|@ 3 mons |@ 3 mons
515+
|@ 14 secs ago |@ 14 secs ago
516+
|@ 1 day 2 hours 3 mins 4 secs|@ 1 day 2 hours 3 mins 4 secs
517+
|@ 6 years |@ 6 years
518+
|@ 5 mons |@ 5 mons
519+
|@ 5 mons 12 hours |@ 5 mons 12 hours
520520
(10 rows)
521521

522522
QUERY: SELECT '' AS six, f1 as reltime, timespan( f1) AS timespan
523523
FROM RELTIME_TBL;
524-
six|reltime |timespan
525-
---+----------------+-------------
526-
|@ 1 minute |@ 1 min
527-
|@ 5 hours |@ 5 hours
528-
|@ 10 days |@ 10 days
529-
|@ 34 years |@ 12410 days
530-
|@ 3 months |@ 90 days
531-
|@ 14 seconds ago|@ 14 secs ago
524+
six|reltime |timespan
525+
---+-------------+-------------
526+
|@ 1 min |@ 1 min
527+
|@ 5 hours |@ 5 hours
528+
|@ 10 days |@ 10 days
529+
|@ 34 years |@ 34 years
530+
|@ 3 mons |@ 3 mons
531+
|@ 14 secs ago|@ 14 secs ago
532532
(6 rows)
533533

534534
QUERY: DROP TABLE TEMP_DATETIME;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ NOTICE:there is no operator <= for types lseg and lseg
2727
NOTICE:You will either have to retype this query using an
2828
NOTICE:explicit cast, or you will have to define the operator
2929
WARN:<= for lseg and lseg using CREATE OPERATOR
30-
QUERY: SELECT * FROM LSEG_TBL WHERE (s <===> '[(1,2),(3,4)]'::lseg) < 10;
30+
QUERY: SELECT * FROM LSEG_TBL WHERE (s <-> '[(1,2),(3,4)]'::lseg) < 10;
3131
s
3232
------------------
3333
[(1,2),(3,4)]

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,42 +22,42 @@ six|f1
2222
|(10,10)
2323
(6 rows)
2424

25-
QUERY: SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 !< '(0.0, 0.0)';
25+
QUERY: SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)';
2626
three|f1
2727
-----+--------
2828
|(-10,0)
2929
|(-3,4)
3030
|(-5,-12)
3131
(3 rows)
3232

33-
QUERY: SELECT '' AS three, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' !> p.f1;
33+
QUERY: SELECT '' AS three, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >> p.f1;
3434
three|f1
3535
-----+--------
3636
|(-10,0)
3737
|(-3,4)
3838
|(-5,-12)
3939
(3 rows)
4040

41-
QUERY: SELECT '' AS one, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' !^ p.f1;
41+
QUERY: SELECT '' AS one, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >^ p.f1;
4242
one|f1
4343
---+--------
4444
|(-5,-12)
4545
(1 row)
4646

47-
QUERY: SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 !| '(0.0, 0.0)';
47+
QUERY: SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 <^ '(0.0, 0.0)';
4848
one|f1
4949
---+--------
5050
|(-5,-12)
5151
(1 row)
5252

53-
QUERY: SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 =|= '(5.1, 34.5)';
53+
QUERY: SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 ~= '(5.1, 34.5)';
5454
one|f1
5555
---+----------
5656
|(5.1,34.5)
5757
(1 row)
5858

5959
QUERY: SELECT '' AS three, p.* FROM POINT_TBL p
60-
WHERE p.f1 ===> '(0,0,100,100)';
60+
WHERE p.f1 @ '(0,0,100,100)'::box;
6161
three|f1
6262
-----+----------
6363
|(0,0)
@@ -66,7 +66,7 @@ three|f1
6666
(3 rows)
6767

6868
QUERY: SELECT '' AS three, p.* FROM POINT_TBL p
69-
WHERE not on_pb(p.f1,'(0,0,100,100)'::box);
69+
WHERE not p.f1 @ '(0,0,100,100)'::box;
7070
three|f1
7171
-----+--------
7272
|(-10,0)
@@ -75,14 +75,14 @@ three|f1
7575
(3 rows)
7676

7777
QUERY: SELECT '' AS two, p.* FROM POINT_TBL p
78-
WHERE on_ppath(p.f1,'[(0,0),(-10,0),(-10,10)]'::path);
78+
WHERE p.f1 @ '[(0,0),(-10,0),(-10,10)]'::path;
7979
two|f1
8080
---+-------
8181
|(0,0)
8282
|(-10,0)
8383
(2 rows)
8484

85-
QUERY: SELECT '' AS six, p.f1, p.f1 <===> '(0,0)'::point AS dist
85+
QUERY: SELECT '' AS six, p.f1, p.f1 <-> '(0,0)'::point AS dist
8686
FROM POINT_TBL p
8787
ORDER BY dist;
8888
six|f1 | dist
@@ -96,7 +96,7 @@ six|f1 | dist
9696
(6 rows)
9797

9898
QUERY: SET geqo TO 'off';
99-
QUERY: SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <===> p2.f1 AS dist
99+
QUERY: SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS dist
100100
FROM POINT_TBL p1, POINT_TBL p2
101101
ORDER BY dist;
102102
thirtysix|point1 |point2 | dist
@@ -141,7 +141,7 @@ thirtysix|point1 |point2 | dist
141141

142142
QUERY: SELECT '' AS thirty, p1.f1 AS point1, p2.f1 AS point2
143143
FROM POINT_TBL p1, POINT_TBL p2
144-
WHERE (p1.f1 <===> p2.f1) > 3;
144+
WHERE (p1.f1 <-> p2.f1) > 3;
145145
thirty|point1 |point2
146146
------+----------+----------
147147
|(-10,0) |(0,0)
@@ -176,9 +176,9 @@ thirty|point1 |point2
176176
|(-5,-12) |(10,10)
177177
(30 rows)
178178

179-
QUERY: SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <===> p2.f1) AS distance
179+
QUERY: SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance
180180
FROM POINT_TBL p1, POINT_TBL p2
181-
WHERE (p1.f1 <===> p2.f1) > 3 and p1.f1 !< p2.f1
181+
WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1
182182
ORDER BY distance;
183183
fifteen|point1 |point2 | distance
184184
-------+----------+----------+----------------
@@ -199,9 +199,9 @@ fifteen|point1 |point2 | distance
199199
|(-5,-12) |(5.1,34.5)|47.5842410888311
200200
(15 rows)
201201

202-
QUERY: SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <===> p2.f1) AS distance
202+
QUERY: SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance
203203
FROM POINT_TBL p1, POINT_TBL p2
204-
WHERE (p1.f1 <===> p2.f1) > 3 and p1.f1 !< p2.f1 and p1.f1 !^ p2.f1
204+
WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1
205205
ORDER BY distance;
206206
three|point1 |point2 | distance
207207
-----+----------+--------+----------------

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,23 @@ zero|f1
6969

7070
QUERY: SELECT '' AS one, p.*
7171
FROM POLYGON_TBL p
72-
WHERE p.f1 @ '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
72+
WHERE p.f1 @ '(3.0,1.0),(3.0,3.0),(1.0,0.0)'::polygon;
7373
one|f1
7474
---+-------------------
7575
|((3,1),(3,3),(1,0))
7676
(1 row)
7777

7878
QUERY: SELECT '' AS one, p.*
7979
FROM POLYGON_TBL p
80-
WHERE p.f1 ~= '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
80+
WHERE p.f1 ~= '(3.0,1.0),(3.0,3.0),(1.0,0.0)'::polygon;
8181
one|f1
8282
---+-------------------
8383
|((3,1),(3,3),(1,0))
8484
(1 row)
8585

8686
QUERY: SELECT '' AS one, p.*
8787
FROM POLYGON_TBL p
88-
WHERE p.f1 ~ '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
88+
WHERE p.f1 ~ '(3.0,1.0),(3.0,3.0),(1.0,0.0)'::polygon;
8989
one|f1
9090
---+-------------------
9191
|((3,1),(3,3),(1,0))

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

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,43 @@ WARN:Bad reltime external representation 'badly formatted reltime'
1010
QUERY: INSERT INTO RELTIME_TBL (f1) VALUES ('@ 30 eons ago');
1111
WARN:Bad reltime external representation '@ 30 eons ago'
1212
QUERY: SELECT '' AS six, RELTIME_TBL.*;
13-
six|f1
14-
---+----------------
15-
|@ 1 minute
16-
|@ 5 hours
17-
|@ 10 days
18-
|@ 34 years
19-
|@ 3 months
20-
|@ 14 seconds ago
13+
six|f1
14+
---+-------------
15+
|@ 1 min
16+
|@ 5 hours
17+
|@ 10 days
18+
|@ 34 years
19+
|@ 3 mons
20+
|@ 14 secs ago
2121
(6 rows)
2222

2323
QUERY: SELECT '' AS five, RELTIME_TBL.*
2424
WHERE RELTIME_TBL.f1 <> '@ 10 days'::reltime;
25-
five|f1
26-
----+----------------
27-
|@ 1 minute
28-
|@ 5 hours
29-
|@ 34 years
30-
|@ 3 months
31-
|@ 14 seconds ago
25+
five|f1
26+
----+-------------
27+
|@ 1 min
28+
|@ 5 hours
29+
|@ 34 years
30+
|@ 3 mons
31+
|@ 14 secs ago
3232
(5 rows)
3333

3434
QUERY: SELECT '' AS three, RELTIME_TBL.*
3535
WHERE RELTIME_TBL.f1 <= '@ 5 hours'::reltime;
36-
three|f1
37-
-----+----------------
38-
|@ 1 minute
39-
|@ 5 hours
40-
|@ 14 seconds ago
36+
three|f1
37+
-----+-------------
38+
|@ 1 min
39+
|@ 5 hours
40+
|@ 14 secs ago
4141
(3 rows)
4242

4343
QUERY: SELECT '' AS three, RELTIME_TBL.*
4444
WHERE RELTIME_TBL.f1 < '@ 1 day'::reltime;
45-
three|f1
46-
-----+----------------
47-
|@ 1 minute
48-
|@ 5 hours
49-
|@ 14 seconds ago
45+
three|f1
46+
-----+-------------
47+
|@ 1 min
48+
|@ 5 hours
49+
|@ 14 secs ago
5050
(3 rows)
5151

5252
QUERY: SELECT '' AS one, RELTIME_TBL.*
@@ -61,40 +61,40 @@ QUERY: SELECT '' AS two, RELTIME_TBL.*
6161
two|f1
6262
---+----------
6363
|@ 34 years
64-
|@ 3 months
64+
|@ 3 mons
6565
(2 rows)
6666

6767
QUERY: SELECT '' AS five, RELTIME_TBL.*
6868
WHERE RELTIME_TBL.f1 > '@ 3 seconds ago'::reltime;
6969
five|f1
7070
----+----------
71-
|@ 1 minute
71+
|@ 1 min
7272
|@ 5 hours
7373
|@ 10 days
7474
|@ 34 years
75-
|@ 3 months
75+
|@ 3 mons
7676
(5 rows)
7777

7878
QUERY: SELECT '' AS fifteen, r1.*, r2.*
7979
FROM RELTIME_TBL r1, RELTIME_TBL r2
8080
WHERE r1.f1 > r2.f1
8181
ORDER BY r1.f1, r2.f1;
82-
fifteen|f1 |f1
83-
-------+----------+----------------
84-
|@ 1 minute|@ 14 seconds ago
85-
|@ 5 hours |@ 14 seconds ago
86-
|@ 5 hours |@ 1 minute
87-
|@ 10 days |@ 14 seconds ago
88-
|@ 10 days |@ 1 minute
89-
|@ 10 days |@ 5 hours
90-
|@ 3 months|@ 14 seconds ago
91-
|@ 3 months|@ 1 minute
92-
|@ 3 months|@ 5 hours
93-
|@ 3 months|@ 10 days
94-
|@ 34 years|@ 14 seconds ago
95-
|@ 34 years|@ 1 minute
96-
|@ 34 years|@ 5 hours
97-
|@ 34 years|@ 10 days
98-
|@ 34 years|@ 3 months
82+
fifteen|f1 |f1
83+
-------+----------+-------------
84+
|@ 1 min |@ 14 secs ago
85+
|@ 5 hours |@ 14 secs ago
86+
|@ 5 hours |@ 1 min
87+
|@ 10 days |@ 14 secs ago
88+
|@ 10 days |@ 1 min
89+
|@ 10 days |@ 5 hours
90+
|@ 3 mons |@ 14 secs ago
91+
|@ 3 mons |@ 1 min
92+
|@ 3 mons |@ 5 hours
93+
|@ 3 mons |@ 10 days
94+
|@ 34 years|@ 14 secs ago
95+
|@ 34 years|@ 1 min
96+
|@ 34 years|@ 5 hours
97+
|@ 34 years|@ 10 days
98+
|@ 34 years|@ 3 mons
9999
(15 rows)
100100

0 commit comments

Comments
 (0)