From 45ee5c89103e06c305de9042dae5f949243cb90d Mon Sep 17 00:00:00 2001 From: Raza Jafri Date: Tue, 28 May 2024 14:46:25 -0700 Subject: [PATCH 1/3] Fixed Databricks build --- .../com/nvidia/spark/rapids/shims/Spark321PlusDBShims.scala | 4 ++-- .../execution/{shims => }/GpuSubqueryBroadcastMeta.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/{shims => }/GpuSubqueryBroadcastMeta.scala (97%) diff --git a/sql-plugin/src/main/spark330db/scala/com/nvidia/spark/rapids/shims/Spark321PlusDBShims.scala b/sql-plugin/src/main/spark330db/scala/com/nvidia/spark/rapids/shims/Spark321PlusDBShims.scala index 5e5bbed2942..fb60f15db4d 100644 --- a/sql-plugin/src/main/spark330db/scala/com/nvidia/spark/rapids/shims/Spark321PlusDBShims.scala +++ b/sql-plugin/src/main/spark330db/scala/com/nvidia/spark/rapids/shims/Spark321PlusDBShims.scala @@ -41,8 +41,8 @@ import org.apache.spark.sql.execution.exchange._ import org.apache.spark.sql.execution.python._ import org.apache.spark.sql.execution.window._ import org.apache.spark.sql.rapids.GpuSubstring -import org.apache.spark.sql.rapids.execution._ -import org.apache.spark.sql.rapids.execution.shims.{GpuSubqueryBroadcastMeta,ReuseGpuBroadcastExchangeAndSubquery} +import org.apache.spark.sql.rapids.execution.GpuSubqueryBroadcastMeta +import org.apache.spark.sql.rapids.execution.shims.ReuseGpuBroadcastExchangeAndSubquery import org.apache.spark.sql.rapids.shims._ import org.apache.spark.sql.types._ diff --git a/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/shims/GpuSubqueryBroadcastMeta.scala b/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala similarity index 97% rename from sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/shims/GpuSubqueryBroadcastMeta.scala rename to sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala index fbc013779c4..898e38c2520 100644 --- a/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/shims/GpuSubqueryBroadcastMeta.scala +++ b/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala @@ -19,7 +19,7 @@ {"spark": "332db"} {"spark": "341db"} spark-rapids-shim-json-lines ***/ -package org.apache.spark.sql.rapids.execution.shims +package org.apache.spark.sql.rapids.execution import com.nvidia.spark.rapids.{BaseExprMeta, DataFromReplacementRule, GpuExec, RapidsConf, RapidsMeta, SparkPlanMeta} @@ -94,7 +94,7 @@ class GpuSubqueryBroadcastMeta( override def convertToCpu(): SparkPlan = s override def convertToGpu(): GpuExec = { - GpuSubqueryBroadcastExec(s.name, s.index, s.buildKeys, broadcastBuilder())( + GpuSubqueryBroadcastExec(s.name, Seq(s.index), s.buildKeys, broadcastBuilder())( getBroadcastModeKeyExprs) } From e312f33d7c8740e808cb644c8995c96f3d311824 Mon Sep 17 00:00:00 2001 From: Raza Jafri Date: Tue, 28 May 2024 14:49:03 -0700 Subject: [PATCH 2/3] Signing off Signed-off-by: Raza Jafri From e261a04778635eae8debf142012bd4523c366456 Mon Sep 17 00:00:00 2001 From: raza jafri Date: Wed, 29 May 2024 01:30:17 +0000 Subject: [PATCH 3/3] Removed unused import --- .../spark/rapids/execution/GpuSubqueryBroadcastMeta.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala b/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala index 898e38c2520..76255b3e5a6 100644 --- a/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala +++ b/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala @@ -29,7 +29,6 @@ import org.apache.spark.sql.execution.{SparkPlan, SubqueryBroadcastExec} import org.apache.spark.sql.execution.adaptive.{BroadcastQueryStageExec} import org.apache.spark.sql.execution.exchange.{BroadcastExchangeExec, ReusedExchangeExec} import org.apache.spark.sql.execution.joins.HashedRelationBroadcastMode -import org.apache.spark.sql.rapids.execution._ class GpuSubqueryBroadcastMeta( s: SubqueryBroadcastExec, @@ -123,4 +122,4 @@ class GpuSubqueryBroadcastMeta( case m => throw new UnsupportedOperationException(s"Unknown broadcast mode $m") } } -} \ No newline at end of file +}