[SPARK-20683] Revert recursive uncaching (apache#188)

mccheah · May 19, 2017 · c458265 · c458265
1 parent a305676
commit c458265
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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
@@ -120,7 +120,7 @@ class CacheManager extends Logging {
     val it = cachedData.iterator()
     while (it.hasNext) {
       val cd = it.next()
-      if (cd.plan.find(_.sameResult(plan)).isDefined) {
+      if (cd.plan.sameResult(plan)) {
         cd.cachedRepresentation.cachedColumnBuffers.unpersist(blocking)
         it.remove()
       }

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CachedTableSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CachedTableSuite.scala
@@ -643,7 +643,7 @@ class CachedTableSuite extends QueryTest with SQLTestUtils with SharedSQLContext
     }
   }
 
-  test("SPARK-19765: UNCACHE TABLE should un-cache all cached plans that refer to this table") {
+  ignore("SPARK-19765: UNCACHE TABLE should un-cache all cached plans that refer to this table") {
     withTable("t") {
       withTempPath { path =>
         Seq(1 -> "a").toDF("i", "j").write.parquet(path.getCanonicalPath)