[arrow-datafusion] branch master updated: minor: format table result vec & remove unnecessary semicolon (#2425)

[dheres]

This is an automated email from the ASF dual-hosted git repository.

dheres pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git


The following commit(s) were added to refs/heads/master by this push:
     new 87940f737 minor: format table result vec & remove unnecessary 
semicolon (#2425)
87940f737 is described below

commit 87940f737b2708e8c6cfa7dc7000fad6149df2b3
Author: DuRipeng <453243...@qq.com>
AuthorDate: Tue May 3 19:58:37 2022 +0800

    minor: format table result vec & remove unnecessary semicolon (#2425)
---
 datafusion-examples/examples/simple_udaf.rs                      | 4 ++--
 datafusion/core/tests/sql/expr.rs                                | 9 ++++++++-
 datafusion/physical-expr/src/aggregate/approx_percentile_cont.rs | 2 +-
 datafusion/physical-expr/src/aggregate/array_agg.rs              | 4 ++--
 datafusion/physical-expr/src/aggregate/array_agg_distinct.rs     | 2 +-
 datafusion/physical-expr/src/aggregate/count_distinct.rs         | 4 ++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/datafusion-examples/examples/simple_udaf.rs 
b/datafusion-examples/examples/simple_udaf.rs
index 925835bc1..5e0f41bc8 100644
--- a/datafusion-examples/examples/simple_udaf.rs
+++ b/datafusion-examples/examples/simple_udaf.rs
@@ -127,7 +127,7 @@ impl Accumulator for GeometricMean {
     fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
         if values.is_empty() {
             return Ok(());
-        };
+        }
         (0..values[0].len()).try_for_each(|index| {
             let v = values
                 .iter()
@@ -143,7 +143,7 @@ impl Accumulator for GeometricMean {
     fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
         if states.is_empty() {
             return Ok(());
-        };
+        }
         (0..states[0].len()).try_for_each(|index| {
             let v = states
                 .iter()
diff --git a/datafusion/core/tests/sql/expr.rs 
b/datafusion/core/tests/sql/expr.rs
index 5b2d50213..e62acc502 100644
--- a/datafusion/core/tests/sql/expr.rs
+++ b/datafusion/core/tests/sql/expr.rs
@@ -1147,7 +1147,14 @@ async fn nested_subquery() -> Result<()> {
         ) foo";
     let actual = execute_to_batches(&ctx, sql).await;
     // the purpose of this test is just to make sure the query produces a 
valid plan
-    let expected = vec!["+-----+", "| cnt |", "+-----+", "| 0   |", "+-----+"];
+    #[rustfmt::skip]
+    let expected = vec![
+        "+-----+",
+        "| cnt |",
+        "+-----+",
+        "| 0   |",
+        "+-----+"
+    ];
     assert_batches_eq!(expected, &actual);
     Ok(())
 }
diff --git a/datafusion/physical-expr/src/aggregate/approx_percentile_cont.rs 
b/datafusion/physical-expr/src/aggregate/approx_percentile_cont.rs
index 5e8ab1712..497e30876 100644
--- a/datafusion/physical-expr/src/aggregate/approx_percentile_cont.rs
+++ b/datafusion/physical-expr/src/aggregate/approx_percentile_cont.rs
@@ -324,7 +324,7 @@ impl Accumulator for ApproxPercentileAccumulator {
     fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
         if states.is_empty() {
             return Ok(());
-        };
+        }
 
         let states = (0..states[0].len())
             .map(|index| {
diff --git a/datafusion/physical-expr/src/aggregate/array_agg.rs 
b/datafusion/physical-expr/src/aggregate/array_agg.rs
index 4f2bc3ece..3051662ad 100644
--- a/datafusion/physical-expr/src/aggregate/array_agg.rs
+++ b/datafusion/physical-expr/src/aggregate/array_agg.rs
@@ -114,7 +114,7 @@ impl Accumulator for ArrayAggAccumulator {
     fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
         if values.is_empty() {
             return Ok(());
-        };
+        }
         assert!(values.len() == 1, "array_agg can only take 1 param!");
         let arr = &values[0];
         (0..arr.len()).try_for_each(|index| {
@@ -127,7 +127,7 @@ impl Accumulator for ArrayAggAccumulator {
     fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
         if states.is_empty() {
             return Ok(());
-        };
+        }
         assert!(states.len() == 1, "array_agg states must be singleton!");
         let arr = &states[0];
         (0..arr.len()).try_for_each(|index| {
diff --git a/datafusion/physical-expr/src/aggregate/array_agg_distinct.rs 
b/datafusion/physical-expr/src/aggregate/array_agg_distinct.rs
index d68cdc75b..c67945fb0 100644
--- a/datafusion/physical-expr/src/aggregate/array_agg_distinct.rs
+++ b/datafusion/physical-expr/src/aggregate/array_agg_distinct.rs
@@ -139,7 +139,7 @@ impl Accumulator for DistinctArrayAggAccumulator {
     fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
         if states.is_empty() {
             return Ok(());
-        };
+        }
 
         for array in states {
             for j in 0..array.len() {
diff --git a/datafusion/physical-expr/src/aggregate/count_distinct.rs 
b/datafusion/physical-expr/src/aggregate/count_distinct.rs
index aab093fec..070a1559e 100644
--- a/datafusion/physical-expr/src/aggregate/count_distinct.rs
+++ b/datafusion/physical-expr/src/aggregate/count_distinct.rs
@@ -163,7 +163,7 @@ impl Accumulator for DistinctCountAccumulator {
     fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
         if values.is_empty() {
             return Ok(());
-        };
+        }
         (0..values[0].len()).try_for_each(|index| {
             let v = values
                 .iter()
@@ -175,7 +175,7 @@ impl Accumulator for DistinctCountAccumulator {
     fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
         if states.is_empty() {
             return Ok(());
-        };
+        }
         (0..states[0].len()).try_for_each(|index| {
             let v = states
                 .iter()