Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
revert experimental change
  • Loading branch information
andygrove committed Jul 21, 2024
commit 34b0b7f0638cfd5acb329b07b272315dbd4549c5
15 changes: 2 additions & 13 deletions datafusion/physical-expr/src/expressions/is_not_null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,9 @@ impl PhysicalExpr for IsNotNullExpr {
fn evaluate(&self, batch: &RecordBatch) -> Result<ColumnarValue> {
let arg = self.arg.evaluate(batch)?;
match arg {
ColumnarValue::Array(array) if array.as_any().is::<UnionArray>() => {
Ok(ColumnarValue::Array(Arc::new(
super::is_null::compute_is_not_null(array)?,
)))
}
ColumnarValue::Array(array) => {
if array.null_count() == 0 {
Ok(ColumnarValue::Scalar(ScalarValue::Boolean(Some(true))))
} else if array.null_count() == array.len() {
Ok(ColumnarValue::Scalar(ScalarValue::Boolean(Some(false))))
} else {
let is_not_null = super::is_null::compute_is_not_null(array)?;
Ok(ColumnarValue::Array(Arc::new(is_not_null)))
}
let is_not_null = super::is_null::compute_is_not_null(array)?;
Ok(ColumnarValue::Array(Arc::new(is_not_null)))
}
ColumnarValue::Scalar(scalar) => Ok(ColumnarValue::Scalar(
ScalarValue::Boolean(Some(!scalar.is_null())),
Expand Down
11 changes: 1 addition & 10 deletions datafusion/physical-expr/src/expressions/is_null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,8 @@ impl PhysicalExpr for IsNullExpr {
fn evaluate(&self, batch: &RecordBatch) -> Result<ColumnarValue> {
let arg = self.arg.evaluate(batch)?;
match arg {
ColumnarValue::Array(array) if array.as_any().is::<UnionArray>() => {
Ok(ColumnarValue::Array(Arc::new(compute_is_null(array)?)))
}
ColumnarValue::Array(array) => {
if array.null_count() == 0 {
Ok(ColumnarValue::Scalar(ScalarValue::Boolean(Some(false))))
} else if array.null_count() == array.len() {
Ok(ColumnarValue::Scalar(ScalarValue::Boolean(Some(true))))
} else {
Ok(ColumnarValue::Array(Arc::new(compute_is_null(array)?)))
}
Ok(ColumnarValue::Array(Arc::new(compute_is_null(array)?)))
}
ColumnarValue::Scalar(scalar) => Ok(ColumnarValue::Scalar(
ScalarValue::Boolean(Some(scalar.is_null())),
Expand Down