Skip to content

Fix flakey HiveQuerySuite test #1514

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

Fix flakey HiveQuerySuite test #1514

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
45 changes: 22 additions & 23 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,64 +421,63 @@ class HiveQuerySuite extends HiveComparisonTest {
val testKey = "spark.sql.key.usedfortestonly"
val testVal = "test.val.0"
val nonexistentKey = "nonexistent"
def rowsToPairs(rows: Array[Row]) = rows.map { case Row(key: String, value: String) =>
key -> value
}
def collectResults(rdd: SchemaRDD): Set[(String, String)] =
rdd.collect().map { case Row(key: String, value: String) => key -> value }.toSet

clear()

// "set" itself returns all config variables currently specified in SQLConf.
assert(hql("SET").collect().size == 0)

assertResult(Array(testKey -> testVal)) {
rowsToPairs(hql(s"SET $testKey=$testVal").collect())
assertResult(Set(testKey -> testVal)) {
collectResults(hql(s"SET $testKey=$testVal"))
}

assert(hiveconf.get(testKey, "") == testVal)
assertResult(Array(testKey -> testVal)) {
rowsToPairs(hql("SET").collect())
assertResult(Set(testKey -> testVal)) {
collectResults(hql("SET"))
}

hql(s"SET ${testKey + testKey}=${testVal + testVal}")
assert(hiveconf.get(testKey + testKey, "") == testVal + testVal)
assertResult(Array(testKey -> testVal, (testKey + testKey) -> (testVal + testVal))) {
rowsToPairs(hql("SET").collect())
assertResult(Set(testKey -> testVal, (testKey + testKey) -> (testVal + testVal))) {
collectResults(hql("SET"))
}

// "set key"
assertResult(Array(testKey -> testVal)) {
rowsToPairs(hql(s"SET $testKey").collect())
assertResult(Set(testKey -> testVal)) {
collectResults(hql(s"SET $testKey"))
}

assertResult(Array(nonexistentKey -> "<undefined>")) {
rowsToPairs(hql(s"SET $nonexistentKey").collect())
assertResult(Set(nonexistentKey -> "<undefined>")) {
collectResults(hql(s"SET $nonexistentKey"))
}

// Assert that sql() should have the same effects as hql() by repeating the above using sql().
clear()
assert(sql("SET").collect().size == 0)

assertResult(Array(testKey -> testVal)) {
rowsToPairs(sql(s"SET $testKey=$testVal").collect())
assertResult(Set(testKey -> testVal)) {
collectResults(sql(s"SET $testKey=$testVal"))
}

assert(hiveconf.get(testKey, "") == testVal)
assertResult(Array(testKey -> testVal)) {
rowsToPairs(sql("SET").collect())
assertResult(Set(testKey -> testVal)) {
collectResults(sql("SET"))
}

sql(s"SET ${testKey + testKey}=${testVal + testVal}")
assert(hiveconf.get(testKey + testKey, "") == testVal + testVal)
assertResult(Array(testKey -> testVal, (testKey + testKey) -> (testVal + testVal))) {
rowsToPairs(sql("SET").collect())
assertResult(Set(testKey -> testVal, (testKey + testKey) -> (testVal + testVal))) {
collectResults(sql("SET"))
}

assertResult(Array(testKey -> testVal)) {
rowsToPairs(sql(s"SET $testKey").collect())
assertResult(Set(testKey -> testVal)) {
collectResults(sql(s"SET $testKey"))
}

assertResult(Array(nonexistentKey -> "<undefined>")) {
rowsToPairs(sql(s"SET $nonexistentKey").collect())
assertResult(Set(nonexistentKey -> "<undefined>")) {
collectResults(sql(s"SET $nonexistentKey"))
}

clear()
Expand Down