Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1556e62

Browse files
author
Thomas G. Lockhart
committed
Output changed for new ORDER BY to cope with new sorting routines.
1 parent 7971fb0 commit 1556e62

File tree

6 files changed

+61
-61
lines changed

6 files changed

+61
-61
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ QUERY: INSERT INTO DATETIME_TBL VALUES ('Jan 01 17:32:01 2000');
123123
QUERY: INSERT INTO DATETIME_TBL VALUES ('Dec 31 17:32:01 2000');
124124
QUERY: INSERT INTO DATETIME_TBL VALUES ('Jan 01 17:32:01 2001');
125125
QUERY: INSERT INTO DATETIME_TBL VALUES ('Feb 16 17:32:01 -0097');
126-
WARN:Bad datetime external representation Feb 16 17:32:01 -0097
126+
WARN:Bad datetime external representation 'Feb 16 17:32:01 -0097'
127127
QUERY: INSERT INTO DATETIME_TBL VALUES ('Feb 16 17:32:01 5097 BC');
128-
WARN:Datetime out of range Feb 16 17:32:01 5097 BC
128+
WARN:Datetime out of range 'Feb 16 17:32:01 5097 BC'
129129
QUERY: SELECT '' AS sixtythree, d1 FROM DATETIME_TBL;
130130
sixtythree|d1
131131
----------+-------------------------------

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -466,16 +466,16 @@ two|circle
466466
QUERY: SELECT '' AS twentyfour, c1.f1 AS circle, p1.f1 AS point, (p1.f1 <-> c1.f1) AS distance
467467
FROM CIRCLE_TBL c1, POINT_TBL p1
468468
WHERE (p1.f1 <-> c1.f1) > 0
469-
ORDER BY distance, circle;
469+
ORDER BY distance, circle, point using <<;
470470
twentyfour|circle |point | distance
471471
----------+--------------+----------+-----------------
472472
|<(100,0),100> |(5.1,34.5)|0.976531926977964
473473
|<(1,2),3> |(-3,4) | 1.47213595499958
474474
|<(0,0),3> |(-3,4) | 2
475475
|<(100,0),100> |(-3,4) | 3.07764064044151
476476
|<(100,0),100> |(-5,-12) | 5.68348972285122
477-
|<(1,3),5> |(10,10) | 6.40175425099138
478477
|<(1,3),5> |(-10,0) | 6.40175425099138
478+
|<(1,3),5> |(10,10) | 6.40175425099138
479479
|<(0,0),3> |(-10,0) | 7
480480
|<(1,2),3> |(-10,0) | 8.18033988749895
481481
|<(1,2),3> |(10,10) | 9.0415945787923

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ten|datetime
2222

2323
QUERY: SELECT '' AS hundred, d.f1 AS datetime, t.f1 AS timespan, d.f1 + t.f1 AS plus
2424
FROM TEMP_DATETIME d, TIMESPAN_TBL t
25-
ORDER BY plus;
25+
ORDER BY plus, datetime, timespan;
2626
hundred|datetime |timespan |plus
2727
-------+----------------------------+-----------------------------+----------------------------
2828
|epoch |@ 14 secs ago |Wed Dec 31 15:59:46 1969 PST
@@ -106,8 +106,8 @@ hundred|datetime |timespan |plus
106106
|Sun Dec 31 17:32:01 2000 PST|@ 5 mons 12 hours |Fri Jun 01 06:32:01 2001 PDT
107107
|Mon Jan 01 17:32:01 2001 PST|@ 5 mons |Fri Jun 01 18:32:01 2001 PDT
108108
|Mon Jan 01 17:32:01 2001 PST|@ 5 mons 12 hours |Sat Jun 02 06:32:01 2001 PDT
109-
|Thu Feb 29 17:32:01 1996 PST|@ 6 years |Thu Feb 28 17:32:01 2002 PST
110109
|Wed Feb 28 17:32:01 1996 PST|@ 6 years |Thu Feb 28 17:32:01 2002 PST
110+
|Thu Feb 29 17:32:01 1996 PST|@ 6 years |Thu Feb 28 17:32:01 2002 PST
111111
|Fri Mar 01 17:32:01 1996 PST|@ 6 years |Fri Mar 01 17:32:01 2002 PST
112112
|Mon Dec 30 17:32:01 1996 PST|@ 6 years |Mon Dec 30 17:32:01 2002 PST
113113
|Tue Dec 31 17:32:01 1996 PST|@ 6 years |Tue Dec 31 17:32:01 2002 PST
@@ -116,8 +116,8 @@ hundred|datetime |timespan |plus
116116
|Sat Jan 01 17:32:01 2000 PST|@ 6 years |Sun Jan 01 17:32:01 2006 PST
117117
|Sun Dec 31 17:32:01 2000 PST|@ 6 years |Sun Dec 31 17:32:01 2006 PST
118118
|Mon Jan 01 17:32:01 2001 PST|@ 6 years |Mon Jan 01 17:32:01 2007 PST
119-
|Thu Feb 29 17:32:01 1996 PST|@ 34 years |Thu Feb 28 17:32:01 2030 PST
120119
|Wed Feb 28 17:32:01 1996 PST|@ 34 years |Thu Feb 28 17:32:01 2030 PST
120+
|Thu Feb 29 17:32:01 1996 PST|@ 34 years |Thu Feb 28 17:32:01 2030 PST
121121
|Fri Mar 01 17:32:01 1996 PST|@ 34 years |Fri Mar 01 17:32:01 2030 PST
122122
|Mon Dec 30 17:32:01 1996 PST|@ 34 years |Mon Dec 30 17:32:01 2030 PST
123123
|Tue Dec 31 17:32:01 1996 PST|@ 34 years |Tue Dec 31 17:32:01 2030 PST
@@ -130,12 +130,12 @@ hundred|datetime |timespan |plus
130130
QUERY: SELECT '' AS hundred, d.f1 AS datetime, t.f1 AS timespan, d.f1 - t.f1 AS minus
131131
FROM TEMP_DATETIME d, TIMESPAN_TBL t
132132
WHERE isfinite(d.f1)
133-
ORDER BY minus;
133+
ORDER BY minus, datetime, timespan;
134134
hundred|datetime |timespan |minus
135135
-------+----------------------------+-----------------------------+----------------------------
136136
|epoch |@ 34 years |Tue Dec 31 16:00:00 1935 PST
137-
|Thu Feb 29 17:32:01 1996 PST|@ 34 years |Wed Feb 28 17:32:01 1962 PST
138137
|Wed Feb 28 17:32:01 1996 PST|@ 34 years |Wed Feb 28 17:32:01 1962 PST
138+
|Thu Feb 29 17:32:01 1996 PST|@ 34 years |Wed Feb 28 17:32:01 1962 PST
139139
|Fri Mar 01 17:32:01 1996 PST|@ 34 years |Thu Mar 01 17:32:01 1962 PST
140140
|Mon Dec 30 17:32:01 1996 PST|@ 34 years |Sun Dec 30 17:32:01 1962 PST
141141
|Tue Dec 31 17:32:01 1996 PST|@ 34 years |Mon Dec 31 17:32:01 1962 PST
@@ -152,8 +152,8 @@ hundred|datetime |timespan |minus
152152
|epoch |@ 5 hours |Wed Dec 31 11:00:00 1969 PST
153153
|epoch |@ 1 min |Wed Dec 31 15:59:00 1969 PST
154154
|epoch |@ 14 secs ago |Wed Dec 31 16:00:14 1969 PST
155-
|Thu Feb 29 17:32:01 1996 PST|@ 6 years |Wed Feb 28 17:32:01 1990 PST
156155
|Wed Feb 28 17:32:01 1996 PST|@ 6 years |Wed Feb 28 17:32:01 1990 PST
156+
|Thu Feb 29 17:32:01 1996 PST|@ 6 years |Wed Feb 28 17:32:01 1990 PST
157157
|Fri Mar 01 17:32:01 1996 PST|@ 6 years |Thu Mar 01 17:32:01 1990 PST
158158
|Mon Dec 30 17:32:01 1996 PST|@ 6 years |Sun Dec 30 17:32:01 1990 PST
159159
|Tue Dec 31 17:32:01 1996 PST|@ 6 years |Mon Dec 31 17:32:01 1990 PST
@@ -189,8 +189,8 @@ hundred|datetime |timespan |minus
189189
|Mon Dec 30 17:32:01 1996 PST|@ 5 mons |Tue Jul 30 18:32:01 1996 PDT
190190
|Tue Dec 31 17:32:01 1996 PST|@ 5 mons 12 hours |Wed Jul 31 06:32:01 1996 PDT
191191
|Tue Dec 31 17:32:01 1996 PST|@ 5 mons |Wed Jul 31 18:32:01 1996 PDT
192-
|Tue Dec 31 17:32:01 1996 PST|@ 3 mons |Mon Sep 30 18:32:01 1996 PDT
193192
|Mon Dec 30 17:32:01 1996 PST|@ 3 mons |Mon Sep 30 18:32:01 1996 PDT
193+
|Tue Dec 31 17:32:01 1996 PST|@ 3 mons |Mon Sep 30 18:32:01 1996 PDT
194194
|Mon Dec 30 17:32:01 1996 PST|@ 10 days |Fri Dec 20 17:32:01 1996 PST
195195
|Tue Dec 31 17:32:01 1996 PST|@ 10 days |Sat Dec 21 17:32:01 1996 PST
196196
|Mon Dec 30 17:32:01 1996 PST|@ 1 day 2 hours 3 mins 4 secs|Sun Dec 29 15:28:57 1996 PST

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -98,31 +98,31 @@ six|f1 | dist
9898
QUERY: SET geqo TO 'off';
9999
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
101-
ORDER BY dist;
101+
ORDER BY dist, point1 using <<, point2 using <<;
102102
thirtysix|point1 |point2 | dist
103103
---------+----------+----------+----------------
104-
|(10,10) |(10,10) | 0
104+
|(-10,0) |(-10,0) | 0
105105
|(-5,-12) |(-5,-12) | 0
106-
|(5.1,34.5)|(5.1,34.5)| 0
107106
|(-3,4) |(-3,4) | 0
108-
|(-10,0) |(-10,0) | 0
109107
|(0,0) |(0,0) | 0
110-
|(0,0) |(-3,4) | 5
108+
|(5.1,34.5)|(5.1,34.5)| 0
109+
|(10,10) |(10,10) | 0
111110
|(-3,4) |(0,0) | 5
111+
|(0,0) |(-3,4) | 5
112112
|(-10,0) |(-3,4) |8.06225774829855
113113
|(-3,4) |(-10,0) |8.06225774829855
114114
|(-10,0) |(0,0) | 10
115115
|(0,0) |(-10,0) | 10
116-
|(-5,-12) |(0,0) | 13
117116
|(-10,0) |(-5,-12) | 13
118-
|(0,0) |(-5,-12) | 13
119117
|(-5,-12) |(-10,0) | 13
120-
|(10,10) |(0,0) | 14.142135623731
118+
|(-5,-12) |(0,0) | 13
119+
|(0,0) |(-5,-12) | 13
121120
|(0,0) |(10,10) | 14.142135623731
122-
|(10,10) |(-3,4) |14.3178210632764
121+
|(10,10) |(0,0) | 14.142135623731
123122
|(-3,4) |(10,10) |14.3178210632764
124-
|(-3,4) |(-5,-12) |16.1245154965971
123+
|(10,10) |(-3,4) |14.3178210632764
125124
|(-5,-12) |(-3,4) |16.1245154965971
125+
|(-3,4) |(-5,-12) |16.1245154965971
126126
|(-10,0) |(10,10) |22.3606797749979
127127
|(10,10) |(-10,0) |22.3606797749979
128128
|(5.1,34.5)|(10,10) |24.9851956166046
@@ -131,8 +131,8 @@ thirtysix|point1 |point2 | dist
131131
|(10,10) |(-5,-12) |26.6270539113887
132132
|(-3,4) |(5.1,34.5)|31.5572495632937
133133
|(5.1,34.5)|(-3,4) |31.5572495632937
134-
|(5.1,34.5)|(0,0) |34.8749193547455
135134
|(0,0) |(5.1,34.5)|34.8749193547455
135+
|(5.1,34.5)|(0,0) |34.8749193547455
136136
|(-10,0) |(5.1,34.5)|37.6597928831267
137137
|(5.1,34.5)|(-10,0) |37.6597928831267
138138
|(-5,-12) |(5.1,34.5)|47.5842410888311

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

+24-24
Original file line numberDiff line numberDiff line change
@@ -238,66 +238,66 @@ cim | 30
238238
linda | 19
239239
(58 rows)
240240

241-
QUERY: SELECT p.name, p.age FROM person* p ORDER BY age using >;
241+
QUERY: SELECT p.name, p.age FROM person* p ORDER BY age using >, name;
242242
name |age
243243
-------+---
244-
zena | 98
245244
esther | 98
246245
louise | 98
247-
trisha | 88
246+
zena | 98
247+
bertha | 88
248248
koko | 88
249+
martie | 88
249250
sarah | 88
251+
trisha | 88
250252
trudy | 88
251-
martie | 88
252-
bertha | 88
253-
vera | 78
254-
sharon | 78
255253
carmen | 78
256254
chris | 78
255+
sharon | 78
257256
susan | 78
257+
vera | 78
258258
wendy | 78
259+
julie | 68
259260
leah | 68
260-
velma | 68
261261
paula | 68
262-
julie | 68
262+
velma | 68
263263
larry | 60
264-
juanita| 58
264+
carina | 58
265265
jane | 58
266+
juanita| 58
266267
zola | 58
267-
carina | 58
268268
sue | 50
269-
rean | 48
270269
karen | 48
271270
pamela | 48
271+
rean | 48
272272
mike | 40
273273
belinda| 38
274-
teresa | 38
275-
liza | 38
276274
jenifer| 38
277-
sumi | 38
275+
liza | 38
278276
sandy | 38
277+
sumi | 38
278+
teresa | 38
279279
sally | 34
280-
cim | 30
281280
alex | 30
281+
cim | 30
282282
sam | 30
283-
nan | 28
284283
fred | 28
285284
jean | 28
286285
melissa| 28
287-
sharon | 25
286+
nan | 28
288287
lita | 25
288+
sharon | 25
289289
denise | 24
290290
jeff | 23
291-
joe | 20
292291
bill | 20
293-
sandra | 19
292+
joe | 20
294293
linda | 19
295-
gina | 18
296-
pat | 18
294+
sandra | 19
297295
diane | 18
298-
joan | 18
299296
edna | 18
300-
mary | 8
297+
gina | 18
298+
joan | 18
299+
pat | 18
301300
fanny | 8
301+
mary | 8
302302
(58 rows)
303303

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ WARN:Bad abstime external representation 'bad time specifications'
1515
QUERY: INSERT INTO TINTERVAL_TBL (f1)
1616
VALUES ('["" "infinity"]');
1717
WARN:Bad abstime external representation ''
18-
QUERY: SELECT '' AS seven, TINTERVAL_TBL.*;
19-
seven|f1
20-
-----+---------------------------------------------------------------
21-
|["-infinity" "infinity"]
22-
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
23-
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
24-
|["epoch" "Mon May 01 00:30:30 1995 PDT"]
25-
|["Thu Feb 15 12:15:03 1990 PST" "current"]
18+
QUERY: SELECT '' AS five, TINTERVAL_TBL.*;
19+
five|f1
20+
----+---------------------------------------------------------------
21+
|["-infinity" "infinity"]
22+
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
23+
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
24+
|["epoch" "Mon May 01 00:30:30 1995 PDT"]
25+
|["Thu Feb 15 12:15:03 1990 PST" "current"]
2626
(5 rows)
2727

2828
QUERY: SELECT '' AS one, t.*
@@ -98,10 +98,10 @@ QUERY: SELECT '' AS five, t1.f1, t2.f1
9898
five|f1 |f1
9999
----+---------------------------------------------------------------+---------------------------------------------------------------
100100
|["-infinity" "infinity"] |["-infinity" "infinity"]
101-
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
102101
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
103102
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["epoch" "Mon May 01 00:30:30 1995 PDT"]
104103
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
104+
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
105105
(5 rows)
106106

107107
QUERY: SELECT '' AS fourteen, t1.f1 AS interval1, t2.f1 AS interval2
@@ -115,15 +115,15 @@ fourteen|interval1 |interva
115115
|["-infinity" "infinity"] |["epoch" "Mon May 01 00:30:30 1995 PDT"]
116116
|["-infinity" "infinity"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
117117
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["-infinity" "infinity"]
118-
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
119118
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["-infinity" "infinity"]
120-
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["-infinity" "infinity"]
121-
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
122119
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["-infinity" "infinity"]
120+
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["-infinity" "infinity"]
121+
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
123122
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["epoch" "Mon May 01 00:30:30 1995 PDT"]
123+
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
124+
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
124125
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["epoch" "Mon May 01 00:30:30 1995 PDT"]
125126
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["epoch" "Mon May 01 00:30:30 1995 PDT"]
126-
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
127127
(14 rows)
128128

129129
QUERY: SELECT '' AS five, t1.f1
@@ -133,9 +133,9 @@ QUERY: SELECT '' AS five, t1.f1
133133
ORDER BY t1.f1;
134134
five|f1
135135
----+---------------------------------------------------------------
136-
|["Thu Feb 15 12:15:03 1990 PST" "current"]
137-
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
138136
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
137+
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
138+
|["Thu Feb 15 12:15:03 1990 PST" "current"]
139139
(3 rows)
140140

141141
QUERY: SELECT '' AS three, t1.f1

0 commit comments

Comments
 (0)