This is an automated email from the ASF dual-hosted git repository.
agrove 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 9e77b6607 remove duplicated aggregate() (#2400)
9e77b6607 is described below
commit 9e77b6607227f9b7f848e472d710bb5b61004b2f
Author: DuRipeng <[email protected]>
AuthorDate: Mon May 2 07:21:58 2022 +0800
remove duplicated aggregate() (#2400)
---
datafusion/physical-expr/src/aggregate/average.rs | 16 +---------------
datafusion/physical-expr/src/aggregate/correlation.rs | 16 +---------------
datafusion/physical-expr/src/aggregate/covariance.rs | 16 +---------------
datafusion/physical-expr/src/aggregate/stddev.rs | 16 +---------------
datafusion/physical-expr/src/aggregate/sum.rs | 16 +---------------
datafusion/physical-expr/src/aggregate/variance.rs | 16 +---------------
6 files changed, 6 insertions(+), 90 deletions(-)
diff --git a/datafusion/physical-expr/src/aggregate/average.rs
b/datafusion/physical-expr/src/aggregate/average.rs
index 637a7f99d..ccb73eed5 100644
--- a/datafusion/physical-expr/src/aggregate/average.rs
+++ b/datafusion/physical-expr/src/aggregate/average.rs
@@ -171,6 +171,7 @@ impl Accumulator for AvgAccumulator {
mod tests {
use super::*;
use crate::expressions::col;
+ use crate::expressions::tests::aggregate;
use crate::generic_test_op;
use arrow::record_batch::RecordBatch;
use arrow::{array::*, datatypes::*};
@@ -310,19 +311,4 @@ mod tests {
DataType::Float64
)
}
-
- fn aggregate(
- batch: &RecordBatch,
- agg: Arc<dyn AggregateExpr>,
- ) -> Result<ScalarValue> {
- let mut accum = agg.create_accumulator()?;
- let expr = agg.expressions();
- let values = expr
- .iter()
- .map(|e| e.evaluate(batch))
- .map(|r| r.map(|v| v.into_array(batch.num_rows())))
- .collect::<Result<Vec<_>>>()?;
- accum.update_batch(&values)?;
- accum.evaluate()
- }
}
diff --git a/datafusion/physical-expr/src/aggregate/correlation.rs
b/datafusion/physical-expr/src/aggregate/correlation.rs
index 0a01cf7df..2bdcce291 100644
--- a/datafusion/physical-expr/src/aggregate/correlation.rs
+++ b/datafusion/physical-expr/src/aggregate/correlation.rs
@@ -192,6 +192,7 @@ impl Accumulator for CorrelationAccumulator {
mod tests {
use super::*;
use crate::expressions::col;
+ use crate::expressions::tests::aggregate;
use crate::generic_test_op2;
use arrow::record_batch::RecordBatch;
use arrow::{array::*, datatypes::*};
@@ -445,21 +446,6 @@ mod tests {
Ok(())
}
- fn aggregate(
- batch: &RecordBatch,
- agg: Arc<dyn AggregateExpr>,
- ) -> Result<ScalarValue> {
- let mut accum = agg.create_accumulator()?;
- let expr = agg.expressions();
- let values = expr
- .iter()
- .map(|e| e.evaluate(batch))
- .map(|r| r.map(|v| v.into_array(batch.num_rows())))
- .collect::<Result<Vec<_>>>()?;
- accum.update_batch(&values)?;
- accum.evaluate()
- }
-
fn merge(
batch1: &RecordBatch,
batch2: &RecordBatch,
diff --git a/datafusion/physical-expr/src/aggregate/covariance.rs
b/datafusion/physical-expr/src/aggregate/covariance.rs
index 80d403b65..028b7d311 100644
--- a/datafusion/physical-expr/src/aggregate/covariance.rs
+++ b/datafusion/physical-expr/src/aggregate/covariance.rs
@@ -353,6 +353,7 @@ impl Accumulator for CovarianceAccumulator {
mod tests {
use super::*;
use crate::expressions::col;
+ use crate::expressions::tests::aggregate;
use crate::generic_test_op2;
use arrow::record_batch::RecordBatch;
use arrow::{array::*, datatypes::*};
@@ -620,21 +621,6 @@ mod tests {
Ok(())
}
- fn aggregate(
- batch: &RecordBatch,
- agg: Arc<dyn AggregateExpr>,
- ) -> Result<ScalarValue> {
- let mut accum = agg.create_accumulator()?;
- let expr = agg.expressions();
- let values = expr
- .iter()
- .map(|e| e.evaluate(batch))
- .map(|r| r.map(|v| v.into_array(batch.num_rows())))
- .collect::<Result<Vec<_>>>()?;
- accum.update_batch(&values)?;
- accum.evaluate()
- }
-
fn merge(
batch1: &RecordBatch,
batch2: &RecordBatch,
diff --git a/datafusion/physical-expr/src/aggregate/stddev.rs
b/datafusion/physical-expr/src/aggregate/stddev.rs
index 560ea6f6b..df02b8ac8 100644
--- a/datafusion/physical-expr/src/aggregate/stddev.rs
+++ b/datafusion/physical-expr/src/aggregate/stddev.rs
@@ -217,6 +217,7 @@ impl Accumulator for StddevAccumulator {
mod tests {
use super::*;
use crate::expressions::col;
+ use crate::expressions::tests::aggregate;
use crate::generic_test_op;
use arrow::record_batch::RecordBatch;
use arrow::{array::*, datatypes::*};
@@ -417,21 +418,6 @@ mod tests {
Ok(())
}
- fn aggregate(
- batch: &RecordBatch,
- agg: Arc<dyn AggregateExpr>,
- ) -> Result<ScalarValue> {
- let mut accum = agg.create_accumulator()?;
- let expr = agg.expressions();
- let values = expr
- .iter()
- .map(|e| e.evaluate(batch))
- .map(|r| r.map(|v| v.into_array(batch.num_rows())))
- .collect::<Result<Vec<_>>>()?;
- accum.update_batch(&values)?;
- accum.evaluate()
- }
-
fn merge(
batch1: &RecordBatch,
batch2: &RecordBatch,
diff --git a/datafusion/physical-expr/src/aggregate/sum.rs
b/datafusion/physical-expr/src/aggregate/sum.rs
index 12572f9a9..00404ee99 100644
--- a/datafusion/physical-expr/src/aggregate/sum.rs
+++ b/datafusion/physical-expr/src/aggregate/sum.rs
@@ -333,6 +333,7 @@ impl Accumulator for SumAccumulator {
mod tests {
use super::*;
use crate::expressions::col;
+ use crate::expressions::tests::aggregate;
use crate::generic_test_op;
use arrow::datatypes::*;
use arrow::record_batch::RecordBatch;
@@ -531,19 +532,4 @@ mod tests {
DataType::Float64
)
}
-
- fn aggregate(
- batch: &RecordBatch,
- agg: Arc<dyn AggregateExpr>,
- ) -> Result<ScalarValue> {
- let mut accum = agg.create_accumulator()?;
- let expr = agg.expressions();
- let values = expr
- .iter()
- .map(|e| e.evaluate(batch))
- .map(|r| r.map(|v| v.into_array(batch.num_rows())))
- .collect::<Result<Vec<_>>>()?;
- accum.update_batch(&values)?;
- accum.evaluate()
- }
}
diff --git a/datafusion/physical-expr/src/aggregate/variance.rs
b/datafusion/physical-expr/src/aggregate/variance.rs
index 306f1512f..775078733 100644
--- a/datafusion/physical-expr/src/aggregate/variance.rs
+++ b/datafusion/physical-expr/src/aggregate/variance.rs
@@ -297,6 +297,7 @@ impl Accumulator for VarianceAccumulator {
mod tests {
use super::*;
use crate::expressions::col;
+ use crate::expressions::tests::aggregate;
use crate::generic_test_op;
use arrow::record_batch::RecordBatch;
use arrow::{array::*, datatypes::*};
@@ -498,21 +499,6 @@ mod tests {
Ok(())
}
- fn aggregate(
- batch: &RecordBatch,
- agg: Arc<dyn AggregateExpr>,
- ) -> Result<ScalarValue> {
- let mut accum = agg.create_accumulator()?;
- let expr = agg.expressions();
- let values = expr
- .iter()
- .map(|e| e.evaluate(batch))
- .map(|r| r.map(|v| v.into_array(batch.num_rows())))
- .collect::<Result<Vec<_>>>()?;
- accum.update_batch(&values)?;
- accum.evaluate()
- }
-
fn merge(
batch1: &RecordBatch,
batch2: &RecordBatch,
