refactor: remove old DSL describe code

pola-rs · May 15, 2024 · 6f4c109 · 6f4c109
1 parent 032ffe9
commit 6f4c109
Show file tree

Hide file tree

Showing 17 changed files with 117 additions and 1,367 deletions.
diff --git a/crates/polars-lazy/src/frame/mod.rs b/crates/polars-lazy/src/frame/mod.rs
@@ -520,8 +520,7 @@ impl LazyFrame {
     }
 
     pub fn to_alp(self) -> PolarsResult<IRPlan> {
-        let (node, lp_arena, expr_arena) = self.logical_plan.to_alp()?;
-        Ok(IRPlan::new(node, lp_arena, expr_arena))
+        self.logical_plan.to_alp()
     }
 
     pub(crate) fn optimize_with_scratch(

diff --git a/crates/polars-lazy/src/physical_plan/expressions/apply.rs b/crates/polars-lazy/src/physical_plan/expressions/apply.rs
@@ -38,7 +38,7 @@ impl ApplyExpr {
     ) -> Self {
         #[cfg(debug_assertions)]
         if matches!(options.collect_groups, ApplyOptions::ElementWise) && options.returns_scalar {
-            panic!("expr {} is not implemented correctly. 'returns_scalar' and 'elementwise' are mutually exclusive", expr)
+            panic!("expr {:?} is not implemented correctly. 'returns_scalar' and 'elementwise' are mutually exclusive", expr)
         }
 
         Self {

diff --git a/crates/polars-lazy/src/physical_plan/expressions/mod.rs b/crates/polars-lazy/src/physical_plan/expressions/mod.rs
@@ -341,7 +341,7 @@ impl<'a> AggregationContext<'a> {
             (true, &DataType::List(_)) => {
                 if series.len() != self.groups.len() {
                     let fmt_expr = if let Some(e) = expr {
-                        format!("'{e}' ")
+                        format!("'{e:?}' ")
                     } else {
                         String::new()
                     };
@@ -589,7 +589,7 @@ impl Display for &dyn PhysicalExpr {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self.as_expression() {
             None => Ok(()),
-            Some(e) => write!(f, "{e}"),
+            Some(e) => write!(f, "{e:?}"),
         }
     }
 }

diff --git a/crates/polars-lazy/src/physical_plan/streaming/tree.rs b/crates/polars-lazy/src/physical_plan/streaming/tree.rs
@@ -177,8 +177,15 @@ pub(super) fn dbg_tree(tree: Tree, lp_arena: &Arena<IR>, expr_arena: &Arena<AExp
         .unwrap();
 
     println!("SUBPLAN ELIGIBLE FOR STREAMING:");
-    let lp = node_to_lp(root, expr_arena, &mut (lp_arena.clone()));
-    println!("{lp:?}\n");
+    println!(
+        "{}\n",
+        IRPlanRef {
+            lp_top: root,
+            lp_arena,
+            expr_arena
+        }
+        .display()
+    );
 
     println!("PIPELINE TREE:");
     for (i, branch) in tree.iter().enumerate() {