diff --git a/benchmarks/sql_benchmarks/clickbench_sorted/init/load.sql b/benchmarks/sql_benchmarks/clickbench_sorted/init/load.sql index fa3c379c7b05b..7768cfcc65686 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 7b9e201c4d6c9..134602537278e 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 2f0ba5ffc5a8c..41226ac9e4049 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 412b96eb0c54f..83ee18ab8e600 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 8cf41b76079b8..9ff5f6747fe0d 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 7d985a2f8c15c..a93bc0b495c94 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 5fd1ebf602e37..65791d74b5e19 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 a0be4a484af85..d25fce15d70a1 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 aa4ac0039fec5..ed48d9f196251 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 bed67f360cc09..ba5b9fed35a04 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 857881326b911..a05e2e4340346 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 de241a3601710..f9cc6cc1a08b9 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 f83e8e94a1f7a..8878b4b465da1 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 d60d3543d0821..be7559babdf4e 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 0997bb0a431b5..d64ff9b2849f6 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 413baa420d47e..62bd06b0f10fb 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