Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into feature/9835
Browse files Browse the repository at this point in the history
# Conflicts:
#	datafusion/expr/src/built_in_function.rs
#	datafusion/functions/src/unicode/mod.rs
#	datafusion/physical-expr/src/unicode_expressions.rs
  • Loading branch information
Omega359 committed Mar 28, 2024
2 parents d3fac7b + b6915f5 commit 5ae5f84
Show file tree
Hide file tree
Showing 52 changed files with 872 additions and 170 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/pr_benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ jobs:
cd benchmarks
mkdir data
# Setup the TPC-H data set with a scale factor of 10
# Setup the TPC-H data sets for scale factors 1 and 10
./bench.sh data tpch
./bench.sh data tpch10
- name: Generate unique result names
run: |
echo "HEAD_LONG_SHA=$(git log -1 --format='%H')" >> "$GITHUB_ENV"
Expand All @@ -44,6 +45,9 @@ jobs:
cd benchmarks
./bench.sh run tpch
./bench.sh run tpch_mem
./bench.sh run tpch10
./bench.sh run tpch_mem10
# For some reason this step doesn't seem to propagate the env var down into the script
if [ -d "results/HEAD" ]; then
Expand All @@ -64,6 +68,9 @@ jobs:
cd benchmarks
./bench.sh run tpch
./bench.sh run tpch_mem
./bench.sh run tpch10
./bench.sh run tpch_mem10
echo ${{ github.event.issue.number }} > pr
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/bench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ run_tpch() {
fi
TPCH_DIR="${DATA_DIR}/tpch_sf${SCALE_FACTOR}"

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

RESULTS_FILE="${RESULTS_DIR}/tpch_mem.json"
RESULTS_FILE="${RESULTS_DIR}/tpch_mem_sf${SCALE_FACTOR}.json"
echo "RESULTS_FILE: ${RESULTS_FILE}"
echo "Running tpch_mem benchmark..."
# -m means in memory
Expand Down
Loading

0 comments on commit 5ae5f84

Please sign in to comment.