simplify lazy

pola-rs · Jan 5, 2022 · 3b3004f · 3b3004f
1 parent 38cc09e
commit 3b3004f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 49 deletions.
diff --git a/polars/polars-lazy/src/logical_plan/optimizer/predicate_pushdown/mod.rs b/polars/polars-lazy/src/logical_plan/optimizer/predicate_pushdown/mod.rs
@@ -476,24 +476,16 @@ impl PredicatePushDown {
                 let inputs = lp.get_inputs();
                 let exprs = lp.get_exprs();
 
-                let new_inputs = if inputs.len() == 1 {
-                    let node = inputs[0];
-                    let alp = lp_arena.take(node);
-                    let alp = self.push_down(alp, acc_predicates, lp_arena, expr_arena)?;
-                    lp_arena.replace(node, alp);
-                    vec![node]
-                } else {
-                    inputs
-                        .iter()
-                        .map(|&node| {
-                            let alp = lp_arena.take(node);
-                            let alp =
-                                self.push_down(alp, acc_predicates.clone(), lp_arena, expr_arena)?;
-                            lp_arena.replace(node, alp);
-                            Ok(node)
-                        })
-                        .collect::<Result<Vec<_>>>()?
-                };
+                let new_inputs = inputs
+                    .iter()
+                    .map(|&node| {
+                        let alp = lp_arena.take(node);
+                        let alp =
+                            self.push_down(alp, acc_predicates.clone(), lp_arena, expr_arena)?;
+                        lp_arena.replace(node, alp);
+                        Ok(node)
+                    })
+                    .collect::<Result<Vec<_>>>()?;
 
                 Ok(lp.from_exprs_and_input(exprs, new_inputs))
             }

diff --git a/polars/polars-lazy/src/logical_plan/optimizer/projection_pushdown.rs b/polars/polars-lazy/src/logical_plan/optimizer/projection_pushdown.rs
@@ -831,37 +831,22 @@ impl ProjectionPushDown {
                 let inputs = lp.get_inputs();
                 let exprs = lp.get_exprs();
 
-                let new_inputs = if inputs.len() == 1 {
-                    let node = inputs[0];
-                    let alp = lp_arena.take(node);
-                    let alp = self.push_down(
-                        alp,
-                        acc_projections,
-                        projected_names,
-                        projections_seen,
-                        lp_arena,
-                        expr_arena,
-                    )?;
-                    lp_arena.replace(node, alp);
-                    vec![node]
-                } else {
-                    inputs
-                        .iter()
-                        .map(|&node| {
-                            let alp = lp_arena.take(node);
-                            let alp = self.push_down(
-                                alp,
-                                acc_projections.clone(),
-                                projected_names.clone(),
-                                projections_seen,
-                                lp_arena,
-                                expr_arena,
-                            )?;
-                            lp_arena.replace(node, alp);
-                            Ok(node)
-                        })
-                        .collect::<Result<Vec<_>>>()?
-                };
+                let new_inputs = inputs
+                    .iter()
+                    .map(|&node| {
+                        let alp = lp_arena.take(node);
+                        let alp = self.push_down(
+                            alp,
+                            acc_projections.clone(),
+                            projected_names.clone(),
+                            projections_seen,
+                            lp_arena,
+                            expr_arena,
+                        )?;
+                        lp_arena.replace(node, alp);
+                        Ok(node)
+                    })
+                    .collect::<Result<Vec<_>>>()?;
 
                 Ok(lp.from_exprs_and_input(exprs, new_inputs))
             }