diff options
author | Sean Owen <sowen@cloudera.com> | 2017-02-16 12:32:45 +0000 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2017-02-16 12:32:45 +0000 |
commit | 0e2405490f2056728d1353abbac6f3ea177ae533 (patch) | |
tree | 1a9ec960faec7abcb8d8fbac43b6a6dc633d2297 /sql/hive | |
parent | 3871d94a695d47169720e877f77ff1e4bede43ee (diff) | |
download | spark-0e2405490f2056728d1353abbac6f3ea177ae533.tar.gz spark-0e2405490f2056728d1353abbac6f3ea177ae533.tar.bz2 spark-0e2405490f2056728d1353abbac6f3ea177ae533.zip |
[SPARK-19550][BUILD][CORE][WIP] Remove Java 7 support
- Move external/java8-tests tests into core, streaming, sql and remove
- Remove MaxPermGen and related options
- Fix some reflection / TODOs around Java 8+ methods
- Update doc references to 1.7/1.8 differences
- Remove Java 7/8 related build profiles
- Update some plugins for better Java 8 compatibility
- Fix a few Java-related warnings
For the future:
- Update Java 8 examples to fully use Java 8
- Update Java tests to use lambdas for simplicity
- Update Java internal implementations to use lambdas
## How was this patch tested?
Existing tests
Author: Sean Owen <sowen@cloudera.com>
Closes #16871 from srowen/SPARK-19493.
Diffstat (limited to 'sql/hive')
-rw-r--r-- | sql/hive/pom.xml | 3 | ||||
-rw-r--r-- | sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/ScriptTransformationExec.scala | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 9aedaf234e..0f249d7d59 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -190,6 +190,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> + <version>3.0.0</version> <executions> <execution> <id>add-scala-test-sources</id> @@ -219,7 +220,7 @@ <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> + <argLine>-da -Xmx3g -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine> </configuration> </plugin> <plugin> diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/ScriptTransformationExec.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/ScriptTransformationExec.scala index e7c165c5f8..d786a610f1 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/ScriptTransformationExec.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/ScriptTransformationExec.scala @@ -137,21 +137,13 @@ case class ScriptTransformationExec( throw writerThread.exception.get } - // Checks if the proc is still alive (incase the command ran was bad) - // The ideal way to do this is to use Java 8's Process#isAlive() - // but it cannot be used because Spark still supports Java 7. - // Following is a workaround used to check if a process is alive in Java 7 - // TODO: Once builds are switched to Java 8, this can be changed - try { + if (!proc.isAlive) { val exitCode = proc.exitValue() if (exitCode != 0) { logError(stderrBuffer.toString) // log the stderr circular buffer throw new SparkException(s"Subprocess exited with status $exitCode. " + s"Error: ${stderrBuffer.toString}", cause) } - } catch { - case _: IllegalThreadStateException => - // This means that the process is still alive. Move ahead } } |