Skip to content

Remove unused update and merge implementations from Aggregates and supporting ScalarValue arithmetic #1550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dandandan merged 2 commits into from
Jan 13, 2022
Merged

Remove unused update and merge implementations from Aggregates and supporting ScalarValue arithmetic #1550

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23551d6
Remove Scalar::{add,mul,div}
alamb Jan 11, 2022
dac0e03
fixups
alamb Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove Scalar::{add,mul,div}
  • Loading branch information
@alamb
alamb committed Jan 11, 2022
commit 23551d65a7c1789a89164dfe3b7fce1f1812a63e
23 changes: 4 additions & 19 deletions datafusion/src/physical_plan/expressions/average.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,8 @@ impl Accumulator for AvgAccumulator {
Ok(vec![ScalarValue::from(self.count), self.sum.clone()])
}

fn update(&mut self, values: &[ScalarValue]) -> Result<()> {
let values = &values[0];

self.count += (!values.is_null()) as u64;
self.sum = sum::sum(&self.sum, values)?;

Ok(())
fn update(&mut self, _values: &[ScalarValue]) -> Result<()> {
unimplemented!("update_batch is implemented instead");
}

fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
Expand All @@ -188,18 +183,8 @@ impl Accumulator for AvgAccumulator {
Ok(())
}

fn merge(&mut self, states: &[ScalarValue]) -> Result<()> {
let count = &states[0];
// counts are summed
if let ScalarValue::UInt64(Some(c)) = count {
self.count += c
} else {
unreachable!()
};

// sums are summed
self.sum = sum::sum(&self.sum, &states[1])?;
Ok(())
fn merge(&mut self, _states: &[ScalarValue]) -> Result<()> {
unimplemented!("merge_batch is implemented instead");
}

fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
Expand Down
22 changes: 6 additions & 16 deletions datafusion/src/physical_plan/expressions/count.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,28 +106,18 @@ impl CountAccumulator {
}

impl Accumulator for CountAccumulator {
fn update(&mut self, _values: &[ScalarValue]) -> Result<()> {
unimplemented!("update_batch is implemented instead");
}

fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
let array = &values[0];
self.count += (array.len() - array.data().null_count()) as u64;
Ok(())
}

fn update(&mut self, values: &[ScalarValue]) -> Result<()> {
let value = &values[0];
if !value.is_null() {
self.count += 1;
}
Ok(())
}

fn merge(&mut self, states: &[ScalarValue]) -> Result<()> {
let count = &states[0];
if let ScalarValue::UInt64(Some(delta)) = count {
self.count += *delta;
} else {
unreachable!()
}
Ok(())
fn merge(&mut self, _states: &[ScalarValue]) -> Result<()> {
unimplemented!("merge_batch is implemented instead");
}

fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
Expand Down
10 changes: 4 additions & 6 deletions datafusion/src/physical_plan/expressions/min_max.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,8 @@ impl Accumulator for MinAccumulator {
Ok(vec![self.min.clone()])
}

fn update(&mut self, values: &[ScalarValue]) -> Result<()> {
let value = &values[0];
self.min = min(&self.min, value)?;
Ok(())
fn update(&mut self, _values: &[ScalarValue]) -> Result<()> {
unimplemented!("update_batch is implemented instead");
}

fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
Expand All @@ -556,8 +554,8 @@ impl Accumulator for MinAccumulator {
Ok(())
}

fn merge(&mut self, states: &[ScalarValue]) -> Result<()> {
self.update(states)
fn merge(&mut self, _states: &[ScalarValue]) -> Result<()> {
unimplemented!("merge_batch is implemented instead");
}

fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
Expand Down
11 changes: 4 additions & 7 deletions datafusion/src/physical_plan/expressions/sum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,8 @@ impl Accumulator for SumAccumulator {
Ok(vec![self.sum.clone()])
}

fn update(&mut self, values: &[ScalarValue]) -> Result<()> {
// sum(v1, v2, v3) = v1 + v2 + v3
self.sum = sum(&self.sum, &values[0])?;
Ok(())
fn update(&mut self, _values: &[ScalarValue]) -> Result<()> {
unimplemented!("update_batch is implemented instead");
}

fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
Expand All @@ -365,9 +363,8 @@ impl Accumulator for SumAccumulator {
Ok(())
}

fn merge(&mut self, states: &[ScalarValue]) -> Result<()> {
// sum(sum1, sum2) = sum1 + sum2
self.update(states)
fn merge(&mut self, _states: &[ScalarValue]) -> Result<()> {
unimplemented!("merge_batch is implemented instead");
}

fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
Expand Down
Loading