WIP: Fix topk planning tests

Author: srh

rust/cubestore/cubestore-sql-tests/src/tests.rs

@@ -4200,18 +4200,18 @@ async fn planning_topk_hll(service: Box<dyn SqlClient>) {
     show_hints.show_filters = true;
     assert_eq!(
         pp_phys_plan_ext(p.worker.as_ref(), &show_hints),
-        "Projection, [url, CARDINALITY(MERGE(Data.hits)@1):hits]\
-         \n  AggregateTopK, limit: 3, having: CAST(CARDINALITY(MERGE(Data.hits)@1) AS Int64) > 20 AND CAST(CARDINALITY(MERGE(Data.hits)@1) AS Int64) < 40\
+        "Projection, [url, cardinality(merge(Data.hits)@1):hits]\
+         \n  AggregateTopK, limit: 3, having: cardinality(merge(Data.hits)@1) > 20 AND cardinality(merge(Data.hits)@1) < 40\
          \n    Worker\
          \n      Sort\
-         \n        FullInplaceAggregate\
+         \n        SortedSingleAggregate\
          \n          MergeSort\
          \n            Union\
-         \n              MergeSort\
-         \n                Scan, index: default:1:[1]:sort_on[url], fields: *\
+         \n              Scan, index: default:1:[1]:sort_on[url], fields: *\
+         \n                Sort\
          \n                  Empty\
-         \n              MergeSort\
-         \n                Scan, index: default:2:[2]:sort_on[url], fields: *\
+         \n              Scan, index: default:2:[2]:sort_on[url], fields: *\
+         \n                Sort\
          \n                  Empty"
         );
 }

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

@@ -2045,10 +2045,12 @@ pub mod tests {
         );
         let plan = choose_index(plan, &indices).await.unwrap().0;
 
+        // TODO upgrade DF: Isn't this projection wrong?
         assert_eq!(
             pretty_printers::pp_plan(&plan),
-            "ClusterAggregateTopK, limit: 10\
-           \n  Scan s.orders, source: CubeTable(index: by_customer:3:[]:sort_on[order_customer]), fields: [order_customer, order_amount]"
+            "Projection, [s.orders.order_customer:order_customer, sum(s.orders.order_amount)]\
+            \n  ClusterAggregateTopK, limit: 10\
+            \n    Scan s.orders, source: CubeTable(index: by_customer:3:[]:sort_on[order_customer]), fields: [order_customer, order_amount]"
         );
 
         // Projections should be handled properly.