fix 'disable missing-column row group skipping' cherry pick

delta-io · Oct 28, 2024 · 0bad358 · 0bad358
1 parent a883c30
commit 0bad358
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/kernel/src/scan/mod.rs b/kernel/src/scan/mod.rs
@@ -794,7 +794,7 @@ mod tests {
         //
         // WARNING: https://github.com/delta-incubator/delta-kernel-rs/issues/434 - This
         // optimization is currently disabled, so the one data file is still returned.
-        let predicate = Arc::new(column_expr!("missing").lt(1000i64));
+        let predicate = Arc::new(Expression::column("missing").lt(1000i64));
         let scan = snapshot
             .clone()
             .scan_builder()
@@ -807,7 +807,7 @@ mod tests {
         // Predicate over a logically missing column, so the one data file should be returned.
         //
         // TODO: This should ideally trigger an error instead?
-        let predicate = Arc::new(column_expr!("numeric.ints.invalid").lt(1000));
+        let predicate = Arc::new(Expression::column("numeric.ints.invalid").lt(1000));
         let scan = snapshot
             .scan_builder()
             .with_predicate(predicate)

diff --git a/kernel/tests/read.rs b/kernel/tests/read.rs
@@ -1100,7 +1100,7 @@ fn predicate_references_invalid_missing_column() -> Result<(), Box<dyn std::erro
         "| {date32: 1971-01-05, timestamp: 1970-02-01T12:00:00Z, timestamp_ntz: 1970-01-02T00:04:00} |",
         "+-------------------------------------------------------------------------------------------+",
     ];
-    let predicate = column_expr!("missing").lt(10i64);
+    let predicate = Expression::column("missing").lt(10i64);
     read_table_data_str(
         "./tests/data/parquet_row_group_skipping/",
         Some(columns),
@@ -1121,7 +1121,7 @@ fn predicate_references_invalid_missing_column() -> Result<(), Box<dyn std::erro
         "| {date32: 1971-01-05, timestamp: 1970-02-01T12:00:00Z, timestamp_ntz: 1970-01-02T00:04:00} |",
         "+-------------------------------------------------------------------------------------------+",
     ];
-    let predicate = column_expr!("invalid").lt(10);
+    let predicate = Expression::column("invalid").lt(10);
     read_table_data_str(
         "./tests/data/parquet_row_group_skipping/",
         Some(columns),