Author: kamrul
Date: Sat Dec 1 00:17:59 2012
New Revision: 1415893
URL: http://svn.apache.org/viewvc?rev=1415893&view=rev
Log:
OOZIE-1107 Change default done-flag from _SUCCESS to empty for Hcat (mohammad)
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
oozie/branches/hcat-intre/release-log.txt
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java?rev=1415893&r1=1415892&r2=1415893&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
Sat Dec 1 00:17:59 2012
@@ -330,7 +330,6 @@ public class CoordCommandUtils {
Element doneFlagElement = event.getChild("dataset",
event.getNamespace()).getChild("done-flag",
event.getNamespace());
- String doneFlag = CoordUtils.getDoneFlag(doneFlagElement);
for (int i = 0; i < instanceList.length; i++) {
if (instanceList[i].trim().length() == 0) {
@@ -353,6 +352,7 @@ public class CoordCommandUtils {
String uriPath = CoordELFunctions.evalAndWrap(eval,
event.getChild("dataset", event.getNamespace())
.getChild("uri-template",
event.getNamespace()).getTextTrim());
uris.append(uriPath);
+ String doneFlag = CoordUtils.getDoneFlag(doneFlagElement, uriPath);
if (doneFlag.length() > 0) {
uriPath += "/" + doneFlag;
}
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java?rev=1415893&r1=1415892&r2=1415893&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
Sat Dec 1 00:17:59 2012
@@ -224,6 +224,11 @@ public class CoordELEvaluator {
// System.out.println("eDATA :"+ XmlUtils.prettyPrint(eData));
Date initInstance =
DateUtils.parseDateOozieTZ(eDataset.getAttributeValue("initial-instance"));
ds.setInitInstance(initInstance);
+ String name = eDataset.getAttributeValue("name");
+ ds.setName(name);
+ String uriTemplate = eDataset.getChild("uri-template",
eData.getNamespace()).getTextTrim();
+ ds.setUriTemplate(uriTemplate);
+ // ds.setTimeUnit(TimeUnit.MINUTES);
if (eDataset.getAttributeValue("frequency") != null) {
int frequency =
Integer.parseInt(eDataset.getAttributeValue("frequency"));
ds.setFrequency(frequency);
@@ -245,19 +250,12 @@ public class CoordELEvaluator {
ds.setEndOfDuration(TimeUnit.valueOf(eDataset.getAttributeValue("end_of_duration")));
Element doneFlagElement = eDataset.getChild("done-flag",
eData.getNamespace());
- String doneFlag = CoordUtils.getDoneFlag(doneFlagElement);
+ String doneFlag = CoordUtils.getDoneFlag(doneFlagElement,
uriTemplate);
ds.setDoneFlag(doneFlag);
}
else {
ds.setType("ASYNC");
}
- String name = eDataset.getAttributeValue("name");
- ds.setName(name);
- // System.out.println(name + " VAL "+ eDataset.getChild("uri-template",
- // eData.getNamespace()));
- String uriTemplate = eDataset.getChild("uri-template",
eData.getNamespace()).getTextTrim();
- ds.setUriTemplate(uriTemplate);
- // ds.setTimeUnit(TimeUnit.MINUTES);
return ds;
}
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java?rev=1415893&r1=1415892&r2=1415893&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
Sat Dec 1 00:17:59 2012
@@ -37,18 +37,24 @@ import org.apache.oozie.service.JPAServi
import org.apache.oozie.service.Services;
import org.apache.oozie.util.CoordActionsInDateRange;
import org.apache.oozie.util.DateUtils;
+import org.apache.oozie.util.HCatURI;
import org.apache.oozie.util.ParamChecker;
import org.jdom.Element;
public class CoordUtils {
public static final String HADOOP_USER = "user.name";
- public static String getDoneFlag(Element doneFlagElement) {
+ public static String getDoneFlag(Element doneFlagElement, String uri) {
if (doneFlagElement != null) {
return doneFlagElement.getTextTrim();
}
else {
- return CoordELConstants.DEFAULT_DONE_FLAG;
+ if (HCatURI.isHcatURI(uri)) { // For HCat _SUCCESS is meaningless
+ return "";
+ }
+ else {
+ return CoordELConstants.DEFAULT_DONE_FLAG;
+ }
}
}
Modified: oozie/branches/hcat-intre/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/release-log.txt?rev=1415893&r1=1415892&r2=1415893&view=diff
==============================================================================
--- oozie/branches/hcat-intre/release-log.txt (original)
+++ oozie/branches/hcat-intre/release-log.txt Sat Dec 1 00:17:59 2012
@@ -1,5 +1,6 @@
-- Oozie 3.4.0 release (trunk - unreleased)
+OOZIE-1107 Change default done-flag from _SUCCESS to empty for Hcat (mohammad)
OOZIE-1095 Add HCatalog jar as resource for building (mona)
OOZIE-1105 Resolve issues found during integration(mohammad)
OOZIE-1096 Update wfgen README.txt to have the TLP mailing list (jun aoki via
rkanter)
