WIP: Address minor warnings

Author: srh

rust/cubestore/cubestore/src/queryplanner/topk/execute.rs

@@ -138,7 +138,7 @@ impl AggregateTopKExec {
 }
 
 impl DisplayAs for AggregateTopKExec {
-    fn fmt_as(&self, t: DisplayFormatType, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt_as(&self, _t: DisplayFormatType, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "AggregateTopKExec")
     }
 }
@@ -962,7 +962,7 @@ fn write_group_result_row(
     mode: AggregateMode,
     group_by_values: &[GroupByScalar],
     accumulator_set: &mut AccumulatorSet,
-    key_fields: &[Arc<Field>],
+    _key_fields: &[Arc<Field>],
     key_columns: &mut Vec<Box<dyn ArrayBuilder>>,
     value_columns: &mut Vec<Box<dyn ArrayBuilder>>,
 ) -> Result<(), DataFusionError> {

rust/cubestore/cubestore/src/queryplanner/topk/mod.rs

@@ -17,7 +17,6 @@ use datafusion::logical_expr::{Expr, Extension, LogicalPlan, UserDefinedLogicalN
 use itertools::Itertools;
 use serde_derive::{Deserialize, Serialize};
 use std::any::Any;
-use std::cmp::Ordering;
 use std::fmt::{Display, Formatter};
 use std::hash::Hash;
 use std::hash::Hasher;
@@ -148,14 +147,6 @@ impl Display for SortColumn {
     }
 }
 
-impl ClusterAggregateTopK {
-    pub fn into_plan(self) -> LogicalPlan {
-        LogicalPlan::Extension(Extension {
-            node: Arc::new(self),
-        })
-    }
-}
-
 impl UserDefinedLogicalNode for ClusterAggregateTopK {
     fn as_any(&self) -> &dyn Any {
         self

rust/cubestore/cubestore/src/queryplanner/topk/plan.rs

@@ -355,7 +355,7 @@ fn extract_projections_and_havings(
             for (i, e) in expr.iter().enumerate() {
                 let new_e = e.clone().transform_up(|node| {
                     node.unalias_nested().transform_data(|node| match node {
-                        Expr::Column(c) => {
+                        Expr::Column(_) => {
                             let replacement: Expr =
                                 inner_column_projection.post_projection[input_columns[i]].clone();
                             // Transformed::yes/no doesn't matter here.
@@ -649,33 +649,3 @@ pub fn make_sort_expr(
         _ => col,
     }
 }
-
-// TODO upgrade DF: Remove (or dedup with pp_plan code)
-fn pp_topk_line(topk: &ClusterAggregateTopK) -> String {
-    let mut output = String::new();
-    output += &format!("ClusterAggregateTopK, limit: {}", topk.limit);
-    if true
-    /* self.opts.show_aggregations */
-    {
-        output += &format!(", aggs: {:?}", topk.aggregate_expr)
-    }
-    if true
-    /* self.opts.show_sort_by */
-    {
-        output += &format!(
-            ", sortBy: {}",
-            crate::queryplanner::pretty_printers::pp_sort_columns(
-                topk.group_expr.len(),
-                &topk.order_by
-            )
-        );
-    }
-    if true
-    /* self.opts.show_filters */
-    {
-        if let Some(having) = &topk.having_expr {
-            output += &format!(", having: {:?}", having)
-        }
-    }
-    output
-}