8000 Merge remote-tracking branch 'apache/main' into prep-37 · apache/datafusion@1b611ea · GitHub
[go: up one dir, main page]
Skip to content

Commit 1b611ea

Browse files
andygroveandygrove
committed
Merge remote-tracking branch 'apache/main' into prep-37
2 parents ab1e0a1 + 6f9948b commit 1b611ea

File tree

158 files changed

+5799
-3497
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+5799
-3497
lines changed

‎.github/workflows/pr_benchmarks.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
cd benchmarks
2929
mkdir data
3030
31-
# Setup the TPC-H data set with a scale factor of 10
31+
# Setup the TPC-H data sets for scale factors 1 and 10
3232
./bench.sh data tpch
33-
33+
./bench.sh data tpch10
34+
3435
- name: Generate unique result names
3536
run: |
3637
echo "HEAD_LONG_SHA=$(git log -1 --format='%H')" >> "$GITHUB_ENV"
@@ -44,6 +45,9 @@ jobs:
4445
cd benchmarks
4546
4647
./bench.sh run tpch
48+
./bench.sh run tpch_mem
49+
./bench.sh run tpch10
50+
./bench.sh run tpch_mem10
4751
4852
# For some reason this step doesn't seem to propagate the env var down into the script
4953
if [ -d "results/HEAD" ]; then
@@ -64,6 +68,9 @@ jobs:
6468
cd benchmarks
6569
6670
./bench.sh run tpch
71+
./bench.sh run tpch_mem
72+
./bench.sh run tpch10
73+
./bench.sh run tpch_mem10
6774
6875
echo ${{ github.event.issue.number }} > pr
6976

‎benchmarks/bench.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ run_tpch() {
314314
fi
315315
TPCH_DIR="${DATA_DIR}/tpch_sf${SCALE_FACTOR}"
316316

317-
RESULTS_FILE="${RESULTS_DIR}/tpch.json"
317+
RESULTS_FILE="${RESULTS_DIR}/tpch_sf${SCALE_FACTOR}.json"
318318
echo "RESULTS_FILE: ${RESULTS_FILE}"
319319
echo "Running tpch benchmark..."
320320
$CARGO_COMMAND --bin tpch -- benchmark datafusion --iterations 5 --path "${TPCH_DIR}" --format parquet -o ${RESULTS_FILE}
@@ -329,7 +329,7 @@ run_tpch_mem() {
329329
fi
330330
TPCH_DIR="${DATA_DIR}/tpch_sf${SCALE_FACTOR}"
331331

332-
RESULTS_FILE="${RESULTS_DIR}/tpch_mem.json"
332+
RESULTS_FILE="${RESULTS_DIR}/tpch_mem_sf${SCALE_FACTOR}.json"
333333
echo "RESULTS_FILE: ${RESULTS_FILE}"
334334
echo "Running tpch_mem benchmark..."
335335
# -m means in memory

0 commit comments

Comments
 (0)
0