From d426799a9629e99caf909e74ca1e1eab7ebb80fd Mon Sep 17 00:00:00 2001 From: Bruce Ritchie Date: Thu, 6 Aug 2026 16:28:10 -0400 Subject: [PATCH] fix: restore SQL benchmark configuration parity --- benchmarks/sql_benchmarks/clickbench_sorted/init/load.sql | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q01.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q02.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q03.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q04.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q05.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q06.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q07.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q08.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q09.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q10.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q11.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q12.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q13.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q14.benchmark | 2 ++ benchmarks/sql_benchmarks/hj/benchmarks/q15.benchmark | 2 ++ 16 files changed, 32 insertions(+) diff --git a/benchmarks/sql_benchmarks/clickbench_sorted/init/load.sql b/benchmarks/sql_benchmarks/clickbench_sorted/init/load.sql index fa3c379c7b05..7768cfcc6568 100644 --- a/benchmarks/sql_benchmarks/clickbench_sorted/init/load.sql +++ b/benchmarks/sql_benchmarks/clickbench_sorted/init/load.sql @@ -1,6 +1,8 @@ -- Run benchmark with prefer_existing_sort configuration -- This allows DataFusion to optimize away redundant sorts while maintaining parallelism +SET datafusion.execution.parquet.pushdown_filters = true; +SET datafusion.execution.parquet.reorder_filters = true; set datafusion.optimizer.prefer_existing_sort=true; CREATE EXTERNAL TABLE hits_raw STORED AS PARQUET LOCATION '${DATA_DIR:-data}/hits_sorted.parquet' WITH ORDER ("${SORTED_BY:-EventTime}" ${SORTED_ORDER:-ASC}); diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q01.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q01.benchmark index 7b9e201c4d6c..134602537278 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q01.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q01.benchmark @@ -1,6 +1,8 @@ name Q01 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q02.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q02.benchmark index 2f0ba5ffc5a8..41226ac9e404 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q02.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q02.benchmark @@ -1,6 +1,8 @@ name Q02 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q03.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q03.benchmark index 412b96eb0c54..83ee18ab8e60 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q03.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q03.benchmark @@ -1,6 +1,8 @@ name Q03 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q04.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q04.benchmark index 8cf41b76079b..9ff5f6747fe0 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q04.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q04.benchmark @@ -1,6 +1,8 @@ name Q04 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q05.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q05.benchmark index 7d985a2f8c15..a93bc0b495c9 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q05.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q05.benchmark @@ -1,6 +1,8 @@ name Q05 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q06.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q06.benchmark index 5fd1ebf602e3..65791d74b5e1 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q06.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q06.benchmark @@ -1,6 +1,8 @@ name Q06 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q07.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q07.benchmark index a0be4a484af8..d25fce15d70a 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q07.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q07.benchmark @@ -1,6 +1,8 @@ name Q07 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q08.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q08.benchmark index aa4ac0039fec..ed48d9f19625 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q08.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q08.benchmark @@ -1,6 +1,8 @@ name Q08 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q09.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q09.benchmark index bed67f360cc0..ba5b9fed35a0 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q09.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q09.benchmark @@ -1,6 +1,8 @@ name Q09 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q10.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q10.benchmark index 857881326b91..a05e2e434034 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q10.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q10.benchmark @@ -1,6 +1,8 @@ name Q10 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q11.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q11.benchmark index de241a360171..f9cc6cc1a08b 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q11.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q11.benchmark @@ -1,6 +1,8 @@ name Q11 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q12.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q12.benchmark index f83e8e94a1f7..8878b4b465da 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q12.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q12.benchmark @@ -1,6 +1,8 @@ name Q12 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q13.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q13.benchmark index d60d3543d082..be7559babdf4 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q13.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q13.benchmark @@ -1,6 +1,8 @@ name Q13 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q14.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q14.benchmark index 0997bb0a431b..d64ff9b2849f 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q14.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q14.benchmark @@ -1,6 +1,8 @@ name Q14 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I diff --git a/benchmarks/sql_benchmarks/hj/benchmarks/q15.benchmark b/benchmarks/sql_benchmarks/hj/benchmarks/q15.benchmark index 413baa420d47..62bd06b0f10f 100644 --- a/benchmarks/sql_benchmarks/hj/benchmarks/q15.benchmark +++ b/benchmarks/sql_benchmarks/hj/benchmarks/q15.benchmark @@ -1,6 +1,8 @@ name Q15 group hj +init sql_benchmarks/hj/init/set_config.sql + load sql_benchmarks/hj/init/load.sql assert I