Skip to content

Commit

Permalink
[SPARK-5538][SQL] Fix flaky CachedTableSuite
Browse files Browse the repository at this point in the history
Author: Reynold Xin <rxin@databricks.com>

Closes #4379 from rxin/CachedTableSuite and squashes the following commits:

f2b44ce [Reynold Xin] [SQL] Fix flaky CachedTableSuite.
  • Loading branch information
rxin committed Feb 5, 2015
1 parent 6b4c7f0 commit 206f9bc
Showing 1 changed file with 19 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@

package org.apache.spark.sql

import scala.concurrent.duration._
import scala.language.implicitConversions
import scala.language.postfixOps

import org.scalatest.concurrent.Eventually._

import org.apache.spark.sql.TestData._
import org.apache.spark.sql.columnar._
import org.apache.spark.sql.Dsl._
Expand Down Expand Up @@ -191,7 +197,10 @@ class CachedTableSuite extends QueryTest {

sql("UNCACHE TABLE testData")
assert(!isCached("testData"), "Table 'testData' should not be cached")
assert(!isMaterialized(rddId), "Uncached in-memory table should have been unpersisted")

eventually(timeout(10 seconds)) {
assert(!isMaterialized(rddId), "Uncached in-memory table should have been unpersisted")
}
}

test("CACHE TABLE tableName AS SELECT * FROM anotherTable") {
Expand All @@ -204,7 +213,9 @@ class CachedTableSuite extends QueryTest {
"Eagerly cached in-memory table should have already been materialized")

uncacheTable("testCacheTable")
assert(!isMaterialized(rddId), "Uncached in-memory table should have been unpersisted")
eventually(timeout(10 seconds)) {
assert(!isMaterialized(rddId), "Uncached in-memory table should have been unpersisted")
}
}

test("CACHE TABLE tableName AS SELECT ...") {
Expand All @@ -217,7 +228,9 @@ class CachedTableSuite extends QueryTest {
"Eagerly cached in-memory table should have already been materialized")

uncacheTable("testCacheTable")
assert(!isMaterialized(rddId), "Uncached in-memory table should have been unpersisted")
eventually(timeout(10 seconds)) {
assert(!isMaterialized(rddId), "Uncached in-memory table should have been unpersisted")
}
}

test("CACHE LAZY TABLE tableName") {
Expand All @@ -235,7 +248,9 @@ class CachedTableSuite extends QueryTest {
"Lazily cached in-memory table should have been materialized")

uncacheTable("testData")
assert(!isMaterialized(rddId), "Uncached in-memory table should have been unpersisted")
eventually(timeout(10 seconds)) {
assert(!isMaterialized(rddId), "Uncached in-memory table should have been unpersisted")
}
}

test("InMemoryRelation statistics") {
Expand Down

0 comments on commit 206f9bc

Please sign in to comment.