Skip to content

Use standard make_null_array for CASE #223

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
merged 1 commit into from
Apr 30, 2021
+2 −32
Merged

Use standard make_null_array for CASE #223

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
34 changes: 2 additions & 32 deletions datafusion/src/physical_plan/expressions/case.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,36 +234,6 @@ fn if_then_else(
}
}

macro_rules! make_null_array {
($TY:ty, $N:expr) => {{
let mut builder = <$TY>::new($N);
for _ in 0..$N {
builder.append_null()?;
}
Ok(Arc::new(builder.finish()))
}};
}

fn build_null_array(data_type: &DataType, num_rows: usize) -> Result<ArrayRef> {
match data_type {
DataType::UInt8 => make_null_array!(array::UInt8Builder, num_rows),
DataType::UInt16 => make_null_array!(array::UInt16Builder, num_rows),
DataType::UInt32 => make_null_array!(array::UInt32Builder, num_rows),
DataType::UInt64 => make_null_array!(array::UInt64Builder, num_rows),
DataType::Int8 => make_null_array!(array::Int8Builder, num_rows),
DataType::Int16 => make_null_array!(array::Int16Builder, num_rows),
DataType::Int32 => make_null_array!(array::Int32Builder, num_rows),
DataType::Int64 => make_null_array!(array::Int64Builder, num_rows),
DataType::Float32 => make_null_array!(array::Float32Builder, num_rows),
DataType::Float64 => make_null_array!(array::Float64Builder, num_rows),
DataType::Utf8 => make_null_array!(array::StringBuilder, num_rows),
other => Err(DataFusionError::Execution(format!(
"CASE does not support '{:?}'",
other
))),
}
}

macro_rules! array_equals {
($TY:ty, $L:expr, $R:expr, $eq_fn:expr) => {{
let when_value = $L
Expand Down Expand Up @@ -347,7 +317,7 @@ impl CaseExpr {
let mut current_value: Option<ArrayRef> = if let Some(e) = &self.else_expr {
Some(e.evaluate(batch)?.into_array(batch.num_rows()))
} else {
Some(build_null_array(&return_type, batch.num_rows())?)
Some(new_null_array(&return_type, batch.num_rows()))
};

// walk backwards through the when/then expressions
Expand Down Expand Up @@ -388,7 +358,7 @@ impl CaseExpr {
let mut current_value: Option<ArrayRef> = if let Some(e) = &self.else_expr {
Some(e.evaluate(batch)?.into_array(batch.num_rows()))
} else {
Some(build_null_array(&return_type, batch.num_rows())?)
Some(new_null_array(&return_type, batch.num_rows()))
};

// walk backwards through the when/then expressions
Expand Down