You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/07/21 23:35:20 UTC
git commit: Fix flakey HiveQuerySuite test
Repository: spark
Updated Branches:
refs/heads/master 872538c60 -> abeacffb7
Fix flakey HiveQuerySuite test
Result may not be returned in the expected order, so relax that constraint.
Author: Aaron Davidson <aa...@databricks.com>
Closes #1514 from aarondav/flakey and squashes the following commits:
e5af823 [Aaron Davidson] Fix flakey HiveQuerySuite test
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/abeacffb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/abeacffb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/abeacffb
Branch: refs/heads/master
Commit: abeacffb7bcdfa3eeb1e969aa546029a7b464eaa
Parents: 872538c
Author: Aaron Davidson <aa...@databricks.com>
Authored: Mon Jul 21 14:35:15 2014 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Mon Jul 21 14:35:15 2014 -0700
----------------------------------------------------------------------
.../sql/hive/execution/HiveQuerySuite.scala | 45 ++++++++++----------
1 file changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/abeacffb/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
index d57e99d..eb7df71 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
@@ -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()