Skip to content

ARROW-6509: [Java][CI] Upgrade maven-surefire-plugin to version 3.0.0-M3, disable Gandiva JNI unit tests temporarily #5370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 11 commits into from
Closed

ARROW-6509: [Java][CI] Upgrade maven-surefire-plugin to version 3.0.0-M3, disable Gandiva JNI unit tests temporarily #5370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4cbeaad
Try upgrading surefire to 2.22.1
wesm Sep 12, 2019
fb2b647
try 3.0.0-M3
wesm Sep 12, 2019
7431585
Do not fork JVM
wesm Sep 12, 2019
09a7bf9
Add vector.max_allocation_bytes to config
emkornfield Sep 13, 2019
3a83fd5
add path fallback for json
emkornfield Sep 13, 2019
997cea3
Update TestIntegration.java
emkornfield Sep 13, 2019
d805d2a
fix indentation.
emkornfield Sep 13, 2019
9c63f96
set user timezone.
emkornfield Sep 13, 2019
1e3ae38
use canonical file in read normalized.
emkornfield Sep 13, 2019
92b1bee
use canonical file
emkornfield Sep 13, 2019
dcd6980
Disable Gandiva Java tests
wesm Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions java/performance/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,10 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<version>3.0.0-M3</version>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>

12 changes: 7 additions & 5 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<version>3.0.0-M3</version>
<configuration>
<enableAssertions>true</enableAssertions>
<childDelegation>true</childDelegation>
Expand All @@ -397,6 +397,8 @@
<systemPropertyVariables>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
<io.netty.tryReflectionSetAccessible>true</io.netty.tryReflectionSetAccessible>
<arrow.vector.max_allocation_bytes>1048576</arrow.vector.max_allocation_bytes>
<user.timezone>UTC</user.timezone>
</systemPropertyVariables>
<!-- Note: changing the below configuration might increase the max allocation size for a vector
which in turn can cause OOM. -->
Expand Down Expand Up @@ -501,10 +503,10 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-java</artifactId>
<version>${dep.fbs.version}</version>
<dependency>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-java</artifactId>
<version>${dep.fbs.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
12 changes: 9 additions & 3 deletions java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,10 @@ 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");
}
File testOutFile = testFolder.newFile("testOut.arrow");
File testRoundTripJSONFile = testFolder.newFile("testOut.json");
testOutFile.delete();
Expand Down Expand Up @@ -183,7 +186,10 @@ 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");
}
File testOutFile = testFolder.newFile("testOutStruct.arrow");
File testRoundTripJSONFile = testFolder.newFile("testOutStruct.json");
testOutFile.delete();
Expand Down Expand Up @@ -213,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));
}
Expand Down
3 changes: 3 additions & 0 deletions java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
) {
Expand Down