Repository: oozie Updated Branches: refs/heads/master b5d409e63 -> aa7bba5d1
OOZIE-2043 Misc test failures against JDK8 (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/aa7bba5d Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/aa7bba5d Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/aa7bba5d Branch: refs/heads/master Commit: aa7bba5d1927756c0a62328763a714c41485c42a Parents: b5d409e Author: Robert Kanter <[email protected]> Authored: Mon Nov 10 18:09:47 2014 -0800 Committer: Robert Kanter <[email protected]> Committed: Mon Nov 10 18:09:47 2014 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/oozie/util/ELConstantsFunctions.java | 4 ++++ .../test/java/org/apache/oozie/coord/TestHCatELFunctions.java | 4 ++-- .../apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java | 4 ++-- release-log.txt | 1 + .../hcatalog/src/main/java/org/apache/oozie/util/HCatURI.java | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/aa7bba5d/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java b/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java index 96a7146..6be4265 100644 --- a/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java +++ b/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java @@ -146,6 +146,10 @@ public class ELConstantsFunctions { result.append(delimeter); } } + // Java 8 skips a leading match if it's empty; to remain consistent with Java6,7, we check this case + if (src.startsWith(delimeter) && ret.length > 0 && !ret[0].equals("")) { + result.insert(0, append); + } return result.toString(); } return src; http://git-wip-us.apache.org/repos/asf/oozie/blob/aa7bba5d/core/src/test/java/org/apache/oozie/coord/TestHCatELFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/coord/TestHCatELFunctions.java b/core/src/test/java/org/apache/oozie/coord/TestHCatELFunctions.java index d420c6f..e1cf133 100644 --- a/core/src/test/java/org/apache/oozie/coord/TestHCatELFunctions.java +++ b/core/src/test/java/org/apache/oozie/coord/TestHCatELFunctions.java @@ -453,13 +453,13 @@ public class TestHCatELFunctions extends XHCatTestCase { eval.setVariable(".dataout.ABC", "hcat://hcat.server.com:5080/mydb/clicks/datastamp=20120230;region=us"); eval.setVariable(".dataout.ABC.unresolved", Boolean.FALSE); String res = CoordELFunctions.evalAndWrap(eval, expr); - assertTrue(res.equals("'datastamp=20120230,region=us'") || res.equals("'region=us,datastamp=20120230'")); + assertTrue(res.equals("'datastamp=20120230,region=us'")); init("coord-sla-create"); eval.setVariable(".dataout.ABC", "hcat://hcat.server.com:5080/mydb/clicks/datastamp=20130230;region=euro"); eval.setVariable(".dataout.ABC.unresolved", Boolean.FALSE); res = CoordELFunctions.evalAndWrap(eval, expr); - assertTrue(res.equals("'datastamp=20130230,region=us'") || res.equals("'region=euro,datastamp=20130230'")); + assertTrue(res.equals("'datastamp=20130230,region=us'") || res.equals("'datastamp=20130230,region=euro'")); } /** http://git-wip-us.apache.org/repos/asf/oozie/blob/aa7bba5d/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java index 93ad168..0eb1ee0 100644 --- a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java +++ b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java @@ -1067,8 +1067,8 @@ public class TestLiteWorkflowAppParser extends XTestCase { WorkflowException we = (WorkflowException) ex.getCause(); assertEquals(ErrorCode.E0732, we.getErrorCode()); assertTrue(we.getMessage().contains("Fork [f]")); - assertTrue(we.getMessage().contains("Join [j1]")); - assertTrue(we.getMessage().contains("been [j2]")); + assertTrue(we.getMessage().contains("Join [j1]") && we.getMessage().contains("been [j2]") + || we.getMessage().contains("Join [j2]") && we.getMessage().contains("been [j1]")); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/aa7bba5d/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index e3dad74..abd286b 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2043 Misc test failures against JDK8 (rkanter) OOZIE-2045 Symlink support for sharelib (puru) OOZIE-1385 Make Uber Mode the default (rkanter) OOZIE-1890 Make oozie-site empty and reconcile defaults between oozie-default and the code (seoeun25 via rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/aa7bba5d/sharelib/hcatalog/src/main/java/org/apache/oozie/util/HCatURI.java ---------------------------------------------------------------------- diff --git a/sharelib/hcatalog/src/main/java/org/apache/oozie/util/HCatURI.java b/sharelib/hcatalog/src/main/java/org/apache/oozie/util/HCatURI.java index fe7c9e8..8ec3fae 100644 --- a/sharelib/hcatalog/src/main/java/org/apache/oozie/util/HCatURI.java +++ b/sharelib/hcatalog/src/main/java/org/apache/oozie/util/HCatURI.java @@ -20,7 +20,7 @@ package org.apache.oozie.util; import java.net.URI; import java.net.URISyntaxException; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; @@ -81,7 +81,7 @@ public class HCatURI { throw new URISyntaxException(uri.toString(), "Partition details are missing"); } - partitions = new HashMap<String, String>(); + partitions = new LinkedHashMap<String, String>(); String[] parts = partRaw.split(PARTITION_SEPARATOR); for (String part : parts) { if (part == null || part.length() == 0) {
