Skip to content

[SPARK-54004][SQL] Fix uncaching table by name without cascading #52712

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

[SPARK-54004][SQL] Fix uncaching table by name without cascading #52712

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
3 changes: 2 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/CacheManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import org.apache.hadoop.fs.{FileSystem, Path}

import org.apache.spark.internal.{Logging, MessageWithContext}
import org.apache.spark.internal.LogKeys._
import org.apache.spark.sql.catalyst.analysis.EliminateSubqueryAliases
import org.apache.spark.sql.catalyst.catalog.HiveTableRelation
import org.apache.spark.sql.catalyst.expressions.{Attribute, SubqueryExpression}
import org.apache.spark.sql.catalyst.optimizer.EliminateResolvedHint
Expand Down Expand Up @@ -224,7 +225,7 @@ class CacheManager extends Logging with AdaptiveSparkPlanHelper {
nameInCache.length == name.length && nameInCache.zip(name).forall(conf.resolver.tupled)
}

plan match {
EliminateSubqueryAliases(plan) match {
Copy link
Member

@viirya viirya Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why we keep SubqueryAlias when putting the logical plan into cache data.

Copy link
Contributor Author

@aokolnychyi aokolnychyi Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An alternative solution could be to call EliminateSubqueryAliases BEFORE putting the plan into the cache. This, however, will remove ALL subquery aliases... I was not sure about consequences, but I would be open to consider this option if everyone thinks it is safe.

Thoughts, @viirya @dongjoon-hyun @szehon-ho @cloud-fan?

Copy link
Contributor

@cloud-fan cloud-fan Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea we don't need SubqueryAlias in the cache keys, as during lookup, we call LogicalPlan#sameResult which strips the SubqueryAlias.

However, the cache key logical plans are exposed to custom normalization rules (See SparkSessionExtensions#injectPlanNormalizationRule), so seems safer to keep it.

Copy link
Contributor Author

@aokolnychyi aokolnychyi Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep it then, it is a fragile part of code.

case LogicalRelationWithTable(_, Some(catalogTable)) =>
isSameName(catalogTable.identifier.nameParts)

Expand Down
41 changes: 41 additions & 0 deletions 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,6 +26,7 @@ import scala.collection.mutable.HashSet
import scala.concurrent.duration._

import org.apache.spark.{CleanerListener, SparkRuntimeException}
import org.apache.spark.SparkConf
import org.apache.spark.executor.DataReadMethod._
import org.apache.spark.executor.DataReadMethod.DataReadMethod
import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent, SparkListenerJobStart}
Expand All @@ -34,6 +35,7 @@ import org.apache.spark.sql.catalyst.analysis.TempTableAlreadyExistsException
import org.apache.spark.sql.catalyst.expressions.SubqueryExpression
import org.apache.spark.sql.catalyst.plans.logical.{BROADCAST, Join, JoinStrategyHint, SHUFFLE_HASH}
import org.apache.spark.sql.catalyst.util.DateTimeConstants
import org.apache.spark.sql.connector.catalog.InMemoryCatalog
import org.apache.spark.sql.execution.{ColumnarToRowExec, ExecSubqueryExpression, RDDScanExec, SparkPlan, SparkPlanInfo}
import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanHelper, AQEPropagateEmptyRelation}
import org.apache.spark.sql.execution.columnar._
Expand All @@ -57,6 +59,9 @@ class CachedTableSuite extends QueryTest with SQLTestUtils
with AdaptiveSparkPlanHelper {
import testImplicits._

override def sparkConf: SparkConf = super.sparkConf
.set("spark.sql.catalog.testcat", classOf[InMemoryCatalog].getName)

setupTestData()

override def afterEach(): Unit = {
Expand Down Expand Up @@ -1853,4 +1858,40 @@ class CachedTableSuite extends QueryTest with SQLTestUtils
assert(!spark.catalog.tableExists("SPARK_52684"))
}
}

test("uncache DSv2 table via cache manager correctly uncaches views with logical plans") {
val t = "testcat.tbl"
withTable(t, "v") {
sql(s"CREATE TABLE $t (id int, data string) USING foo")
sql(s"INSERT INTO $t VALUES (1, 'a'), (2, 'b')")

// cache table
sql(s"CACHE TABLE $t")
assertCached(sql(s"SELECT * FROM $t"))
checkAnswer(sql(s"SELECT * FROM $t"), Seq(Row(1, "a"), Row(2, "b")))

// create and cache view
spark.table(t).select("id").createOrReplaceTempView("v")
sql("SELECT * FROM v").cache()
assertCached(sql("SELECT * FROM v"))
checkAnswer(sql("SELECT * FROM v"), Seq(Row(1), Row(2)))

// must invalidate only table, view must remain cached (cascade = false)
spark.sharedState.cacheManager.uncacheTableOrView(
spark,
Seq("testcat", "tbl"),
cascade = false)
assertNotCached(sql(s"SELECT * FROM $t"))
assertCached(sql("SELECT * FROM v"))

// must invalidate view (cascade = true)
spark.sharedState.cacheManager.uncacheTableOrView(
spark,
Seq("testcat", "tbl"),
cascade = true)

// verify view is not cached anymore
assertNotCached(sql("SELECT * FROM v"))
}
}
}
4 changes: 4 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/QueryTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,10 @@ abstract class QueryTest extends PlanTest {
s"level $storageLevel, but it doesn't.")
}

def assertNotCached(query: Dataset[_]): Unit = {
assertCached(query, numCachedTables = 0)
}

/**
* Asserts that a given [[Dataset]] does not have missing inputs in all the analyzed plans.
*/
Expand Down