From e1d255f0e25fa04fc87b6b016d5712a5918657fd Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Fri, 19 Jun 2026 13:51:55 +0100 Subject: [PATCH] Make sure both pushdown features are always enabled for DF benchmarks Signed-off-by: Adam Gutglick --- benchmarks/datafusion-bench/src/lib.rs | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/benchmarks/datafusion-bench/src/lib.rs b/benchmarks/datafusion-bench/src/lib.rs index c8353eb1f85..fdda58188e7 100644 --- a/benchmarks/datafusion-bench/src/lib.rs +++ b/benchmarks/datafusion-bench/src/lib.rs @@ -45,10 +45,7 @@ pub fn get_session_context() -> SessionContext { .build_arc() .expect("could not build runtime environment"); - let factory = VortexFormatFactory::new().with_options(VortexTableOptions { - projection_pushdown: true, - ..Default::default() - }); + let factory = VortexFormatFactory::new().with_options(vortex_table_options()); let mut session_state_builder = SessionStateBuilder::new() .with_config(SessionConfig::from_env().expect("shouldn't fail")) @@ -114,11 +111,20 @@ pub fn format_to_df_format(format: Format) -> Arc { Format::Csv => Arc::new(CsvFormat::default()) as _, Format::Arrow => Arc::new(ArrowFormat), Format::Parquet => Arc::new(ParquetFormat::new()), - Format::OnDiskVortex | Format::VortexCompact => { - Arc::new(VortexFormat::new(SESSION.clone())) - } + Format::OnDiskVortex | Format::VortexCompact => Arc::new(VortexFormat::new_with_options( + SESSION.clone(), + vortex_table_options(), + )), Format::OnDiskDuckDB | Format::Lance => { unimplemented!("Format {format} cannot be turned into a DataFusion `FileFormat`") } } } + +fn vortex_table_options() -> VortexTableOptions { + VortexTableOptions { + projection_pushdown: true, + predicate_pushdown: true, + ..Default::default() + } +}