chore: apply make format

Author: andygrove

native/spark-expr/src/agg_funcs/correlation.rs

@@ -461,7 +461,8 @@ mod groups_tests {
         let mut a = acc(true);
         let v1: ArrayRef = Arc::new(Float64Array::from(vec![1.0, 2.0, 3.0, 4.0, 5.0]));
         let v2: ArrayRef = Arc::new(Float64Array::from(vec![2.0, 4.0, 6.0, 8.0, 10.0]));
-        a.update_batch(&[v1, v2], &[0, 0, 0, 0, 0], None, 1).unwrap();
+        a.update_batch(&[v1, v2], &[0, 0, 0, 0, 0], None, 1)
+            .unwrap();
         let r = evaluate(&mut a);
         assert!((r[0].unwrap() - 1.0).abs() < 1e-12);
     }

native/spark-expr/src/agg_funcs/covariance.rs

@@ -540,7 +540,8 @@ mod groups_tests {
         let mut acc = pop();
         let v1: ArrayRef = Arc::new(Float64Array::from(vec![1.0, 2.0, 3.0, 4.0, 5.0]));
         let v2: ArrayRef = Arc::new(Float64Array::from(vec![2.0, 4.0, 6.0, 8.0, 10.0]));
-        acc.update_batch(&[v1, v2], &[0, 0, 0, 0, 0], None, 1).unwrap();
+        acc.update_batch(&[v1, v2], &[0, 0, 0, 0, 0], None, 1)
+            .unwrap();
         // pop covariance of x and 2x for x in [1..5] = 4.0
         assert!((evaluate(&mut acc)[0].unwrap() - 4.0).abs() < 1e-12);
     }
@@ -590,16 +591,17 @@ mod groups_tests {
         let lstate = left.state(EmitTo::All).unwrap();
 
         let mut right = pop();
-        right.update_batch(
-            &[
-                Arc::new(Float64Array::from(vec![4.0, 5.0, 6.0])) as ArrayRef,
-                Arc::new(Float64Array::from(vec![8.0, 10.0, 12.0])) as ArrayRef,
-            ],
-            &[0, 0, 0],
-            None,
-            1,
-        )
-        .unwrap();
+        right
+            .update_batch(
+                &[
+                    Arc::new(Float64Array::from(vec![4.0, 5.0, 6.0])) as ArrayRef,
+                    Arc::new(Float64Array::from(vec![8.0, 10.0, 12.0])) as ArrayRef,
+                ],
+                &[0, 0, 0],
+                None,
+                1,
+            )
+            .unwrap();
         let rstate = right.state(EmitTo::All).unwrap();
 
         let mut merged = pop();

native/spark-expr/src/agg_funcs/stddev.rs

@@ -274,7 +274,8 @@ mod groups_tests {
     fn pop_stddev_single_group() {
         let mut acc = StddevGroupsAccumulator::new(StatsType::Population, false);
         let values: ArrayRef = Arc::new(Float64Array::from(vec![1.0, 2.0, 3.0, 4.0, 5.0]));
-        acc.update_batch(&[values], &[0, 0, 0, 0, 0], None, 1).unwrap();
+        acc.update_batch(&[values], &[0, 0, 0, 0, 0], None, 1)
+            .unwrap();
         // sqrt(2.0)
         let result: Vec<Option<f64>> = acc
             .evaluate(EmitTo::All)

native/spark-expr/src/agg_funcs/variance.rs

@@ -190,8 +190,7 @@ impl Accumulator for VarianceAccumulator {
         let arr = downcast_value!(&values[0], Float64Array).iter().flatten();
 
         for value in arr {
-            let (c, m, m2) =
-                super::welford::variance_update(self.count, self.mean, self.m2, value);
+            let (c, m, m2) = super::welford::variance_update(self.count, self.mean, self.m2, value);
             self.count = c;
             self.mean = m;
             self.m2 = m2;
@@ -459,17 +458,18 @@ mod groups_tests {
     fn pop_variance_single_group() {
         let mut acc = pop_acc();
         let values: ArrayRef = Arc::new(Float64Array::from(vec![1.0, 2.0, 3.0, 4.0, 5.0]));
-        acc.update_batch(&[values], &[0, 0, 0, 0, 0], None, 1).unwrap();
+        acc.update_batch(&[values], &[0, 0, 0, 0, 0], None, 1)
+            .unwrap();
         // population variance of [1..5] = 2.0
         assert_eq!(evaluate(&mut acc), vec![Some(2.0)]);
     }
 
     #[test]
     fn pop_variance_multi_group() {
         let mut acc = pop_acc();
-        let values: ArrayRef =
-            Arc::new(Float64Array::from(vec![1.0, 2.0, 10.0, 20.0, 3.0]));
-        acc.update_batch(&[values], &[0, 0, 1, 1, 0], None, 2).unwrap();
+        let values: ArrayRef = Arc::new(Float64Array::from(vec![1.0, 2.0, 10.0, 20.0, 3.0]));
+        acc.update_batch(&[values], &[0, 0, 1, 1, 0], None, 2)
+            .unwrap();
         let result = evaluate(&mut acc);
         // group 0: pop var of [1,2,3] = 2/3; group 1: pop var of [10,20] = 25
         assert!((result[0].unwrap() - 2.0_f64 / 3.0).abs() < 1e-12);
@@ -486,7 +486,8 @@ mod groups_tests {
             Some(3.0),
             None,
         ]));
-        acc.update_batch(&[values], &[0, 0, 0, 0, 0], None, 1).unwrap();
+        acc.update_batch(&[values], &[0, 0, 0, 0, 0], None, 1)
+            .unwrap();
         // pop var of [1,2,3] = 2/3
         assert!((evaluate(&mut acc)[0].unwrap() - 2.0_f64 / 3.0).abs() < 1e-12);
     }
@@ -551,12 +552,8 @@ mod groups_tests {
         let right_state = right.state(EmitTo::All).unwrap();
 
         let mut merged = pop_acc();
-        merged
-            .merge_batch(&left_state, &[0], None, 1)
-            .unwrap();
-        merged
-            .merge_batch(&right_state, &[0], None, 1)
-            .unwrap();
+        merged.merge_batch(&left_state, &[0], None, 1).unwrap();
+        merged.merge_batch(&right_state, &[0], None, 1).unwrap();
         let merged_result = evaluate(&mut merged)[0].unwrap();
 
         assert!((single_result - merged_result).abs() < 1e-12);

native/spark-expr/src/agg_funcs/welford.rs

@@ -21,12 +21,7 @@
 //! Spark's wire-format state.
 
 #[inline]
-pub(crate) fn variance_update(
-    count: f64,
-    mean: f64,
-    m2: f64,
-    value: f64,
-) -> (f64, f64, f64) {
+pub(crate) fn variance_update(count: f64, mean: f64, m2: f64, value: f64) -> (f64, f64, f64) {
     let new_count = count + 1.0;
     let delta1 = value - mean;
     let new_mean = delta1 / new_count + mean;
@@ -36,12 +31,7 @@ pub(crate) fn variance_update(
 }
 
 #[inline]
-pub(crate) fn variance_retract(
-    count: f64,
-    mean: f64,
-    m2: f64,
-    value: f64,
-) -> (f64, f64, f64) {
+pub(crate) fn variance_retract(count: f64, mean: f64, m2: f64, value: f64) -> (f64, f64, f64) {
     let new_count = count - 1.0;
     let delta1 = mean - value;
     let new_mean = delta1 / new_count + mean;