dongjoon-hyun commented on code in PR #53143:
URL: https://github.com/apache/spark/pull/53143#discussion_r2547533286
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/CacheManager.scala:
##########
@@ -352,22 +353,35 @@ class CacheManager extends Logging with
AdaptiveSparkPlanHelper {
}
needToRecache.foreach { cd =>
cd.cachedRepresentation.cacheBuilder.clearCache()
+ tryRebuildCacheEntry(spark, cd).foreach { entry =>
+ this.synchronized {
+ if (lookupCachedDataInternal(entry.plan).nonEmpty) {
+ logWarning("While recaching, data was already added to cache.")
+ } else {
+ cachedData = entry +: cachedData
+ CacheManager.logCacheOperation(log"Re-cached Dataframe cache
entry:" +
+ log"${MDC(DATAFRAME_CACHE_ENTRY, entry)}")
+ }
+ }
+ }
+ }
+ }
+
+ private def tryRebuildCacheEntry(
+ spark: SparkSession,
+ cd: CachedData): Option[CachedData] = {
+ try {
val sessionWithConfigsOff = getOrCloneSessionWithConfigsOff(spark)
val (newKey, newCache) = sessionWithConfigsOff.withActive {
val refreshedPlan = V2TableRefreshUtil.refresh(cd.plan)
val qe = sessionWithConfigsOff.sessionState.executePlan(refreshedPlan)
qe.normalized ->
InMemoryRelation(cd.cachedRepresentation.cacheBuilder, qe)
}
- val recomputedPlan = cd.copy(plan = newKey, cachedRepresentation =
newCache)
- this.synchronized {
- if (lookupCachedDataInternal(recomputedPlan.plan).nonEmpty) {
- logWarning("While recaching, data was already added to cache.")
- } else {
- cachedData = recomputedPlan +: cachedData
- CacheManager.logCacheOperation(log"Re-cached Dataframe cache entry:"
+
- log"${MDC(DATAFRAME_CACHE_ENTRY, recomputedPlan)}")
- }
- }
+ Some(cd.copy(plan = newKey, cachedRepresentation = newCache))
+ } catch {
+ case NonFatal(e) =>
+ logWarning(log"Failed to recache query", e)
Review Comment:
I'm worrying about the side-effect of this part.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
