Skip to content

Apache DataFusion SQL Query Engine

SQL benchmark configuration parity updates (#24778)

Bruce Ritchie45b2f734499b
diff --git a/benchmarks/sql_benchmarks/clickbench_sorted/init/load.sql b/benchmarks/sql_benchmarks/clickbench_sorted/init/load.sql
index fa3c379c7b..7768cfcc65 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 7b9e201c4d..1346025372 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 2f0ba5ffc5..41226ac9e4 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 412b96eb0c..83ee18ab8e 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 8cf41b7607..9ff5f6747f 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 7d985a2f8c..a93bc0b495 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 5fd1ebf602..65791d74b5 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 a0be4a484a..d25fce15d7 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 aa4ac0039f..ed48d9f196 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 bed67f360c..ba5b9fed35 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 857881326b..a05e2e4340 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 de241a3601..f9cc6cc1a0 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 f83e8e94a1..8878b4b465 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 d60d3543d0..be7559babd 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 0997bb0a43..d64ff9b284 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 413baa420d..62bd06b0f1 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