diff options
| author | Sean Owen <sowen@cloudera.com> | 2014-12-15 17:12:05 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2014-12-15 17:12:05 -0800 |
| commit | 81112e4b573292e76c7feeed995751bd7a5fe489 (patch) | |
| tree | 3338c64a347b5c50f5e26f0c2ec27cbbcd231fd9 | |
| parent | 5c24759ddc25cbafbedbaafbf053d38015a7774e (diff) | |
| download | spark-81112e4b573292e76c7feeed995751bd7a5fe489.tar.gz spark-81112e4b573292e76c7feeed995751bd7a5fe489.tar.bz2 spark-81112e4b573292e76c7feeed995751bd7a5fe489.zip | |
SPARK-4814 [CORE] Enable assertions in SBT, Maven tests / AssertionError from Hive's LazyBinaryInteger
This enables assertions for the Maven and SBT build, but overrides the Hive module to not enable assertions.
Author: Sean Owen <sowen@cloudera.com>
Closes #3692 from srowen/SPARK-4814 and squashes the following commits:
caca704 [Sean Owen] Disable assertions just for Hive
f71e783 [Sean Owen] Enable assertions for SBT and Maven build
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 3 | ||||
| -rw-r--r-- | sql/hive/pom.xml | 4 |
3 files changed, 8 insertions, 1 deletions
@@ -958,7 +958,7 @@ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <junitxml>.</junitxml> <filereports>SparkTestSuite.txt</filereports> - <argLine>-Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine> + <argLine>-ea -Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine> <stderr/> <systemProperties> <java.awt.headless>true</java.awt.headless> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 39ac27f820..ff8cf81b28 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -256,6 +256,8 @@ object Hive { lazy val settings = Seq( javaOptions += "-XX:MaxPermSize=1g", + // Specially disable assertions since some Hive tests fail them + javaOptions in Test := (javaOptions in Test).value.filterNot(_ == "-ea"), // Multiple queries rely on the TestHive singleton. See comments there for more details. parallelExecution in Test := false, // Supporting all SerDes requires us to depend on deprecated APIs, so we turn off the warnings @@ -385,6 +387,7 @@ object TestSettings { javaOptions in Test += "-Dsun.io.serialization.extendedDebugInfo=true", javaOptions in Test ++= System.getProperties.filter(_._1 startsWith "spark") .map { case (k,v) => s"-D$k=$v" }.toSeq, + javaOptions in Test += "-ea", javaOptions in Test ++= "-Xmx3g -XX:PermSize=128M -XX:MaxNewSize=256m -XX:MaxPermSize=1g" .split(" ").toSeq, // This places test scope jars on the classpath of executors during tests. diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index f6805b9421..95db71c2fd 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -161,6 +161,10 @@ <plugin> <groupId>org.scalatest</groupId> <artifactId>scalatest-maven-plugin</artifactId> + <configuration> + <!-- Specially disable assertions since some Hive tests fail them --> + <argLine>-da -Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine> + </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> |