Repository: calcite Updated Branches: refs/heads/master 502c10847 -> 9dc61aea2
[CALCITE-2238] [CALCITE-2239] Fix Pig and Spark adapter failures with JDK 10 This fixes both CALCITE-2238 and CALCITE-2239 since upgrading Apache Hadoop to 2.7.4+ fixes Java version parsing. See HADOOP-14586 for more information about how version parsing is important. Closes #662 Signed-off-by: Josh Elser <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/9dc61aea Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/9dc61aea Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/9dc61aea Branch: refs/heads/master Commit: 9dc61aea2bcf2ee453bde6b2a909bf7db2986f04 Parents: 502c108 Author: Kevin Risden <[email protected]> Authored: Thu Apr 12 19:33:34 2018 -0500 Committer: Josh Elser <[email protected]> Committed: Fri Apr 13 14:31:44 2018 -0400 ---------------------------------------------------------------------- .../java/org/apache/calcite/test/PigRelBuilderStyleTest.java | 6 +++++- pom.xml | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/9dc61aea/pig/src/test/java/org/apache/calcite/test/PigRelBuilderStyleTest.java ---------------------------------------------------------------------- diff --git a/pig/src/test/java/org/apache/calcite/test/PigRelBuilderStyleTest.java b/pig/src/test/java/org/apache/calcite/test/PigRelBuilderStyleTest.java index 605e07b..499d7e4 100644 --- a/pig/src/test/java/org/apache/calcite/test/PigRelBuilderStyleTest.java +++ b/pig/src/test/java/org/apache/calcite/test/PigRelBuilderStyleTest.java @@ -39,6 +39,7 @@ import org.apache.calcite.tools.RelBuilderFactory; import org.apache.hadoop.fs.Path; import org.apache.pig.pigunit.Cluster; import org.apache.pig.pigunit.PigTest; +import org.apache.pig.pigunit.pig.PigServer; import org.apache.pig.test.Util; import org.junit.After; @@ -277,7 +278,10 @@ public class PigRelBuilderStyleTest extends AbstractPigTest { @After public void shutdownPigServer() { - PigTest.getPigServer().shutdown(); + PigServer pigServer = PigTest.getPigServer(); + if (pigServer != null) { + pigServer.shutdown(); + } } @Before http://git-wip-us.apache.org/repos/asf/calcite/blob/9dc61aea/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 105ae4a..51bc1e6 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,8 @@ limitations under the License. <guava.version>19.0</guava.version> <joda.version>2.8.1</joda.version> <h2.version>1.4.185</h2.version> - <hadoop.version>2.7.0</hadoop.version> + <!-- Require Hadoop 2.7.4+ due to HADOOP-14586 --> + <hadoop.version>2.7.5</hadoop.version> <hamcrest.version>1.3</hamcrest.version> <hppc.version>0.7.1</hppc.version> <hsqldb.version>2.4.0</hsqldb.version>
