Skip to content

Commit df5674c

Browse files
derhuerstderhuerst
committed
tweak benchmark setup ⚡️
- Improve the UX by un-quoting the individual *.sql files and moving the `bench()` call to index.sql. - Include the *.sql filename in the output CSV. - Make psql stop on the first error.
1 parent 3ed31d0 commit df5674c

23 files changed

+125
-152
lines changed

‎benchmark/arrs_deps_by_non_existent_stop.sql‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
SELECT * from bench(
2-
'SELECT count(*)
1+
SELECT count(*)
32
FROM arrivals_departures
4-
WHERE stop_id = ''definitely-non-existent'''
5-
);
3+
WHERE stop_id = 'definitely-non-existent'

‎benchmark/arrs_deps_by_route_name_and_time.sql‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
SELECT * from bench(
2-
'SELECT *
1+
SELECT *
32
FROM arrivals_departures
4-
WHERE route_short_name = ''S1''
5-
AND t_departure >= ''2022-08-09T07:10+02'' AND t_departure <= ''2022-08-09T07:30+02''
6-
AND date >= dates_filter_min(''2022-08-09T07:10+02'')
7-
AND date <= dates_filter_max(''2022-08-09T07:30+02'')'
8-
);
3+
WHERE route_short_name = 'S1'
4+
AND t_departure >= '2022-08-09T07:10+02' AND t_departure <= '2022-08-09T07:30+02'
5+
AND date >= dates_filter_min('2022-08-09T07:10+02')
6+
AND date <= dates_filter_max('2022-08-09T07:30+02')

‎benchmark/arrs_deps_by_station_and_time.sql‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
SELECT * from bench(
2-
'SELECT *
1+
SELECT *
32
FROM arrivals_departures
4-
WHERE station_id = ''de:11000:900100001'' -- S+U Friedrichstr. (Berlin)
5-
AND t_departure >= ''2022-08-09T07:10+02'' AND t_departure <= ''2022-08-09T07:30+02''
6-
AND date >= dates_filter_min(''2022-08-09T07:10+02'')
7-
AND date <= dates_filter_max(''2022-08-09T07:30+02'')',
8-
40
9-
);
3+
WHERE station_id = 'de:11000:900100001' -- S+U Friedrichstr. (Berlin)
4+
AND t_departure >= '2022-08-09T07:10+02' AND t_departure <= '2022-08-09T07:30+02'
5+
AND date >= dates_filter_min('2022-08-09T07:10+02')
6+
AND date <= dates_filter_max('2022-08-09T07:30+02')

‎benchmark/arrs_deps_by_station_and_time_seq_0.sql‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
SELECT * from bench(
2-
'SELECT *
1+
SELECT *
32
FROM arrivals_departures
4-
WHERE station_id = ''de:11000:900100001'' -- S+U Friedrichstr. (Berlin)
5-
AND t_departure >= ''2022-08-09T07:10+02'' AND t_departure <= ''2022-08-09T07:30+02''
6-
AND date >= dates_filter_min(''2022-08-09T07:10+02'')
7-
AND date <= dates_filter_max(''2022-08-09T07:30+02'')
8-
AND stop_sequence = 0',
9-
50
10-
);
3+
WHERE station_id = 'de:11000:900100001' -- S+U Friedrichstr. (Berlin)
4+
AND t_departure >= '2022-08-09T07:10+02' AND t_departure <= '2022-08-09T07:30+02'
5+
AND date >= dates_filter_min('2022-08-09T07:10+02')
6+
AND date <= dates_filter_max('2022-08-09T07:30+02')
7+
AND stop_sequence = 0

‎benchmark/arrs_deps_by_stop.sql‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
SELECT * from bench(
2-
'SELECT count(*)
1+
SELECT count(*)
32
FROM arrivals_departures
4-
WHERE stop_id = ''de:11000:900100001::4'' -- S+U Friedrichstr. (Berlin)'
5-
);
3+
WHERE stop_id = 'de:11000:900100001::4' -- S+U Friedrichstr. (Berlin)

‎benchmark/arrs_deps_by_stop_and_time.sql‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
SELECT * from bench(
2-
'SELECT *
1+
SELECT *
32
FROM arrivals_departures
4-
WHERE stop_id = ''de:11000:900100001::4'' -- S+U Friedrichstr. (Berlin)
5-
AND t_departure >= ''2022-08-09T07:10+02'' AND t_departure <= ''2022-08-09T07:30+02''
6-
AND date >= dates_filter_min(''2022-08-09T07:10+02'')
7-
AND date <= dates_filter_max(''2022-08-09T07:30+02'')'
8-
);
3+
WHERE stop_id = 'de:11000:900100001::4' -- S+U Friedrichstr. (Berlin)
4+
AND t_departure >= '2022-08-09T07:10+02' AND t_departure <= '2022-08-09T07:30+02'
5+
AND date >= dates_filter_min('2022-08-09T07:10+02')
6+
AND date <= dates_filter_max('2022-08-09T07:30+02')

‎benchmark/arrs_deps_by_time.sql‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
SELECT * from bench(
2-
'SELECT *
1+
SELECT *
32
FROM arrivals_departures
4-
WHERE t_departure >= ''2022-08-09T07:10+02'' AND t_departure <= ''2022-08-09T07:30+02''
5-
AND date >= dates_filter_min(''2022-08-09T07:10+02''::timestamp with time zone)
6-
AND date <= dates_filter_max(''2022-08-09T07:30+02''::timestamp with time zone)',
7-
10
8-
);
3+
WHERE t_departure >= '2022-08-09T07:10+02' AND t_departure <= '2022-08-09T07:30+02'
4+
AND date >= dates_filter_min('2022-08-09T07:10+02'::timestamp with time zone)
5+
AND date <= dates_filter_max('2022-08-09T07:30+02'::timestamp with time zone)

‎benchmark/arrs_deps_by_time_manual.sql‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
SELECT * from bench(
2-
'SELECT *
1+
SELECT *
32
FROM arrivals_departures
4-
WHERE t_departure >= ''2022-08-09T07:10+02'' AND t_departure <= ''2022-08-09T07:30+02''
5-
AND date >= ''2022-08-08''
6-
AND date <= ''2022-08-09''',
7-
10
8-
);
3+
WHERE t_departure >= '2022-08-09T07:10+02' AND t_departure <= '2022-08-09T07:30+02'
4+
AND date >= '2022-08-08'
5+
AND date <= '2022-08-09'

‎benchmark/arrs_deps_by_trip_and_date.sql‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
SELECT * from bench(
2-
'SELECT *
1+
SELECT *
32
FROM arrivals_departures
4-
WHERE trip_id = ''168977951''
5-
AND date > ''2022-08-08'' AND date <= ''2022-08-09'''
6-
);
3+
WHERE trip_id = '168977951'
4+
AND date > '2022-08-08' AND date <= '2022-08-09'

‎benchmark/as-md.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pipeline(
1515
if (firstRow) {
1616
firstRow = false
1717

18-
const keys = Object.keys(row)
18+
const keys = Object.keys(row).filter(key => key !== 'filename')
1919
process.stdout.write(`| ${keys.join(' | ')} |\n`)
2020
process.stdout.write(`| ${keys.map(_ => '-').join(' | ')} |\n`)
2121
}

0 commit comments

Comments
 (0)