Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix RMM crash in FileCacheIntegrationSuite with ARENA memory allocator #9314

Merged
merged 1 commit into from
Sep 28, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,22 @@

package org.apache.spark.sql.rapids.filecache

import com.nvidia.spark.rapids.{RapidsBufferCatalog, RapidsDeviceMemoryStore, SparkQueryCompareTestSuite}
import com.nvidia.spark.rapids.SparkQueryCompareTestSuite
import com.nvidia.spark.rapids.shims.GpuBatchScanExec
import org.scalatest.BeforeAndAfterEach

import org.apache.spark.SparkConf
import org.apache.spark.sql.execution.SparkPlan
import org.apache.spark.sql.execution.metric.SQLMetric
import org.apache.spark.sql.rapids.GpuFileSourceScanExec

class FileCacheIntegrationSuite extends SparkQueryCompareTestSuite with BeforeAndAfterEach {
class FileCacheIntegrationSuite extends SparkQueryCompareTestSuite {
import com.nvidia.spark.rapids.GpuMetric._

private val FILE_SPLITS_PARQUET = "file-splits.parquet"
private val FILE_SPLITS_ORC = "file-splits.orc"
private val MAP_OF_STRINGS_PARQUET = "map_of_strings.snappy.parquet"
private val SCHEMA_CANT_PRUNE_ORC = "schema-cant-prune.orc"

override def beforeEach(): Unit = {
val deviceStorage = new RapidsDeviceMemoryStore()
val catalog = new RapidsBufferCatalog(deviceStorage)
RapidsBufferCatalog.setDeviceStorage(deviceStorage)
RapidsBufferCatalog.setCatalog(catalog)
}

override def afterEach(): Unit = {
RapidsBufferCatalog.close()
}

def isFileCacheEnabled(conf: SparkConf): Boolean = {
// File cache only supported on Spark 3.2+
assumeSpark320orLater
Expand Down