Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Gian Merlino 2017-09-12 20:24:45 -07:00 committed by Roman Leventov
parent c3a1ce6933
commit 587f1807c2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -20,11 +20,15 @@ matrix:
# processing module test # processing module test
- sudo: false - sudo: false
install: echo "MAVEN_OPTS='-Xmx3000m'" > ~/.mavenrc && mvn install -q -ff -DskipTests -B 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 script: echo "MAVEN_OPTS='-Xmx512m'" > ~/.mavenrc && mvn test -B -Pparallel-test -Dmaven.fork.count=2 -pl processing
# non-processing modules test # non-processing modules test
- sudo: false - sudo: false
install: echo "MAVEN_OPTS='-Xmx3000m'" > ~/.mavenrc && mvn install -q -ff -DskipTests -B 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' script: echo "MAVEN_OPTS='-Xmx512m'" > ~/.mavenrc && mvn test -B -Pparallel-test -Dmaven.fork.count=2 -pl '!processing'
# run integration tests # run integration tests

3
java-util/src/main/java/io/druid/java/util/common/parsers/JSONPathParser.java
View File

@ -195,8 +195,7 @@ public class JSONPathParser implements Parser<String, Object>
if (val.isArray()) { if (val.isArray()) {
List<Object> newList = new ArrayList<>(); List<Object> newList = new ArrayList<>();
for (Iterator<JsonNode> it = val.iterator(); it.hasNext(); ) { for (JsonNode entry : val) {
JsonNode entry = it.next();
newList.add(valueConversionFunction(entry)); newList.add(valueConversionFunction(entry));
} }
return newList; return newList;