Skip to content

Commit 5e3eaac

Browse files
zhuqi-lucasclaude
andcommitted
address review: split benchmarks to follow-up PR, clarify Unsupported comment
- Remove benchmark code (sort_pushdown.rs, bench.sh, dfbench.rs changes) to be submitted as a separate follow-up PR per reviewer request - Clarify "Unsupported if already in order" in architecture diagram: explain that Unsupported means no change was made to the plan Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 4538b6f commit 5e3eaac

File tree

6 files changed

+5
-343
lines changed

6 files changed

+5
-343
lines changed

benchmarks/bench.sh

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ clickbench_partitioned: ClickBench queries against partitioned (100 files) parqu
106106
clickbench_pushdown: ClickBench queries against partitioned (100 files) parquet w/ filter_pushdown enabled
107107
clickbench_extended: ClickBench \"inspired\" queries against a single parquet (DataFusion specific)
108108
109-
# Sort Pushdown Benchmarks
110-
sort_pushdown: Sort pushdown baseline (no WITH ORDER) on TPC-H data (SF=1)
111-
sort_pushdown_sorted: Sort pushdown with WITH ORDER — tests sort elimination on non-overlapping files
112-
113109
# Sorted Data Benchmarks (ORDER BY Optimization)
114110
clickbench_sorted: ClickBench queries on pre-sorted data using prefer_existing_sort (tests sort elimination optimization)
115111
@@ -313,10 +309,6 @@ main() {
313309
# same data as for tpch
314310
data_tpch "1" "parquet"
315311
;;
316-
sort_pushdown|sort_pushdown_sorted)
317-
# same data as for tpch
318-
data_tpch "1" "parquet"
319-
;;
320312
sort_tpch)
321313
# same data as for tpch
322314
data_tpch "1" "parquet"
@@ -517,12 +509,6 @@ main() {
517509
external_aggr)
518510
run_external_aggr
519511
;;
520-
sort_pushdown)
521-
run_sort_pushdown
522-
;;
523-
sort_pushdown_sorted)
524-
run_sort_pushdown_sorted
525-
;;
526512
sort_tpch)
527513
run_sort_tpch "1"
528514
;;
@@ -1084,22 +1070,6 @@ run_external_aggr() {
10841070
debug_run $CARGO_COMMAND --bin external_aggr -- benchmark --partitions 4 --iterations 5 --path "${TPCH_DIR}" -o "${RESULTS_FILE}" ${QUERY_ARG}
10851071
}
10861072

1087-
# Runs the sort pushdown benchmark (without WITH ORDER)
1088-
run_sort_pushdown() {
1089-
TPCH_DIR="${DATA_DIR}/tpch_sf1"
1090-
RESULTS_FILE="${RESULTS_DIR}/sort_pushdown.json"
1091-
echo "Running sort pushdown benchmark (no WITH ORDER)..."
1092-
debug_run $CARGO_COMMAND --bin dfbench -- sort-pushdown --iterations 5 --path "${TPCH_DIR}" -o "${RESULTS_FILE}" ${QUERY_ARG} ${LATENCY_ARG}
1093-
}
1094-
1095-
# Runs the sort pushdown benchmark with WITH ORDER (enables sort elimination)
1096-
run_sort_pushdown_sorted() {
1097-
TPCH_DIR="${DATA_DIR}/tpch_sf1"
1098-
RESULTS_FILE="${RESULTS_DIR}/sort_pushdown_sorted.json"
1099-
echo "Running sort pushdown benchmark (with WITH ORDER)..."
1100-
debug_run $CARGO_COMMAND --bin dfbench -- sort-pushdown --sorted --iterations 5 --path "${TPCH_DIR}" -o "${RESULTS_FILE}" ${QUERY_ARG} ${LATENCY_ARG}
1101-
}
1102-
11031073
# Runs the sort integration benchmark
11041074
run_sort_tpch() {
11051075
SCALE_FACTOR=$1

benchmarks/src/bin/dfbench.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
3434
static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
3535

3636
use datafusion_benchmarks::{
37-
cancellation, clickbench, h2o, hj, imdb, nlj, smj, sort_pushdown, sort_tpch, tpcds,
38-
tpch,
37+
cancellation, clickbench, h2o, hj, imdb, nlj, smj, sort_tpch, tpcds, tpch,
3938
};
4039

4140
#[derive(Debug, Parser)]
@@ -54,7 +53,6 @@ enum Options {
5453
Imdb(imdb::RunOpt),
5554
Nlj(nlj::RunOpt),
5655
Smj(smj::RunOpt),
57-
SortPushdown(sort_pushdown::RunOpt),
5856
SortTpch(sort_tpch::RunOpt),
5957
Tpch(tpch::RunOpt),
6058
Tpcds(tpcds::RunOpt),
@@ -74,7 +72,6 @@ pub async fn main() -> Result<()> {
7472
Options::Imdb(opt) => Box::pin(opt.run()).await,
7573
Options::Nlj(opt) => opt.run().await,
7674
Options::Smj(opt) => opt.run().await,
77-
Options::SortPushdown(opt) => opt.run().await,
7875
Options::SortTpch(opt) => opt.run().await,
7976
Options::Tpch(opt) => Box::pin(opt.run()).await,
8077
Options::Tpcds(opt) => Box::pin(opt.run()).await,

benchmarks/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ pub mod hj;
2323
pub mod imdb;
2424
pub mod nlj;
2525
pub mod smj;
26-
pub mod sort_pushdown;
2726
pub mod sort_tpch;
2827
pub mod tpcds;
2928
pub mod tpch;

benchmarks/src/sort_pushdown.rs

Lines changed: 0 additions & 306 deletions
This file was deleted.

0 commit comments

Comments
 (0)