From 587f1807c2cc0cf6cef0c3b39aec52902f19ffa3 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Tue, 12 Sep 2017 20:24:45 -0700 Subject: [PATCH] Try to improve CI reliability. (#4787) * Try to improve CI reliability. Unset _JAVA_OPTIONS just in case it is causing us to use more memory than expected. * Replace for loop with foreach. --- .travis.yml | 4 ++++ .../io/druid/java/util/common/parsers/JSONPathParser.java | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e455942a18a..078b4cb9694 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,15 @@ matrix: # processing module test - sudo: false install: echo "MAVEN_OPTS='-Xmx3000m'" > ~/.mavenrc && mvn install -q -ff -DskipTests -B + before_script: + - unset _JAVA_OPTIONS script: echo "MAVEN_OPTS='-Xmx512m'" > ~/.mavenrc && mvn test -B -Pparallel-test -Dmaven.fork.count=2 -pl processing # non-processing modules test - sudo: false install: echo "MAVEN_OPTS='-Xmx3000m'" > ~/.mavenrc && mvn install -q -ff -DskipTests -B + before_script: + - unset _JAVA_OPTIONS script: echo "MAVEN_OPTS='-Xmx512m'" > ~/.mavenrc && mvn test -B -Pparallel-test -Dmaven.fork.count=2 -pl '!processing' # run integration tests diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathParser.java b/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathParser.java index 58c2728d20a..2a84fef3e76 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathParser.java +++ b/java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathParser.java @@ -195,8 +195,7 @@ public class JSONPathParser implements Parser if (val.isArray()) { List newList = new ArrayList<>(); - for (Iterator it = val.iterator(); it.hasNext(); ) { - JsonNode entry = it.next(); + for (JsonNode entry : val) { newList.add(valueConversionFunction(entry)); } return newList;