-
Notifications
You must be signed in to change notification settings - Fork 232
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added Shim for BatchScanExec to Support Spark 4.0 [databricks] (#10944)
* Added shim for BatchScanExec to support Spark 4.0 Signed-off-by: Raza Jafri <rjafri@nvidia.com> * fixed the failing shim --------- Signed-off-by: Raza Jafri <rjafri@nvidia.com>
- Loading branch information
Showing
5 changed files
with
389 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
sql-plugin/src/main/spark350/scala/com/nvidia/spark/rapids/shims/BatchScanExecMetaBase.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright (c) 2024, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /*** spark-rapids-shim-json-lines | ||
| {"spark": "350"} | ||
| {"spark": "351"} | ||
| {"spark": "400"} | ||
| spark-rapids-shim-json-lines ***/ | ||
| package com.nvidia.spark.rapids.shims | ||
|
|
||
| import com.nvidia.spark.rapids._ | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions._ | ||
| import org.apache.spark.sql.execution._ | ||
| import org.apache.spark.sql.execution.datasources.v2.BatchScanExec | ||
|
|
||
| abstract class BatchScanExecMetaBase(p: BatchScanExec, | ||
| conf: RapidsConf, | ||
| parent: Option[RapidsMeta[_, _, _]], | ||
| rule: DataFromReplacementRule) | ||
| extends SparkPlanMeta[BatchScanExec](p, conf, parent, rule) { | ||
| // Replaces SubqueryBroadcastExec inside dynamic pruning filters with GPU counterpart | ||
| // if possible. Instead regarding filters as childExprs of current Meta, we create | ||
| // a new meta for SubqueryBroadcastExec. The reason is that the GPU replacement of | ||
| // BatchScanExec is independent from the replacement of the runtime filters. It is | ||
| // possible that the BatchScanExec is on the CPU, while the dynamic runtime filters | ||
| // are on the GPU. And vice versa. | ||
| protected lazy val runtimeFilters = { | ||
| val convertBroadcast = (bc: SubqueryBroadcastExec) => { | ||
| val meta = GpuOverrides.wrapAndTagPlan(bc, conf) | ||
| meta.tagForExplain() | ||
| meta.convertIfNeeded().asInstanceOf[BaseSubqueryExec] | ||
| } | ||
| wrapped.runtimeFilters.map { filter => | ||
| filter.transformDown { | ||
| case dpe @ DynamicPruningExpression(inSub: InSubqueryExec) => | ||
| inSub.plan match { | ||
| case bc: SubqueryBroadcastExec => | ||
| dpe.copy(inSub.copy(plan = convertBroadcast(bc))) | ||
| case reuse @ ReusedSubqueryExec(bc: SubqueryBroadcastExec) => | ||
| dpe.copy(inSub.copy(plan = reuse.copy(convertBroadcast(bc)))) | ||
| case _ => | ||
| dpe | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override val childExprs: Seq[BaseExprMeta[_]] = { | ||
| // We want to leave the runtime filters as CPU expressions | ||
| p.output.map(GpuOverrides.wrapExpr(_, conf, Some(this))) | ||
| } | ||
|
|
||
| override val childScans: scala.Seq[ScanMeta[_]] = | ||
| Seq(GpuOverrides.wrapScan(p.scan, conf, Some(this))) | ||
|
|
||
| override def tagPlanForGpu(): Unit = { | ||
| if (!p.runtimeFilters.isEmpty && !childScans.head.supportsRuntimeFilters) { | ||
| willNotWorkOnGpu("runtime filtering (DPP) is not supported for this scan") | ||
| } | ||
| } | ||
|
|
||
| override def convertToCpu(): SparkPlan = { | ||
| val cpu = wrapped.copy(runtimeFilters = runtimeFilters) | ||
| cpu.copyTagsFrom(wrapped) | ||
| cpu | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
sql-plugin/src/main/spark400/scala/com/nvidia/spark/rapids/shims/BatchScanExecMeta.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright (c) 2024, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /*** spark-rapids-shim-json-lines | ||
| {"spark": "400"} | ||
| spark-rapids-shim-json-lines ***/ | ||
| package com.nvidia.spark.rapids.shims | ||
|
|
||
| import com.nvidia.spark.rapids._ | ||
|
|
||
| import org.apache.spark.sql.catalyst.expressions._ | ||
| import org.apache.spark.sql.execution._ | ||
| import org.apache.spark.sql.execution.datasources.v2.BatchScanExec | ||
|
|
||
| class BatchScanExecMeta(p: BatchScanExec, | ||
| conf: RapidsConf, | ||
| parent: Option[RapidsMeta[_, _, _]], | ||
| rule: DataFromReplacementRule) | ||
| extends BatchScanExecMetaBase(p, conf, parent, rule) { | ||
| override def convertToGpu(): GpuExec = { | ||
| val spj = p.spjParams | ||
| GpuBatchScanExec(p.output, childScans.head.convertToGpu(), runtimeFilters, | ||
| p.ordering, p.table, spj) | ||
| } | ||
| } |
Oops, something went wrong.