Skip to content

[SPARK-32524][SQL][TESTS] CachedBatchSerializerSuite should clean up InMemoryRelation.ser #29346

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.

Sign up for GitHub

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

Closed
dongjoon-hyun wants to merge 3 commits into from
Closed

[SPARK-32524][SQL][TESTS] CachedBatchSerializerSuite should clean up InMemoryRelation.ser #29346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a552287
[SPARK-32524][SQL][TESTS] CachedBatchSerializerSuite should clean up …
dongjoon-hyun Aug 4, 2020
57c0797
Reduce scope from spark to columnar
dongjoon-hyun Aug 4, 2020
71a75a0
Add beforeAll
dongjoon-hyun Aug 4, 2020
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
3 changes: 3 additions & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,9 @@ object InMemoryRelation {
ser.get
}

/* Visible for testing */
private[columnar] def clearSerializer(): Unit = synchronized { ser = None }

def convertToColumnarIfPossible(plan: SparkPlan): SparkPlan = plan match {
case gen: WholeStageCodegenExec => gen.child match {
case c2r: ColumnarToRowTransition => c2r.child match {
Expand Down
11 changes: 11 additions & 0 deletions ...e/src/test/scala/org/apache/spark/sql/execution/columnar/CachedBatchSerializerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.apache.spark.sql.{QueryTest, Row}
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.expressions.{Attribute, Expression}
import org.apache.spark.sql.columnar.{CachedBatch, CachedBatchSerializer}
import org.apache.spark.sql.execution.columnar.InMemoryRelation.clearSerializer
import org.apache.spark.sql.execution.vectorized.OnHeapColumnVector
import org.apache.spark.sql.internal.{SQLConf, StaticSQLConf}
import org.apache.spark.sql.test.SharedSparkSession
Expand Down Expand Up @@ -120,6 +121,16 @@ class CachedBatchSerializerSuite extends QueryTest with SharedSparkSession {
classOf[TestSingleIntColumnarCachedBatchSerializer].getName)
}

protected override def beforeAll(): Unit = {
super.beforeAll()
clearSerializer()
}

protected override def afterAll(): Unit = {
clearSerializer()
super.afterAll()
}

test("Columnar Cache Plugin") {
withTempPath { workDir =>
val workDirPath = workDir.getAbsolutePath
Expand Down