forked from NVIDIA/spark-rapids
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix batch use-after-close in partitioning, shuffle env init (NVIDIA#432)
Signed-off-by: Jason Lowe <[email protected]>
- Loading branch information
Showing
9 changed files
with
134 additions
and
70 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
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
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
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
61 changes: 61 additions & 0 deletions
61
tests/src/test/scala/com/nvidia/spark/rapids/GpuSinglePartitioningSuite.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,61 @@ | ||
| /* | ||
| * Copyright (c) 2020, 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. | ||
| */ | ||
|
|
||
| package com.nvidia.spark.rapids | ||
|
|
||
| import ai.rapids.cudf.{Cuda, Table} | ||
| import org.scalatest.FunSuite | ||
|
|
||
| import org.apache.spark.SparkConf | ||
| import org.apache.spark.sql.rapids.GpuShuffleEnv | ||
| import org.apache.spark.sql.vectorized.ColumnarBatch | ||
|
|
||
| class GpuSinglePartitioningSuite extends FunSuite with Arm { | ||
| private def buildBatch(): ColumnarBatch = { | ||
| withResource(new Table.TestBuilder() | ||
| .column(5, null.asInstanceOf[java.lang.Integer], 3, 1, 1, 1, 1, 1, 1, 1) | ||
| .column("five", "two", null, null, "one", "one", "one", "one", "one", "one") | ||
| .column(5.0, 2.0, 3.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) | ||
| .build()) { table => | ||
| GpuColumnVector.from(table) | ||
| } | ||
| } | ||
|
|
||
| test("generates contiguous split") { | ||
| val conf = new SparkConf().set("spark.shuffle.manager", GpuShuffleEnv.RAPIDS_SHUFFLE_CLASS) | ||
| TestUtils.withGpuSparkSession(conf) { _ => | ||
| GpuShuffleEnv.init(Cuda.memGetInfo()) | ||
| val partitioner = GpuSinglePartitioning(Nil) | ||
| withResource(buildBatch()) { expected => | ||
| // partition will consume batch, so make a new batch with incremented refcounts | ||
| val columns = GpuColumnVector.extractColumns(expected) | ||
| columns.foreach(_.incRefCount()) | ||
| val batch = new ColumnarBatch(columns.toArray, expected.numRows) | ||
| val result = partitioner.columnarEval(batch).asInstanceOf[Array[(ColumnarBatch, Int)]] | ||
| try { | ||
| assertResult(1)(result.length) | ||
| assertResult(0)(result.head._2) | ||
| val resultBatch = result.head._1 | ||
| // verify this is a contiguous split table | ||
| assert(resultBatch.column(0).isInstanceOf[GpuColumnVectorFromBuffer]) | ||
| TestUtils.compareBatches(expected, resultBatch) | ||
| } finally { | ||
| result.foreach(_._1.close()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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