alamb commented on code in PR #19727:
URL: https://github.com/apache/datafusion/pull/19727#discussion_r2708408947
##########
datafusion/functions-aggregate/src/covariance.rs:
##########
@@ -345,29 +304,14 @@ impl Accumulator for CovarianceAccumulator {
}
fn retract_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
- let values1 = &cast(&values[0], &DataType::Float64)?;
- let values2 = &cast(&values[1], &DataType::Float64)?;
- let mut arr1 = downcast_value!(values1, Float64Array).iter().flatten();
- let mut arr2 = downcast_value!(values2, Float64Array).iter().flatten();
-
- for i in 0..values1.len() {
- let value1 = if values1.is_valid(i) {
- arr1.next()
- } else {
- None
- };
- let value2 = if values2.is_valid(i) {
- arr2.next()
- } else {
- None
- };
-
- if value1.is_none() || value2.is_none() {
- continue;
- }
+ let values1 = as_float64_array(&values[0])?;
+ let values2 = as_float64_array(&values[1])?;
- let value1 = unwrap_or_internal_err!(value1);
- let value2 = unwrap_or_internal_err!(value2);
+ for (value1, value2) in values1.iter().zip(values2) {
Review Comment:
This is much nicer
##########
datafusion/functions-aggregate/src/variance.rs:
##########
@@ -561,9 +535,9 @@ impl GroupsAccumulator for VarianceGroupsAccumulator {
) -> Result<()> {
assert_eq!(values.len(), 3, "two arguments to merge_batch");
// first batch is counts, second is partial means, third is partial m2s
- let partial_counts = downcast_value!(values[0], UInt64Array);
Review Comment:
I wonder if we should deprecate downcast value and direct people to the
`as_*` methods ? It seems strange to have two ways to do something
##########
datafusion/functions-aggregate/src/covariance.rs:
##########
@@ -345,29 +304,14 @@ impl Accumulator for CovarianceAccumulator {
}
fn retract_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
- let values1 = &cast(&values[0], &DataType::Float64)?;
- let values2 = &cast(&values[1], &DataType::Float64)?;
- let mut arr1 = downcast_value!(values1, Float64Array).iter().flatten();
- let mut arr2 = downcast_value!(values2, Float64Array).iter().flatten();
-
- for i in 0..values1.len() {
- let value1 = if values1.is_valid(i) {
- arr1.next()
- } else {
- None
- };
- let value2 = if values2.is_valid(i) {
- arr2.next()
- } else {
- None
- };
-
- if value1.is_none() || value2.is_none() {
- continue;
- }
+ let values1 = as_float64_array(&values[0])?;
Review Comment:
this is certainly much nicer
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
