From 4ab01fbd55f99415aec4af12593aa926012ac746 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Tue, 12 Sep 2017 17:40:25 -0700 Subject: [PATCH 1/2] Try to improve CI reliability. Unset _JAVA_OPTIONS just in case it is causing us to use more memory than expected. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index e455942a18a8..078b4cb96949 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 From 80442104ad4a2ee7fc557d303c19bebd1dffc69f Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Tue, 12 Sep 2017 19:09:26 -0700 Subject: [PATCH 2/2] Replace for loop with foreach. --- .../java/io/druid/java/util/common/parsers/JSONPathParser.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 58c2728d20ac..2a84fef3e76f 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 @@ private Object valueConversionFunction(JsonNode val) 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;