You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ag...@apache.org on 2022/05/02 15:30:30 UTC
[arrow-datafusion] branch master updated: remove duplicated function format_state_name() (#2414)
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 1a52e9a29 remove duplicated function format_state_name() (#2414)
1a52e9a29 is described below
commit 1a52e9a29ef89a94c8d9eb7646b4c71872b6da2d
Author: DuRipeng <45...@qq.com>
AuthorDate: Mon May 2 23:30:26 2022 +0800
remove duplicated function format_state_name() (#2414)
---
datafusion/physical-expr/src/aggregate/array_agg_distinct.rs | 2 +-
datafusion/physical-expr/src/aggregate/count_distinct.rs | 1 +
datafusion/physical-expr/src/aggregate/mod.rs | 4 ----
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/datafusion/physical-expr/src/aggregate/array_agg_distinct.rs b/datafusion/physical-expr/src/aggregate/array_agg_distinct.rs
index dfe19e0eb..d68cdc75b 100644
--- a/datafusion/physical-expr/src/aggregate/array_agg_distinct.rs
+++ b/datafusion/physical-expr/src/aggregate/array_agg_distinct.rs
@@ -17,7 +17,6 @@
//! Implementations for DISTINCT expressions, e.g. `COUNT(DISTINCT c)`
-use super::*;
use arrow::datatypes::{DataType, Field};
use std::any::Any;
use std::fmt::Debug;
@@ -26,6 +25,7 @@ use std::sync::Arc;
use arrow::array::{Array, ArrayRef};
use std::collections::HashSet;
+use crate::expressions::format_state_name;
use crate::{AggregateExpr, PhysicalExpr};
use datafusion_common::Result;
use datafusion_common::ScalarValue;
diff --git a/datafusion/physical-expr/src/aggregate/count_distinct.rs b/datafusion/physical-expr/src/aggregate/count_distinct.rs
index cb32dcd49..aab093fec 100644
--- a/datafusion/physical-expr/src/aggregate/count_distinct.rs
+++ b/datafusion/physical-expr/src/aggregate/count_distinct.rs
@@ -25,6 +25,7 @@ use ahash::RandomState;
use arrow::array::{Array, ArrayRef};
use std::collections::HashSet;
+use crate::expressions::format_state_name;
use crate::{AggregateExpr, PhysicalExpr};
use datafusion_common::ScalarValue;
use datafusion_common::{DataFusionError, Result};
diff --git a/datafusion/physical-expr/src/aggregate/mod.rs b/datafusion/physical-expr/src/aggregate/mod.rs
index a9f3167c4..106087db5 100644
--- a/datafusion/physical-expr/src/aggregate/mod.rs
+++ b/datafusion/physical-expr/src/aggregate/mod.rs
@@ -80,7 +80,3 @@ pub trait AggregateExpr: Send + Sync + Debug {
#[derive(Debug, PartialEq, Eq, Hash, Clone)]
struct DistinctScalarValues(Vec<ScalarValue>);
-
-fn format_state_name(name: &str, state_name: &str) -> String {
- format!("{}[{}]", name, state_name)
-}