fix test and fmt

Author: goldmedal

datafusion/physical-optimizer/src/coalesce_batches.rs

@@ -66,10 +66,7 @@ impl PhysicalOptimizerRule for CoalesceBatches {
                 || plan_any
                     .downcast_ref::<RepartitionExec>()
                     .map(|repart_exec| {
-                        !matches!(
-                            repart_exec.partitioning().clone(),
-                            Partitioning::RoundRobinBatch(_)
-                        )
+                        !matches!(repart_exec.partitioning(), Partitioning::RoundRobinBatch(_) | Partitioning::HashSelectionBitmap(_, _))
                     })
                     .unwrap_or(false);
             if wrap_in_coalesce {

datafusion/physical-plan/src/aggregates/mod.rs

@@ -1020,7 +1020,10 @@ impl ExecutionPlan for AggregateExec {
     }
 
     fn requried_filtered_input(&self) -> bool {
-        matches!(self.mode(), AggregateMode::FinalPartitioned(HashPartitionMode::SelectionBitmap))
+        matches!(
+            self.mode(),
+            AggregateMode::FinalPartitioned(HashPartitionMode::SelectionBitmap)
+        )
     }
 }
 

datafusion/physical-plan/src/repartition/mod.rs

@@ -653,7 +653,7 @@ impl ExecutionPlan for RepartitionExec {
     }
 
     fn output_filtered_batches(&self) -> bool {
-        matches!(self.partitioning(),Partitioning::HashSelectionBitmap(_, _))
+        matches!(self.partitioning(), Partitioning::HashSelectionBitmap(_, _))
     }
 
     fn execute(

datafusion/sqllogictest/test_files/aggregate.slt

@@ -1136,11 +1136,10 @@ physical_plan
 03)----CoalescePartitionsExec
 04)------AggregateExec: mode=Partial, gby=[], aggr=[median(alias1)]
 05)--------AggregateExec: mode=FinalPartitioned(SelectionBitmap), gby=[alias1@0 as alias1], aggr=[]
-06)----------CoalesceBatchesExec: target_batch_size=8192
-07)------------RepartitionExec: partitioning=HashSelectionBitmap([alias1@0], 4), input_partitions=4
-08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
-09)----------------AggregateExec: mode=Partial, gby=[c@0 as alias1], aggr=[]
-10)------------------DataSourceExec: partitions=1, partition_sizes=[1]
+06)----------RepartitionExec: partitioning=HashSelectionBitmap([alias1@0], 4), input_partitions=4
+07)------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
+08)--------------AggregateExec: mode=Partial, gby=[c@0 as alias1], aggr=[]
+09)----------------DataSourceExec: partitions=1, partition_sizes=[1]
 
 # TODO: it should be 3 after fix: https://github.com/apache/datafusion/issues/15383
 query I