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 2015/12/28 20:45:59 UTC

spark git commit: [HOT-FIX] bypass hive test when parse logical plan to json

Repository: spark
Updated Branches:
  refs/heads/master ab6bedd85 -> 8543997f2


[HOT-FIX] bypass hive test when parse logical plan to json

https://github.com/apache/spark/pull/10311 introduces some rare, non-deterministic flakiness for hive udf tests, see https://github.com/apache/spark/pull/10311#issuecomment-166548851

I can't reproduce it locally, and may need more time to investigate, a quick solution is: bypass hive tests for json serialization.

Author: Wenchen Fan <we...@databricks.com>

Closes #10430 from cloud-fan/hot-fix.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8543997f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8543997f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8543997f

Branch: refs/heads/master
Commit: 8543997f2daa60dfa0509f149fab207de98145a0
Parents: ab6bedd
Author: Wenchen Fan <we...@databricks.com>
Authored: Mon Dec 28 11:45:44 2015 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Mon Dec 28 11:45:44 2015 -0800

----------------------------------------------------------------------
 sql/core/src/test/scala/org/apache/spark/sql/QueryTest.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/8543997f/sql/core/src/test/scala/org/apache/spark/sql/QueryTest.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/QueryTest.scala b/sql/core/src/test/scala/org/apache/spark/sql/QueryTest.scala
index 9246f55..442ae79 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/QueryTest.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/QueryTest.scala
@@ -198,6 +198,9 @@ abstract class QueryTest extends PlanTest {
       case a: ImperativeAggregate => return
     }
 
+    // bypass hive tests before we fix all corner cases in hive module.
+    if (this.getClass.getName.startsWith("org.apache.spark.sql.hive")) return
+
     val jsonString = try {
       logicalPlan.toJSON
     } catch {
@@ -209,9 +212,6 @@ abstract class QueryTest extends PlanTest {
            """.stripMargin, e)
     }
 
-    // bypass hive tests before we fix all corner cases in hive module.
-    if (this.getClass.getName.startsWith("org.apache.spark.sql.hive")) return
-
     // scala function is not serializable to JSON, use null to replace them so that we can compare
     // the plans later.
     val normalized1 = logicalPlan.transformAllExpressions {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org