Skip to content

Rename NthValue::{first_value,last_value,nth_value} to satisfy clippy in Rust 1.55 #986

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
Sep 9, 2021
+10 −10
Merged

Rename NthValue::{first_value,last_value,nth_value} to satisfy clippy in Rust 1.55 #986

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
14 changes: 7 additions & 7 deletions datafusion/src/physical_plan/expressions/nth_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub struct NthValue {

impl NthValue {
/// Create a new FIRST_VALUE window aggregate function
pub fn first_value(
pub fn first(
name: impl Into<String>,
expr: Arc<dyn PhysicalExpr>,
data_type: DataType,
Expand All @@ -64,7 +64,7 @@ impl NthValue {
}

/// Create a new LAST_VALUE window aggregate function
pub fn last_value(
pub fn last(
name: impl Into<String>,
expr: Arc<dyn PhysicalExpr>,
data_type: DataType,
Expand All @@ -78,7 +78,7 @@ impl NthValue {
}

/// Create a new NTH_VALUE window aggregate function
pub fn nth_value(
pub fn nth(
name: impl Into<String>,
expr: Arc<dyn PhysicalExpr>,
data_type: DataType,
Expand Down Expand Up @@ -218,7 +218,7 @@ mod tests {

#[test]
fn first_value() -> Result<()> {
let first_value = NthValue::first_value(
let first_value = NthValue::first(
"first_value".to_owned(),
Arc::new(Column::new("arr", 0)),
DataType::Int32,
Expand All @@ -229,7 +229,7 @@ mod tests {

#[test]
fn last_value() -> Result<()> {
let last_value = NthValue::last_value(
let last_value = NthValue::last(
"last_value".to_owned(),
Arc::new(Column::new("arr", 0)),
DataType::Int32,
Expand All @@ -240,7 +240,7 @@ mod tests {

#[test]
fn nth_value_1() -> Result<()> {
let nth_value = NthValue::nth_value(
let nth_value = NthValue::nth(
"nth_value".to_owned(),
Arc::new(Column::new("arr", 0)),
DataType::Int32,
Expand All @@ -252,7 +252,7 @@ mod tests {

#[test]
fn nth_value_2() -> Result<()> {
let nth_value = NthValue::nth_value(
let nth_value = NthValue::nth(
"nth_value".to_owned(),
Arc::new(Column::new("arr", 0)),
DataType::Int32,
Expand Down
6 changes: 3 additions & 3 deletions datafusion/src/physical_plan/windows/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,19 @@ fn create_built_in_window_expr(
.map_err(|e| DataFusionError::Execution(format!("{:?}", e)))?;
let n: u32 = n as u32;
let data_type = args[0].data_type(input_schema)?;
Arc::new(NthValue::nth_value(name, arg, data_type, n)?)
Arc::new(NthValue::nth(name, arg, data_type, n)?)
}
BuiltInWindowFunction::FirstValue => {
let arg =
coerce(args, input_schema, &signature_for_built_in(fun))?[0].clone();
let data_type = args[0].data_type(input_schema)?;
Arc::new(NthValue::first_value(name, arg, data_type))
Arc::new(NthValue::first(name, arg, data_type))
}
BuiltInWindowFunction::LastValue => {
let arg =
coerce(args, input_schema, &signature_for_built_in(fun))?[0].clone();
let data_type = args[0].data_type(input_schema)?;
Arc::new(NthValue::last_value(name, arg, data_type))
Arc::new(NthValue::last(name, arg, data_type))
}
_ => {
return Err(DataFusionError::NotImplemented(format!(
Expand Down