From 4cbeaaddc9969322e33fae84f12e337f3077de57 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Thu, 12 Sep 2019 13:27:53 -0500 Subject: [PATCH 01/11] Try upgrading surefire to 2.22.1 --- java/performance/pom.xml | 3 +-- java/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/java/performance/pom.xml b/java/performance/pom.xml index 43388b20102..82a6cb45cb6 100644 --- a/java/performance/pom.xml +++ b/java/performance/pom.xml @@ -144,11 +144,10 @@ maven-surefire-plugin - 2.17 + 2.22.1 - diff --git a/java/pom.xml b/java/pom.xml index 78c0aac0f8a..0c0e1cf1e50 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -388,7 +388,7 @@ maven-surefire-plugin - 2.20 + 2.22.1 true true @@ -501,10 +501,10 @@ - - com.google.flatbuffers - flatbuffers-java - ${dep.fbs.version} + + com.google.flatbuffers + flatbuffers-java + ${dep.fbs.version} com.google.guava From fb2b64733932597d328b8e432e86f007e6aeeac3 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Thu, 12 Sep 2019 15:49:59 -0500 Subject: [PATCH 02/11] try 3.0.0-M3 --- java/performance/pom.xml | 2 +- java/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/performance/pom.xml b/java/performance/pom.xml index 82a6cb45cb6..6dc7bde2c22 100644 --- a/java/performance/pom.xml +++ b/java/performance/pom.xml @@ -144,7 +144,7 @@ maven-surefire-plugin - 2.22.1 + 3.0.0-M3 diff --git a/java/pom.xml b/java/pom.xml index 0c0e1cf1e50..93c8dcaedf3 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -388,7 +388,7 @@ maven-surefire-plugin - 2.22.1 + 3.0.0-M3 true true From 74315852f958fa936e5a2121126fa66b44973896 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Thu, 12 Sep 2019 17:07:01 -0500 Subject: [PATCH 03/11] Do not fork JVM --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 93c8dcaedf3..ea2d0f94b03 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -39,7 +39,7 @@ 1.9.0 1.9.0 - 2 + 0 true 9+181-r4173-1 From 09a7bf9f5fccb4d1b28b5d18696dc66663593edf Mon Sep 17 00:00:00 2001 From: emkornfield Date: Thu, 12 Sep 2019 21:56:45 -0700 Subject: [PATCH 04/11] Add vector.max_allocation_bytes to config added to systemPropertyValues so non-forking case can be handled. --- java/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/java/pom.xml b/java/pom.xml index ea2d0f94b03..df5e9ae1ec9 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -397,6 +397,7 @@ ${project.build.directory} true + 1048576 From 3a83fd59da2b5012803f5de585a1c86075625385 Mon Sep 17 00:00:00 2001 From: emkornfield Date: Thu, 12 Sep 2019 22:12:16 -0700 Subject: [PATCH 05/11] add path fallback for json --- .../test/java/org/apache/arrow/vector/ipc/TestJSONFile.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java index 467d40cc410..061ccf6ef2b 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java @@ -330,6 +330,9 @@ public void testWriteReadDecimalJSON() throws IOException { @Test public void testSetStructLength() throws IOException { File file = new File("../../integration/data/struct_example.json"); + if (!file.exists()) { + file = new File("../integration/data/struct_example.json"); + } try ( BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE); ) { From 997cea35a3a95991337f6fd561ae0f67cc8b0bd2 Mon Sep 17 00:00:00 2001 From: emkornfield Date: Thu, 12 Sep 2019 22:15:05 -0700 Subject: [PATCH 06/11] Update TestIntegration.java add fallback paths for integration files. --- .../test/java/org/apache/arrow/tools/TestIntegration.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java index 6f14a15f83f..4e388b48d93 100644 --- a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java +++ b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java @@ -153,6 +153,9 @@ public void testValid() throws Exception { @Test public void testJSONRoundTripWithVariableWidth() throws Exception { File testJSONFile = new File("../../integration/data/simple.json"); + if (!testJSONFile.exists()) { + testJSONFile = new File("../integration/data/simple.json"); + } File testOutFile = testFolder.newFile("testOut.arrow"); File testRoundTripJSONFile = testFolder.newFile("testOut.json"); testOutFile.delete(); @@ -184,6 +187,9 @@ public void testJSONRoundTripWithVariableWidth() throws Exception { @Test public void testJSONRoundTripWithStruct() throws Exception { File testJSONFile = new File("../../integration/data/struct_example.json"); + if (!testJSONFile.exists()) { + testJSONFile = new File("../integration/data/struct_example.json"); + } File testOutFile = testFolder.newFile("testOutStruct.arrow"); File testRoundTripJSONFile = testFolder.newFile("testOutStruct.json"); testOutFile.delete(); From d805d2acb3fa338ffad7fb61a0393b02049e956a Mon Sep 17 00:00:00 2001 From: emkornfield Date: Thu, 12 Sep 2019 22:18:57 -0700 Subject: [PATCH 07/11] fix indentation. --- .../src/test/java/org/apache/arrow/tools/TestIntegration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java index 4e388b48d93..16d28905269 100644 --- a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java +++ b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java @@ -154,7 +154,7 @@ public void testValid() throws Exception { public void testJSONRoundTripWithVariableWidth() throws Exception { File testJSONFile = new File("../../integration/data/simple.json"); if (!testJSONFile.exists()) { - testJSONFile = new File("../integration/data/simple.json"); + testJSONFile = new File("../integration/data/simple.json"); } File testOutFile = testFolder.newFile("testOut.arrow"); File testRoundTripJSONFile = testFolder.newFile("testOut.json"); @@ -188,7 +188,7 @@ public void testJSONRoundTripWithVariableWidth() throws Exception { public void testJSONRoundTripWithStruct() throws Exception { File testJSONFile = new File("../../integration/data/struct_example.json"); if (!testJSONFile.exists()) { - testJSONFile = new File("../integration/data/struct_example.json"); + testJSONFile = new File("../integration/data/struct_example.json"); } File testOutFile = testFolder.newFile("testOutStruct.arrow"); File testRoundTripJSONFile = testFolder.newFile("testOutStruct.json"); From 9c63f96b897e71238c4c7589c6068914431ac28a Mon Sep 17 00:00:00 2001 From: emkornfield Date: Thu, 12 Sep 2019 22:30:24 -0700 Subject: [PATCH 08/11] set user timezone. --- java/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/java/pom.xml b/java/pom.xml index df5e9ae1ec9..75a6f55797b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -398,6 +398,7 @@ ${project.build.directory} true 1048576 + UTC From 1e3ae38e54b80ad630315becec6cc11593ebe10c Mon Sep 17 00:00:00 2001 From: emkornfield Date: Thu, 12 Sep 2019 23:10:54 -0700 Subject: [PATCH 09/11] use canonical file in read normalized. --- .../src/test/java/org/apache/arrow/tools/TestIntegration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java index 16d28905269..080d202e08b 100644 --- a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java +++ b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java @@ -219,7 +219,7 @@ public void testJSONRoundTripWithStruct() throws Exception { } private BufferedReader readNormalized(File f) throws IOException { - Map tree = om.readValue(f, Map.class); + Map tree = om.readValue(f.getCanonicalFile(), Map.class); String normalized = om.writeValueAsString(tree); return new BufferedReader(new StringReader(normalized)); } From 92b1beeb7829e15cf6a8392728ba92729a6efdd5 Mon Sep 17 00:00:00 2001 From: emkornfield Date: Thu, 12 Sep 2019 23:58:51 -0700 Subject: [PATCH 10/11] use canonical file --- .../src/test/java/org/apache/arrow/tools/TestIntegration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java index 080d202e08b..caa7aacc611 100644 --- a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java +++ b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java @@ -152,7 +152,7 @@ public void testValid() throws Exception { @Test public void testJSONRoundTripWithVariableWidth() throws Exception { - File testJSONFile = new File("../../integration/data/simple.json"); + File testJSONFile = new File("../../integration/data/simple.json").getCanonicalFile(); if (!testJSONFile.exists()) { testJSONFile = new File("../integration/data/simple.json"); } @@ -186,7 +186,7 @@ public void testJSONRoundTripWithVariableWidth() throws Exception { @Test public void testJSONRoundTripWithStruct() throws Exception { - File testJSONFile = new File("../../integration/data/struct_example.json"); + File testJSONFile = new File("../../integration/data/struct_example.json").getCanonicalFile(); if (!testJSONFile.exists()) { testJSONFile = new File("../integration/data/struct_example.json"); } From dcd698047c1bc41b87493d6c3d8f741d2b1927f2 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Fri, 13 Sep 2019 09:36:48 -0500 Subject: [PATCH 11/11] Disable Gandiva Java tests --- .travis.yml | 2 +- java/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1261f3877a5..09a53a6c9be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,7 +90,7 @@ matrix: - $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh script: - $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh || travis_terminate 1 - - $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh || travis_terminate 1 + # - $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh || travis_terminate 1 - $TRAVIS_BUILD_DIR/ci/travis_upload_cpp_coverage.sh || travis_terminate 1 - name: "Python 3.6 unit tests w/ Valgrind, conda-forge toolchain, coverage" compiler: gcc diff --git a/java/pom.xml b/java/pom.xml index 75a6f55797b..dee4c2d160b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -39,7 +39,7 @@ 1.9.0 1.9.0 - 0 + 2 true 9+181-r4173-1