chore(cubestore): Upgrade DF 46: PPOptions::show_most and pretty printing cleanup

Author: srh

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

@@ -33,7 +33,7 @@ use crate::queryplanner::providers::InfoSchemaQueryCacheTableProvider;
 use crate::queryplanner::query_executor::{
     ClusterSendExec, CubeTable, CubeTableExec, InlineTableProvider,
 };
-use crate::queryplanner::rolling::RollingWindowAggregate;
+use crate::queryplanner::rolling::{RollingWindowAggExec, RollingWindowAggregate};
 use crate::queryplanner::serialized_plan::{IndexSnapshot, RowRange};
 use crate::queryplanner::tail_limit::TailLimitExec;
 use crate::queryplanner::topk::SortColumn;
@@ -64,9 +64,8 @@ pub struct PPOptions {
 }
 
 impl PPOptions {
-    // TODO upgrade DF: Rename
     #[allow(unused)]
-    pub fn show_all() -> PPOptions {
+    pub fn show_most() -> PPOptions {
         PPOptions {
             show_filters: true,
             show_sort_by: true,
@@ -342,9 +341,6 @@ pub fn pp_plan_ext(p: &LogicalPlan, opts: &PPOptions) -> String {
                         self.output += &format!("PanicWorker")
                     } else if let Some(_) = node.as_any().downcast_ref::<RollingWindowAggregate>() {
                         self.output += &format!("RollingWindowAggreagate");
-                    // TODO upgrade DF
-                    // } else if let Some(alias) = node.as_any().downcast_ref::<LogicalAlias>() {
-                    //     self.output += &format!("LogicalAlias, alias: {}", alias.alias);
                     } else {
                         log::error!("unknown extension node")
                     }
@@ -711,11 +707,8 @@ fn pp_phys_plan_indented(p: &dyn ExecutionPlan, indent: usize, o: &PPOptions, ou
                 *out += &format!("{}", DefaultDisplay(dse));
             }
 
-            // TODO upgrade DF
-            // } else if let Some(_) = a.downcast_ref::<SkipExec>() {
-            //     *out += "SkipRows";
-            // } else if let Some(_) = a.downcast_ref::<RollingWindowAggExec>() {
-            //     *out += "RollingWindowAgg";
+        } else if let Some(_) = a.downcast_ref::<RollingWindowAggExec>() {
+            *out += "RollingWindowAgg";
         } else if let Some(_) = a.downcast_ref::<LastRowByUniqueKeyExec>() {
             *out += "LastRowByUniqueKey";
         } else if a.is::<MemoryExec>() {

rust/cubestore/cubestore/src/streaming/kafka_post_processing.rs

@@ -458,7 +458,7 @@ impl KafkaPostProcessPlanner {
     ) -> Result<(Arc<dyn ExecutionPlan>, Option<Arc<dyn ExecutionPlan>>), CubeError> {
         fn only_certain_plans_allowed_error(plan: &LogicalPlan) -> CubeError {
             CubeError::user(
-                format!("Only Projection > [Filter] > TableScan plans are allowed for streaming; got plan {}", pp_plan_ext(plan, &PPOptions::show_all())),
+                format!("Only Projection > [Filter] > TableScan plans are allowed for streaming; got plan {}", pp_plan_ext(plan, &PPOptions::show_most())),
             )
         }
         fn remove_subquery_alias_around_table_scan(plan: &LogicalPlan) -> &LogicalPlan {