Skip to content

Commit 5b783fe

Browse files
wesmemkornfield
andcommitted
ARROW-6509: [Java][CI] Upgrade maven-surefire-plugin to version 3.0.0-M3, disable Gandiva JNI unit tests temporarily
To see if the CI issues go away. Closes #5370 from wesm/ARROW-6509 and squashes the following commits: dcd6980 <Wes McKinney> Disable Gandiva Java tests 92b1bee <emkornfield> use canonical file 1e3ae38 <emkornfield> use canonical file in read normalized. 9c63f96 <emkornfield> set user timezone. d805d2a <emkornfield> fix indentation. 997cea3 <emkornfield> Update TestIntegration.java 3a83fd5 <emkornfield> add path fallback for json 09a7bf9 <emkornfield> Add vector.max_allocation_bytes to config 7431585 <Wes McKinney> Do not fork JVM fb2b647 <Wes McKinney> try 3.0.0-M3 4cbeaad <Wes McKinney> Try upgrading surefire to 2.22.1 Lead-authored-by: Wes McKinney <wesm+git@apache.org> Co-authored-by: emkornfield <emkornfield@gmail.com> Signed-off-by: Wes McKinney <wesm+git@apache.org>
1 parent 4be02c7 commit 5b783fe

5 files changed

Lines changed: 21 additions & 11 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ matrix:
9090
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
9191
script:
9292
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh || travis_terminate 1
93-
- $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh || travis_terminate 1
93+
# - $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh || travis_terminate 1
9494
- $TRAVIS_BUILD_DIR/ci/travis_upload_cpp_coverage.sh || travis_terminate 1
9595
- name: "Python 3.6 unit tests w/ Valgrind, conda-forge toolchain, coverage"
9696
compiler: gcc

java/performance/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,10 @@
144144
</plugin>
145145
<plugin>
146146
<artifactId>maven-surefire-plugin</artifactId>
147-
<version>2.17</version>
147+
<version>3.0.0-M3</version>
148148
</plugin>
149149
</plugins>
150150
</pluginManagement>
151151
</build>
152152

153153
</project>
154-

java/pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@
388388
</plugin>
389389
<plugin>
390390
<artifactId>maven-surefire-plugin</artifactId>
391-
<version>2.20</version>
391+
<version>3.0.0-M3</version>
392392
<configuration>
393393
<enableAssertions>true</enableAssertions>
394394
<childDelegation>true</childDelegation>
@@ -397,6 +397,8 @@
397397
<systemPropertyVariables>
398398
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
399399
<io.netty.tryReflectionSetAccessible>true</io.netty.tryReflectionSetAccessible>
400+
<arrow.vector.max_allocation_bytes>1048576</arrow.vector.max_allocation_bytes>
401+
<user.timezone>UTC</user.timezone>
400402
</systemPropertyVariables>
401403
<!-- Note: changing the below configuration might increase the max allocation size for a vector
402404
which in turn can cause OOM. -->
@@ -501,10 +503,10 @@
501503

502504
<dependencyManagement>
503505
<dependencies>
504-
<dependency>
505-
<groupId>com.google.flatbuffers</groupId>
506-
<artifactId>flatbuffers-java</artifactId>
507-
<version>${dep.fbs.version}</version>
506+
<dependency>
507+
<groupId>com.google.flatbuffers</groupId>
508+
<artifactId>flatbuffers-java</artifactId>
509+
<version>${dep.fbs.version}</version>
508510
</dependency>
509511
<dependency>
510512
<groupId>com.google.guava</groupId>

java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,10 @@ public void testValid() throws Exception {
152152

153153
@Test
154154
public void testJSONRoundTripWithVariableWidth() throws Exception {
155-
File testJSONFile = new File("../../integration/data/simple.json");
155+
File testJSONFile = new File("../../integration/data/simple.json").getCanonicalFile();
156+
if (!testJSONFile.exists()) {
157+
testJSONFile = new File("../integration/data/simple.json");
158+
}
156159
File testOutFile = testFolder.newFile("testOut.arrow");
157160
File testRoundTripJSONFile = testFolder.newFile("testOut.json");
158161
testOutFile.delete();
@@ -183,7 +186,10 @@ public void testJSONRoundTripWithVariableWidth() throws Exception {
183186

184187
@Test
185188
public void testJSONRoundTripWithStruct() throws Exception {
186-
File testJSONFile = new File("../../integration/data/struct_example.json");
189+
File testJSONFile = new File("../../integration/data/struct_example.json").getCanonicalFile();
190+
if (!testJSONFile.exists()) {
191+
testJSONFile = new File("../integration/data/struct_example.json");
192+
}
187193
File testOutFile = testFolder.newFile("testOutStruct.arrow");
188194
File testRoundTripJSONFile = testFolder.newFile("testOutStruct.json");
189195
testOutFile.delete();
@@ -213,7 +219,7 @@ public void testJSONRoundTripWithStruct() throws Exception {
213219
}
214220

215221
private BufferedReader readNormalized(File f) throws IOException {
216-
Map<?, ?> tree = om.readValue(f, Map.class);
222+
Map<?, ?> tree = om.readValue(f.getCanonicalFile(), Map.class);
217223
String normalized = om.writeValueAsString(tree);
218224
return new BufferedReader(new StringReader(normalized));
219225
}

java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,9 @@ public void testWriteReadDecimalJSON() throws IOException {
330330
@Test
331331
public void testSetStructLength() throws IOException {
332332
File file = new File("../../integration/data/struct_example.json");
333+
if (!file.exists()) {
334+
file = new File("../integration/data/struct_example.json");
335+
}
333336
try (
334337
BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
335338
) {

0 commit comments

Comments
 (0)