Skip to content

Commit 9a5a3b0

Browse files
committed
Specify tpch data for all formats, add error checking
1 parent 1790863 commit 9a5a3b0

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

benchmarks/bench.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ main() {
189189
echo "***************************"
190190
case "$BENCHMARK" in
191191
all)
192-
data_tpch "1"
193-
data_tpch "10"
192+
data_tpch "1" "parquet"
193+
data_tpch "10" "parquet"
194194
data_h2o "SMALL"
195195
data_h2o "MEDIUM"
196196
data_h2o "BIG"
@@ -293,19 +293,19 @@ main() {
293293
;;
294294
external_aggr)
295295
# same data as for tpch
296-
data_tpch "1"
296+
data_tpch "1" "parquet"
297297
;;
298298
sort_tpch)
299299
# same data as for tpch
300-
data_tpch "1"
300+
data_tpch "1" "parquet"
301301
;;
302302
sort_tpch10)
303303
# same data as for tpch10
304-
data_tpch "10"
304+
data_tpch "10" "parquet"
305305
;;
306306
topk_tpch)
307307
# same data as for tpch
308-
data_tpch "1"
308+
data_tpch "1" "parquet"
309309
;;
310310
nlj)
311311
# nlj uses range() function, no data generation needed
@@ -316,7 +316,7 @@ main() {
316316
echo "HJ benchmark does not require data generation"
317317
;;
318318
compile_profile)
319-
data_tpch "1"
319+
data_tpch "1" "parquet"
320320
;;
321321
*)
322322
echo "Error: unknown benchmark '$BENCHMARK' for data generation"
@@ -545,6 +545,10 @@ data_tpch() {
545545
exit 1
546546
fi
547547
FORMAT=$2
548+
if [ -z "$FORMAT" ] ; then
549+
echo "Internal error: Format not specified"
550+
exit 1
551+
fi
548552

549553
TPCH_DIR="${DATA_DIR}/tpch_sf${SCALE_FACTOR}"
550554
echo "Creating tpch $FORMAT dataset at Scale Factor ${SCALE_FACTOR} in ${TPCH_DIR}..."

0 commit comments

Comments
 (0)