From 65c2a7d9e912690941c6fc50a3c55cf3fba0023c Mon Sep 17 00:00:00 2001 From: "Robert (Bobby) Evans" Date: Thu, 5 Dec 2024 13:57:19 -0600 Subject: [PATCH] Deal with spark changes fro colum<->expression conversions Signed-off-by: Robert (Bobby) Evans --- .../org/apache/spark/sql/tests/datagen/DataGenExprShims.scala | 4 ++-- .../scala/org/apache/spark/sql/nvidia/DFUDFShims.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/datagen/src/main/spark400/scala/org/apache/spark/sql/tests/datagen/DataGenExprShims.scala b/datagen/src/main/spark400/scala/org/apache/spark/sql/tests/datagen/DataGenExprShims.scala index 2884968660d..3480718dbc7 100644 --- a/datagen/src/main/spark400/scala/org/apache/spark/sql/tests/datagen/DataGenExprShims.scala +++ b/datagen/src/main/spark400/scala/org/apache/spark/sql/tests/datagen/DataGenExprShims.scala @@ -24,6 +24,6 @@ import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.sql.internal.ExpressionUtils.{column, expression} object DataGenExprShims { - def columnToExpr(c: Column): Expression = c - def exprToColumn(e: Expression): Column = e + def columnToExpr(c: Column): Expression = expression(c) + def exprToColumn(e: Expression): Column = column(e) } diff --git a/sql-plugin/src/main/spark400/scala/org/apache/spark/sql/nvidia/DFUDFShims.scala b/sql-plugin/src/main/spark400/scala/org/apache/spark/sql/nvidia/DFUDFShims.scala index e67dfb450d8..8343fe5379b 100644 --- a/sql-plugin/src/main/spark400/scala/org/apache/spark/sql/nvidia/DFUDFShims.scala +++ b/sql-plugin/src/main/spark400/scala/org/apache/spark/sql/nvidia/DFUDFShims.scala @@ -24,6 +24,6 @@ import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.sql.internal.ExpressionUtils.{column, expression} object DFUDFShims { - def columnToExpr(c: Column): Expression = c - def exprToColumn(e: Expression): Column = e + def columnToExpr(c: Column): Expression = expression(c) + def exprToColumn(e: Expression): Column = column(e) }