fix

apache · Jul 16, 2024 · 64acd91 · 64acd91
1 parent 876e236
commit 64acd91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/native/core/src/execution/datafusion/planner.rs b/native/core/src/execution/datafusion/planner.rs
@@ -59,6 +59,7 @@ use datafusion_expr::expr::find_df_window_func;
 use datafusion_expr::{ScalarUDF, WindowFrame, WindowFrameBound, WindowFrameUnits};
 use datafusion_physical_expr::window::WindowExpr;
 use datafusion_physical_expr_common::aggregate::create_aggregate_expr;
+use datafusion_physical_expr_common::expressions::Literal;
 use itertools::Itertools;
 use jni::objects::GlobalRef;
 use num::{BigInt, ToPrimitive};
@@ -545,10 +546,14 @@ impl PhysicalPlanner {
 
                 // optimized path for CASE WHEN predicate THEN expr ELSE null END
                 if else_phy_expr.is_none() && when_then_pairs.len() == 1 {
-                    return Ok(Arc::new(ExprOrNull::new(
-                        when_then_pairs[0].0.clone(),
-                        when_then_pairs[0].1.clone(),
-                    )));
+                    let when_then = &when_then_pairs[0];
+                    // ExprOrNull does not support scalar expressions
+                    if !when_then.1.as_any().is::<Literal>() {
+                        return Ok(Arc::new(ExprOrNull::new(
+                            when_then.0.clone(),
+                            when_then.1.clone(),
+                        )));
+                    }
                 }
 
                 Ok(Arc::new(CaseExpr::try_new(

diff --git a/native/spark-expr/src/expr_or_null.rs b/native/spark-expr/src/expr_or_null.rs
@@ -91,10 +91,9 @@ impl PhysicalExpr for ExprOrNull {
             let bit_mask = arrow::compute::kernels::boolean::not(bit_mask)?;
             match self.expr.evaluate(batch)? {
                 ColumnarValue::Array(array) => Ok(ColumnarValue::Array(nullif(&array, &bit_mask)?)),
-                ColumnarValue::Scalar(value) => {
-                    let array = value.to_array_of_size(batch.num_rows())?;
-                    Ok(ColumnarValue::Array(nullif(&array, &bit_mask)?))
-                }
+                ColumnarValue::Scalar(_) => Err(DataFusionError::Execution(
+                    "expression did not evaluate to an array".to_string(),
+                )),
             }
         } else {
             Err(DataFusionError::Execution(