working version trial 2

pola-rs · Sep 18, 2024 · 28658bb · 28658bb
1 parent 997966d
commit 28658bb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/crates/polars-core/src/chunked_array/struct_/mod.rs b/crates/polars-core/src/chunked_array/struct_/mod.rs
@@ -331,11 +331,11 @@ impl StructChunked {
     pub fn zip_outer_validity(&mut self, other: &StructChunked) {
         if self.chunks.len() != other.chunks.len()
             || !self
-            .chunks
-            .iter()
-            .zip(other.chunks.iter())
-            .map(|(a, b)| a.len() == b.len())
-            .all_equal()
+                .chunks
+                .iter()
+                .zip(other.chunks.iter())
+                .map(|(a, b)| a.len() == b.len())
+                .all_equal()
         {
             *self = self.rechunk();
             let other = other.rechunk();

diff --git a/crates/polars-plan/src/plans/conversion/dsl_to_ir.rs b/crates/polars-plan/src/plans/conversion/dsl_to_ir.rs
@@ -883,6 +883,11 @@ fn expand_filter(
         | Expr::DtypeColumn(_)
         | Expr::IndexColumn(_)
         | Expr::Nth(_) => true,
+        #[cfg(feature = "dtype-struct")]
+        Expr::Function {
+            function: FunctionExpr::StructExpr(StructFunction::FieldByIndex(_)),
+            ..
+        } => true,
         _ => false,
     }) {
         let mut rewritten = rewrite_projections(vec![predicate], &schema, &[], opt_flags)?;

diff --git a/py-polars/tests/unit/operations/namespaces/test_struct.py b/py-polars/tests/unit/operations/namespaces/test_struct.py
@@ -106,7 +106,7 @@ def test_field_by_index_18732() -> None:
     df = pl.DataFrame({"foo": [{"a": 1, "b": 2}, {"a": 2, "b": 1}]})
 
     # illegal upper bound
-    with pytest.raises(OutOfBoundsError, match=r"Given field index 2 is out of bound"):
+    with pytest.raises(OutOfBoundsError, match=r"index 2 for length: 2"):
         df.filter(pl.col.foo.struct[2] == 1)
 
     # legal