From a32a3129bf94ef1d8ea6ad65ee21b772c23f8573 Mon Sep 17 00:00:00 2001 From: Adam Binford Date: Sun, 8 Sep 2024 08:54:54 -0400 Subject: [PATCH 1/2] Enable additional CreateArray tests --- native/core/src/execution/datafusion/planner.rs | 2 +- .../test/scala/org/apache/comet/CometExpressionSuite.scala | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/native/core/src/execution/datafusion/planner.rs b/native/core/src/execution/datafusion/planner.rs index a305774397..f2568cdc58 100644 --- a/native/core/src/execution/datafusion/planner.rs +++ b/native/core/src/execution/datafusion/planner.rs @@ -1855,7 +1855,7 @@ impl PhysicalPlanner { .into_iter() .zip(input_expr_types.into_iter().zip(coerced_input_types)) .map(|(expr, (from_type, to_type))| { - if !from_type.equals_datatype(&to_type) { + if from_type != to_type { Arc::new(CastExpr::new( expr, to_type, diff --git a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala index 3701be5fb6..471c40db4f 100644 --- a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala +++ b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala @@ -2085,13 +2085,11 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper { df.select(array(array(col("_4")), array(col("_4"), lit(null))))) checkSparkAnswerAndOperator(df.select(array(col("_8"), col("_13")))) // This ends up returning empty strings instead of nulls for the last element - // Fixed by https://github.com/apache/datafusion/commit/27304239ef79b50a443320791755bf74eed4a85d - // checkSparkAnswerAndOperator(df.select(array(col("_8"), col("_13"), lit(null)))) + checkSparkAnswerAndOperator(df.select(array(col("_8"), col("_13"), lit(null)))) checkSparkAnswerAndOperator(df.select(array(array(col("_8")), array(col("_13"))))) checkSparkAnswerAndOperator(df.select(array(col("_8"), col("_8"), lit(null)))) checkSparkAnswerAndOperator(df.select(array(struct("_4"), struct("_4")))) - // Fixed by https://github.com/apache/datafusion/commit/140f7cec78febd73d3db537a816badaaf567530a - // checkSparkAnswerAndOperator(df.select(array(struct(col("_8").alias("a")), struct(col("_13").alias("a"))))) + checkSparkAnswerAndOperator(df.select(array(struct(col("_8").alias("a")), struct(col("_13").alias("a"))))) } } } From bd02660c2d0b605887233a380ee6e2ec9e8be291 Mon Sep 17 00:00:00 2001 From: Adam Binford Date: Sun, 8 Sep 2024 10:26:22 -0400 Subject: [PATCH 2/2] Format --- .../src/test/scala/org/apache/comet/CometExpressionSuite.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala index 471c40db4f..8ede317f97 100644 --- a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala +++ b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala @@ -2089,7 +2089,8 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper { checkSparkAnswerAndOperator(df.select(array(array(col("_8")), array(col("_13"))))) checkSparkAnswerAndOperator(df.select(array(col("_8"), col("_8"), lit(null)))) checkSparkAnswerAndOperator(df.select(array(struct("_4"), struct("_4")))) - checkSparkAnswerAndOperator(df.select(array(struct(col("_8").alias("a")), struct(col("_13").alias("a"))))) + checkSparkAnswerAndOperator( + df.select(array(struct(col("_8").alias("a")), struct(col("_13").alias("a"))))) } } }