asfgit closed pull request #23469: [SPARK-26548][SQL] Don't hold CacheManager
write lock while computing executedPlan
URL: https://github.com/apache/spark/pull/23469
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/execution/CacheManager.scala
b/sql/core/src/main/scala/org/apache/spark/sql/execution/CacheManager.scala
index c9929935fb8ac..728fde54fe69a 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/CacheManager.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/CacheManager.scala
@@ -88,7 +88,7 @@ class CacheManager extends Logging {
def cacheQuery(
query: Dataset[_],
tableName: Option[String] = None,
- storageLevel: StorageLevel = MEMORY_AND_DISK): Unit = writeLock {
+ storageLevel: StorageLevel = MEMORY_AND_DISK): Unit = {
val planToCache = query.logicalPlan
if (lookupCachedData(planToCache).nonEmpty) {
logWarning("Asked to cache already cached data.")
@@ -100,7 +100,13 @@ class CacheManager extends Logging {
sparkSession.sessionState.executePlan(planToCache).executedPlan,
tableName,
planToCache)
- cachedData.add(CachedData(planToCache, inMemoryRelation))
+ writeLock {
+ if (lookupCachedData(planToCache).nonEmpty) {
+ logWarning("Data has already been cached.")
+ } else {
+ cachedData.add(CachedData(planToCache, inMemoryRelation))
+ }
+ }
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
