Skip to content

Commit e35e881

Browse files
df7cbdf7cb
committed
Rehash regression output files
1 parent 17e6685 commit e35e881

File tree

7 files changed

+3217
-2606
lines changed

7 files changed

+3217
-2606
lines changed

‎expected/convert.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,20 @@ WITH
129129
l(u) AS (VALUES
130130
('s'),
131131
('min'),
132-
('h'),
132+
('hr'),
133133
('d'),
134134
('julianyear'))
135135
SELECT
136136
l1.u, l2.u, l1.u::unit @ l2.u
137137
FROM
138138
l l1 CROSS JOIN l l2
139139
\crosstabview
140-
u | s | min | h | d | julianyear
141-
------------+------------+------------------------+------------------------+------------------------+---------------------------------
142-
s | 1 s | 0.0166666666666667 min | 0.000277777777777778 h | 1.15740740740741e-05 d | 3.16880878140289e-08 julianyear
143-
min | 60 s | 1 min | 0.0166666666666667 h | 0.000694444444444444 d | 1.90128526884174e-06 julianyear
144-
h | 3600 s | 60 min | 1 h | 0.0416666666666667 d | 0.000114077116130504 julianyear
145-
d | 86400 s | 1440 min | 24 h | 1 d | 0.0027378507871321 julianyear
146-
julianyear | 31557600 s | 525960 min | 8766 h | 365.25 d | 1 julianyear
140+
u | s | min | hr | d | julianyear
141+
------------+------------+------------------------+-------------------------+------------------------+---------------------------------
142+
s | 1 s | 0.0166666666666667 min | 0.000277777777777778 hr | 1.15740740740741e-05 d | 3.16880878140289e-08 julianyear
143+
min | 60 s | 1 min | 0.0166666666666667 hr | 0.000694444444444444 d | 1.90128526884174e-06 julianyear
144+
hr | 3600 s | 60 min | 1 hr | 0.0416666666666667 d | 0.000114077116130504 julianyear
145+
d | 86400 s | 1440 min | 24 hr | 1 d | 0.0027378507871321 julianyear
146+
julianyear | 31557600 s | 525960 min | 8766 hr | 365.25 d | 1 julianyear
147147
(5 rows)
148148

‎expected/crosstab.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ WHERE
285285
a | 1e-22 m^2 | 1e-19 m^2 | 1e-16 m^2 | 1e-13 m^2 | 1 Pa | 1e-07 m^2 | 0.0001 m^2 | 0.0001 m^2 | 0.1 m^2 | 1 m^2 | 86.4 ks | 100 m^2 | 1000 m^2 | 10000 m^2 | 100000 m^2 | 100000000 m^2 | 100000000000 m^2 | 100000000000000 m^2 | 1 Pa | 1e+20 m^2 | 1e+23 m^2 | 1e+26 m^2
286286
l | 1e-27 m^3 | 1e-24 m^3 | 1e-21 m^3 | 1e-18 m^3 | 1e-15 m^3 | 1e-12 m^3 | 1e-09 m^3 | 1e-09 m^3 | 1e-06 m^3 | 1e-05 m^3 | 0.0001 m^3 | 0.001 m^3 | 0.01 m^3 | 0.1 m^3 | 1 m^3 | 1000 m^3 | 1000000 m^3 | 1000000000 m^3 | 1000000000000 m^3 | 1e+15 m^3 | 1e+18 m^3 | 1e+21 m^3
287287
t | 1 ag | 1 fg | 98.0665 kPa | 304.8 mm | 0.000473176473 m^3 | 1 N | 1 g | 1 g | 1 kg | 200 mg | 100 kg | 1 Mg | | 100 Mg | 1 Gg | 1 Tg | 1 Pg | 1 Eg | 1 Zg | 1 Yg | 1e+24 kg | 1e+27 kg
288-
bar | 100 zPa | 100 aPa | 100 fPa | 100 pPa | 100 nPa | 100 µPa | 100 mPa | 100 mPa | 100 Pa | 1 kPa | 10 kPa | 100 kPa | 1 MPa | 1.05457180005237e-34 m^2*kg/s | 100 MPa | 100 GPa | 100 TPa | 100 PPa | 100 EPa | 100 ZPa | 100 YPa | 1e+29 Pa
288+
bar | 100 zPa | 100 aPa | 100 fPa | 100 pPa | 100 nPa | 100 µPa | 100 mPa | 100 mPa | 100 Pa | 1 kPa | 10 kPa | 100 kPa | 1 MPa | 1.05457181764616e-34 m^2*kg/s | 100 MPa | 100 GPa | 100 TPa | 100 PPa | 100 EPa | 100 ZPa | 100 YPa | 1e+29 Pa
289289
min | 60 ys | 60 zs | 60 as | 60 fs | 60 ps | 60 ns | 60 µs | 60 µs | 60 ms | 600 ms | 6 s | 60 s | 600 s | 6 ks | 60 ks | 60 Ms | 60 Gsec | 60 Ts | 60 Ps | 60 Es | 60 Zs | 60 Ys
290-
h | 3.6 zs | 3.6 as | 3.6 fs | 3.6 ps | 10 klx | 3.6 µs | 3.6 ms | 3.6 ms | 1 mH | 20.1168 m | 360 s | 3.6 ks | 36 ks | 360 ks | 3.6 Ms | 3.6 Gsec | 3.6 Ts | 3.6 Ps | 3.6 Es | 3.6 Zs | 3.6 Ys | 3.6e+27 s
290+
hr | 3.6 zs | 3.6 as | 3.6 fs | 3.6 ps | 3.6 ns | 3.6 µs | 3.6 ms | 3.6 ms | 3.6 s | 36 s | 360 s | 3.6 ks | 36 ks | 360 ks | 3.6 Ms | 3.6 Gsec | 3.6 Ts | 3.6 Ps | 3.6 Es | 3.6 Zs | 3.6 Ys | 3.6e+27 s
291291
d | 914.4 mm | 86.4 as | 86.4 fs | 86.4 ps | 86.4 ns | 86.4 µs | 86.4 ms | 86.4 ms | 86.4 s | 1 cd | 8.64 ks | 86.4 ks | 864 ks | 0.238480942392 m^3 | 86.4 Ms | 86.4 Gsec | 86.4 Ts | 86.4 Ps | 86.4 Es | 86.4 Zs | 86.4 Ys | 8.64e+28 s
292292
in | 2.54e-26 m | 25.4 ym | 25.4 zm | 25.4 am | 0.020457405 m^3 | 25.4 pm | 25.4 nm | 25.4 nm | 60 s | 254 µm | 2.54 mm | 25.4 mm | 254 mm | 2.54 m | 600 g | 25.4 km | 25.4 Mm | 25.4 Gm | 25.4 Tm | 25.4 Pm | 25.4 Em | 25.4 Zm
293293
ft | 3.048e-25 m | 304.8 ym | 304.8 zm | 304.8 am | 304.8 fm | 304.8 pm | 304.8 nm | 304.8 nm | 304.8 µm | 3.048 mm | 30.48 mm | 304.8 mm | 3.048 m | 30.48 m | 304.8 m | 304.8 km | 304.8 Mm | 304.8 Gm | 304.8 Tm | 304.8 Pm | 304.8 Em | 304.8 Zm

‎expected/round.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ SELECT '1|3m'::unit, '25m'::unit @ 'ft', '25m'::unit @@ 'ft';
2525

2626
SET extra_float_digits = 3;
2727
SELECT '1|3m'::unit, '25m'::unit @ 'ft', '25m'::unit @@ 'ft';
28-
unit | ?column? | ?column?
29-
------------------------+------------------------+---------------------
30-
333.333333333333314 mm | 82.0209973753280792 ft | 82.0209973753280792
28+
unit | ?column? | ?column?
29+
------------------------+------------------------+-------------------
30+
333.333333333333314 mm | 82.0209973753280792 ft | 82.02099737532808
3131
(1 row)
3232

3333
SET extra_float_digits = -3;

‎expected/tables.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ SELECT * FROM units;
6262
t | 1 Mg | f | f | f
6363
bar | 100 kPa | f | f | f
6464
min | 00:01:00 s | f | f | f
65-
h | 01:00:00 s | f | f | f
65+
hr | 01:00:00 s | f | f | f
6666
d | 1 d | f | f | f
6767
in | 25.4 mm | f | f | f
6868
ft | 304.8 mm | f | f | f

‎expected/time.out

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,11 @@ SELECT '1.1 d'::unit; -- needs ULP clamping
163163
SELECT name, unit, definition FROM unit_units WHERE dimension(unit) = 'TIME' ORDER BY unit, name COLLATE "C";
164164
name | unit | definition
165165
------------------+-----------------------------------------------+-----------------------------------------------
166-
plancktime | 5.39105895420117e-44 s | hbar / planckmass c^2
167-
t_P | 5.39105895420117e-44 s | plancktime
168-
atomictime | 24.188843266026 as | hbar^3/coulombconst^2 atomicmass e^4
166+
plancktime | 5.3912464483136e-44 s | hbar / planckmass c^2
167+
t_P | 5.3912464483136e-44 s | plancktime
168+
plancktime_red | 2.70277015656937e-43 s | hbar / planckmass_red c^2
169+
atomictime | 24.1888432657895 as | atomicaction / atomicenergy
170+
natural_time | 658.211956950907 as | hbar / eV
169171
svedberg | 100 fs | 1e-13 s
170172
㎰ | 1 ps | ps
171173
㎱ | 1 ns | ns
@@ -196,7 +198,6 @@ SELECT name, unit, definition FROM unit_units WHERE dimension(unit) = 'TIME' ORD
196198
bell | 00:30:00 s | 1|8 watch
197199
lunour | 00:59:03.67055555555 s | 1|24 lune
198200
siderealhour | 00:59:50.17043916667 s | 1|24 siderealday
199-
h | 01:00:00 s | hour
200201
hour | 01:00:00 s | 60 min
201202
hr | 01:00:00 s | hour
202203
decimalhour | 02:24:00 s | 1|10 day
@@ -263,7 +264,7 @@ SELECT name, unit, definition FROM unit_units WHERE dimension(unit) = 'TIME' ORD
263264
millennia | 1000 commonyear + 242 d + 04:46:14.6784 s | millennium
264265
millennium | 1000 commonyear + 242 d + 04:46:14.6784 s | 1000 years
265266
cron | 1.00066e+06 commonyear + 203 d + 18:44:38.4 s | 1e6 years
266-
(100 rows)
267+
(101 rows)
267268

268269
-- units that differ when pushed through output-input functions
269270
-- (same test as in units.sql, but with time_output_custom = true)

‎expected/unit.out

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,21 +316,18 @@ ORDER BY lower(p) COLLATE "C", lower(u) COLLATE "C";
316316
---+-----+-------------------------------
317317
a | t | 98.0665 kPa
318318
c | d | 1 cd
319-
c | h | 20.1168 m
320319
d | a | 1 d
321320
f | t | 304.8 mm
322321
G | s | 100 µT
323-
h | bar | 1.05457180005237e-34 m^2*kg/s
322+
h | bar | 1.05457181764616e-34 m^2*kg/s
324323
h | d | 0.238480942392 m^3
325324
k | in | 600 g
326-
m | h | 1 mH
327325
m | in | 00:01:00 s
328326
n | t | 1 N
329327
P | a | 1 Pa
330328
p | a | 1 Pa
331-
p | h | 10 klx
332329
p | in | 0.020457405 m^3
333330
p | t | 0.000473176473 m^3
334331
y | d | 914.4 mm
335-
(18 rows)
332+
(15 rows)
336333

0 commit comments

Comments
 (0)