WIP: Fix planning_inplace_aggregate2 test

Author: srh

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

@@ -3139,21 +3139,25 @@ async fn planning_inplace_aggregate2(service: Box<dyn SqlClient>) {
     );
     assert_eq!(
         pp_phys_plan_ext(p.worker.as_ref(), &verbose),
-        "Projection, [url, SUM(Data.hits)@1:hits]\
+        "Projection, [url, sum(Data.hits)@1:hits]\
            \n  AggregateTopK, limit: 10, sortBy: [2 desc null last]\
            \n    Worker, sort_order: [1]\
-           \n      Sort, by: [SUM(hits)@1 desc nulls last], sort_order: [1]\
-           \n        FullInplaceAggregate, sort_order: [0]\
-           \n          MergeSort, single_vals: [0, 1], sort_order: [0, 1, 2]\
-           \n            Union, single_vals: [0, 1], sort_order: [0, 1, 2]\
-           \n              Filter, single_vals: [0, 1], sort_order: [0, 1, 2]\
-           \n                MergeSort, sort_order: [0, 1, 2]\
-           \n                  Scan, index: default:1:[1]:sort_on[allowed, site_id, url], fields: *, sort_order: [0, 1, 2]\
-           \n                    Empty\
-           \n              Filter, single_vals: [0, 1], sort_order: [0, 1, 2]\
-           \n                MergeSort, sort_order: [0, 1, 2]\
-           \n                  Scan, index: default:2:[2]:sort_on[allowed, site_id, url], fields: *, sort_order: [0, 1, 2]\
-           \n                    Empty"
+           \n      Sort, by: [sum(Data.hits)@1 desc nulls last], sort_order: [1]\
+           \n        LinearSingleAggregate\
+           \n          CoalescePartitions\
+           \n            Union\
+           \n              CoalescePartitions\
+           \n                CoalesceBatchesExec\
+           \n                  Filter\
+           \n                    Scan, index: default:1:[1], fields: *, sort_order: [0, 1, 2, 3, 4]\
+           \n                      Sort, by: [allowed@0, site_id@1, url@2, day@3, hits@4], sort_order: [0, 1, 2, 3, 4]\
+           \n                        Empty\
+           \n              CoalescePartitions\
+           \n                CoalesceBatchesExec\
+           \n                  Filter\
+           \n                    Scan, index: default:2:[2], fields: *, sort_order: [0, 1, 2, 3, 4]\
+           \n                      Sort, by: [allowed@0, site_id@1, url@2, day@3, hits@4], sort_order: [0, 1, 2, 3, 4]\
+           \n                        Empty"
     );
 }