Skip to content

[SPARK-52684][SQL] Make CACHE TABLE Commands atomic while encountering execution errors #51386

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
wants to merge 1 commit into from
Closed

[SPARK-52684][SQL] Make CACHE TABLE Commands atomic while encountering execution errors #51386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 27 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/CacheTableExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,19 @@ package org.apache.spark.sql.execution.datasources.v2

import java.util.Locale

import scala.util.control.NonFatal

import org.apache.spark.sql.{DataFrame, Dataset}
import org.apache.spark.sql.catalyst.{InternalRow, TableIdentifier}
import org.apache.spark.sql.catalyst.analysis.LocalTempView
import org.apache.spark.sql.catalyst.expressions.Attribute
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap
import org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper
import org.apache.spark.sql.execution.command.CreateViewCommand
import org.apache.spark.sql.connector.catalog.Identifier
import org.apache.spark.sql.execution.command.{CreateViewCommand, DropTempViewCommand}
import org.apache.spark.storage.StorageLevel
import org.apache.spark.util.Utils

trait BaseCacheTableExec extends LeafV2CommandExec {
def relationName: String
Expand Down Expand Up @@ -60,7 +64,16 @@ trait BaseCacheTableExec extends LeafV2CommandExec {

if (!isLazy) {
// Performs eager caching.
dataFrameForCachedPlan.count()
try {
dataFrameForCachedPlan.count()
} catch {
case NonFatal(e) =>
// If the query fails, we should remove the cached table.
Utils.tryLogNonFatalError {
session.sharedState.cacheManager.uncacheQuery(session, planToCache, cascade = false)
}
throw e
}
}

Seq.empty
Expand Down Expand Up @@ -113,6 +126,18 @@ case class CacheTableAsSelectExec(
override lazy val dataFrameForCachedPlan: DataFrame = {
session.table(tempViewName)
}

override def run(): Seq[InternalRow] = {
try {
super.run()
} catch {
case NonFatal(e) =>
Utils.tryLogNonFatalError {
DropTempViewCommand(Identifier.of(Array.empty, tempViewName)).run(session)
}
throw e
}
}
}

case class UncacheTableExec(
Expand Down
11 changes: 10 additions & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/CachedTableSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import scala.concurrent.duration._

import org.apache.commons.io.FileUtils

import org.apache.spark.CleanerListener
import org.apache.spark.{CleanerListener, SparkException}
import org.apache.spark.executor.DataReadMethod._
import org.apache.spark.executor.DataReadMethod.DataReadMethod
import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent, SparkListenerJobStart}
Expand Down Expand Up @@ -1729,4 +1729,13 @@ class CachedTableSuite extends QueryTest with SQLTestUtils
}

}

test("SPARK-52684: Atomicity of cache table on error") {
withTempView("SPARK_52684") {
intercept[SparkException] {
spark.sql("CACHE TABLE SPARK_52684 AS SELECT raise_error('SPARK-52684') AS c1")
}
assert(!spark.catalog.tableExists("SPARK_52684"))
}
}
}