WIP: Make test_materialize_topk working. Clean up agg_expr pretty printing in topk aggregate

Author: srh

rust/cubestore/cubestore/src/queryplanner/planning.rs

@@ -2099,7 +2099,7 @@ pub mod tests {
             "SELECT order_customer `customer`, SUM(order_amount) `amount`, \
                     MIN(order_amount) `min_amount`, MAX(order_amount) `max_amount` \
              FROM s.orders \
-             GROUP BY 1 ORDER BY 3 DESC, 2 ASC LIMIT 10",
+             GROUP BY 1 ORDER BY 3 DESC NULLS LAST, 2 ASC LIMIT 10",
             &indices,
         );
         let mut verbose = with_sort_by;
@@ -2108,7 +2108,7 @@ pub mod tests {
         assert_eq!(
             pretty_printers::pp_plan_ext(&plan, &verbose),
             "Projection, [customer, amount, min_amount, max_amount]\
-           \n  ClusterAggregateTopK, limit: 10, aggs: [SUM(#s.orders.order_amount), MIN(#s.orders.order_amount), MAX(#s.orders.order_amount)], sortBy: [3 desc null last, 2 null last]\
+           \n  ClusterAggregateTopK, limit: 10, aggs: [sum(s.orders.order_amount), min(s.orders.order_amount), max(s.orders.order_amount)], sortBy: [3 desc null last, 2 null last]\
            \n    Scan s.orders, source: CubeTable(index: by_customer:3:[]:sort_on[order_customer]), fields: [order_customer, order_amount]"
         );
 

rust/cubestore/cubestore/src/queryplanner/pretty_printers.rs

@@ -15,6 +15,7 @@ use datafusion::physical_plan::coalesce_partitions::CoalescePartitionsExec;
 use datafusion::physical_plan::filter::FilterExec;
 use datafusion::physical_plan::limit::{GlobalLimitExec, LocalLimitExec};
 use datafusion::physical_plan::{ExecutionPlan, InputOrderMode, PlanProperties};
+use datafusion::prelude::Expr;
 use itertools::{repeat_n, Itertools};
 use std::sync::Arc;
 
@@ -255,7 +256,7 @@ pub fn pp_plan_ext(p: &LogicalPlan, opts: &PPOptions) -> String {
                     {
                         self.output += &format!("ClusterAggregateTopK, limit: {}", topk.limit);
                         if self.opts.show_aggregations {
-                            self.output += &format!(", aggs: {:?}", topk.aggregate_expr)
+                            self.output += &format!(", aggs: {}", pp_exprs(&topk.aggregate_expr))
                         }
                         if self.opts.show_sort_by {
                             self.output += &format!(
@@ -695,3 +696,7 @@ fn pp_row_range(r: &RowRange) -> String {
     };
     format!("[{},{})", s, e)
 }
+
+fn pp_exprs(v: &Vec<Expr>) -> String {
+    "[".to_owned() + &v.iter().map(|e: &Expr| format!("{}", e)).join(", ") + "]"
+}