Skip to content

Remove GroupByScalar and use ScalarValue in preparation for supporting null values in GroupBy#786

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
alamb merged 1 commit into from
Jul 30, 2021
Merged

Remove GroupByScalar and use ScalarValue in preparation for supporting null values in GroupBy #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 3 additions & 10 deletions datafusion/src/physical_plan/distinct_expressions.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
//! Implementations for DISTINCT expressions, e.g. `COUNT(DISTINCT c)`

use std::any::Any;
use std::convert::TryFrom;
use std::fmt::Debug;
use std::hash::Hash;
use std::sync::Arc;
Expand All@@ -29,12 +28,11 @@ use ahash::RandomState;
use std::collections::HashSet;

use crate::error::{DataFusionError, Result};
use crate::physical_plan::group_scalar::GroupByScalar;
use crate::physical_plan::{Accumulator, AggregateExpr, PhysicalExpr};
use crate::scalar::ScalarValue;

#[derive(Debug, PartialEq, Eq, Hash, Clone)]
struct DistinctScalarValues(Vec<GroupByScalar>);
struct DistinctScalarValues(Vec<ScalarValue>);

fn format_state_name(name: &str, state_name: &str) -> String {
format!("{}[{}]", name, state_name)
Expand DownExpand Up@@ -137,12 +135,7 @@ impl Accumulator for DistinctCountAccumulator {
fn update(&mut self, values: &[ScalarValue]) -> Result<()> {
// If a row has a NULL, it is not included in the final count.
if !values.iter().any(|v| v.is_null()) {
self.values.insert(DistinctScalarValues(
values
.iter()
.map(GroupByScalar::try_from)
.collect::<Result<Vec<_>>>()?,
));
self.values.insert(DistinctScalarValues(values.to_vec()));
}

Ok(())
Expand DownExpand Up@@ -195,7 +188,7 @@ impl Accumulator for DistinctCountAccumulator {
self.values.iter().for_each(|distinct_values| {
distinct_values.0.iter().enumerate().for_each(
|(col_index, distinct_value)| {
cols_vec[col_index].push(ScalarValue::from(distinct_value));
cols_vec[col_index].push(distinct_value.clone());
},
)
});
Expand Down
217 changes: 0 additions & 217 deletions datafusion/src/physical_plan/group_scalar.rs
View file
Open in desktop

This file was deleted.

Loading