You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ka...@apache.org on 2012/11/05 05:14:14 UTC
svn commit: r1405693 - in /oozie/branches/hcat-intre: ./
client/src/main/java/org/apache/oozie/client/
client/src/main/java/org/apache/oozie/client/rest/
client/src/test/java/org/apache/oozie/client/rest/
core/src/main/java/org/apache/oozie/client/rest...
Author: kamrul
Date: Mon Nov 5 04:14:14 2012
New Revision: 1405693
URL: http://svn.apache.org/viewvc?rev=1405693&view=rev
Log:
OOZIE-1042: Coordinator action table schema change
Modified:
oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/CoordinatorAction.java
oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java
oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
oozie/branches/hcat-intre/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorAction.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorAction.java
oozie/branches/hcat-intre/release-log.txt
Modified: oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/CoordinatorAction.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/CoordinatorAction.java?rev=1405693&r1=1405692&r2=1405693&view=diff
==============================================================================
--- oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/CoordinatorAction.java (original)
+++ oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/CoordinatorAction.java Mon Nov 5 04:14:14 2012
@@ -105,12 +105,20 @@ public interface CoordinatorAction {
Status getStatus();
/**
- * Return the missing dependencies for the particular action
+ * Return the PULL-based (directory based) missing dependencies for the
+ * particular action
*
* @return the missing dependencies for the particular action
*/
String getMissingDependencies();
+ /**
+ * Return the PUSH-based (e.d HCatalog partition-based ) missing
+ * dependencies for the particular action
+ *
+ * @return the missing dependencies for the particular action
+ */
+ String getPushMissingDependencies();
/**
* Return the external status of the application instance.
Modified: oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java?rev=1405693&r1=1405692&r2=1405693&view=diff
==============================================================================
--- oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java (original)
+++ oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java Mon Nov 5 04:14:14 2012
@@ -115,6 +115,7 @@ public interface JsonTags {
public static final String COORDINATOR_ACTION_NOMINAL_TIME = "nominalTime";
public static final String COORDINATOR_ACTION_STATUS = "status";
public static final String COORDINATOR_ACTION_MISSING_DEPS = "missingDependencies";
+ public static final String COORDINATOR_ACTION_PUSH_MISSING_DEPS = "pushMissingDependencies";
public static final String COORDINATOR_ACTION_EXTERNAL_STATUS = "externalStatus";
public static final String COORDINATOR_ACTION_TRACKER_URI = "trackerUri";
public static final String COORDINATOR_ACTION_CONSOLE_URL = "consoleUrl";
Modified: oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java?rev=1405693&r1=1405692&r2=1405693&view=diff
==============================================================================
--- oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java (original)
+++ oozie/branches/hcat-intre/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java Mon Nov 5 04:14:14 2012
@@ -119,6 +119,8 @@ public class JsonToBean {
.put("getLastModifiedTime", new Property(JsonTags.COORDINATOR_ACTION_LAST_MODIFIED_TIME, Date.class));
COORD_ACTION
.put("getMissingDependencies", new Property(JsonTags.COORDINATOR_ACTION_MISSING_DEPS, String.class));
+ COORD_ACTION.put("getPushMissingDependencies", new Property(JsonTags.COORDINATOR_ACTION_PUSH_MISSING_DEPS,
+ String.class));
COORD_ACTION.put("getExternalStatus", new Property(JsonTags.COORDINATOR_ACTION_EXTERNAL_STATUS, String.class));
COORD_ACTION.put("getTrackerUri", new Property(JsonTags.COORDINATOR_ACTION_TRACKER_URI, String.class));
COORD_ACTION.put("getConsoleUrl", new Property(JsonTags.COORDINATOR_ACTION_CONSOLE_URL, String.class));
Modified: oozie/branches/hcat-intre/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java?rev=1405693&r1=1405692&r2=1405693&view=diff
==============================================================================
--- oozie/branches/hcat-intre/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java (original)
+++ oozie/branches/hcat-intre/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java Mon Nov 5 04:14:14 2012
@@ -181,6 +181,7 @@ public class TestJsonToBean extends Test
json.put(JsonTags.COORDINATOR_ACTION_RUNTIME_CONF, "e");
json.put(JsonTags.COORDINATOR_ACTION_LAST_MODIFIED_TIME, LAST_MODIFIED);
json.put(JsonTags.COORDINATOR_ACTION_MISSING_DEPS, "f");
+ json.put(JsonTags.COORDINATOR_ACTION_PUSH_MISSING_DEPS, "ff");
json.put(JsonTags.COORDINATOR_ACTION_EXTERNAL_STATUS, "g");
json.put(JsonTags.COORDINATOR_ACTION_TRACKER_URI, "h");
json.put(JsonTags.COORDINATOR_ACTION_CONSOLE_URL, "i");
@@ -217,6 +218,7 @@ public class TestJsonToBean extends Test
assertEquals("e", action.getRunConf());
assertEquals(JsonUtils.parseDateRfc822(LAST_MODIFIED), action.getLastModifiedTime());
assertEquals("f", action.getMissingDependencies());
+ assertEquals("ff", action.getPushMissingDependencies());
assertEquals("g", action.getExternalStatus());
assertEquals("h", action.getTrackerUri());
assertEquals("i", action.getConsoleUrl());
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorAction.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorAction.java?rev=1405693&r1=1405692&r2=1405693&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorAction.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorAction.java Mon Nov 5 04:14:14 2012
@@ -89,6 +89,10 @@ public class JsonCoordinatorAction imple
@Lob
private String missingDependencies;
+ @Column(name = "push_missing_dependencies")
+ @Lob
+ private String pushMissingDependencies;
+
@Basic
@Column(name = "external_status")
private String externalStatus;
@@ -142,6 +146,7 @@ public class JsonCoordinatorAction imple
// json.put(JsonTags.COORDINATOR_ACTION_END_TIME, JsonUtils
// .formatDateRfc822(endTime), timeZoneId);
json.put(JsonTags.COORDINATOR_ACTION_MISSING_DEPS, missingDependencies);
+ json.put(JsonTags.COORDINATOR_ACTION_PUSH_MISSING_DEPS, pushMissingDependencies);
json.put(JsonTags.COORDINATOR_ACTION_EXTERNAL_STATUS, externalStatus);
json.put(JsonTags.COORDINATOR_ACTION_TRACKER_URI, trackerUri);
json.put(JsonTags.COORDINATOR_ACTION_CONSOLE_URL, consoleUrl);
@@ -240,6 +245,14 @@ public class JsonCoordinatorAction imple
return missingDependencies;
}
+ public String getPushMissingDependencies() {
+ return pushMissingDependencies;
+ }
+
+ public void setPushMissingDependencies(String pushMissingDependencies) {
+ this.pushMissingDependencies = pushMissingDependencies;
+ }
+
public String getExternalStatus() {
return externalStatus;
}
Modified: oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorAction.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorAction.java?rev=1405693&r1=1405692&r2=1405693&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorAction.java (original)
+++ oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorAction.java Mon Nov 5 04:14:14 2012
@@ -26,6 +26,7 @@ public class TestJsonCoordinatorAction e
static String CREATE_TIME = "Sat, 05 Sep 2009 00:00:00 GMT";
static String LAST_MODIFIED_TIME = "Sat, 05 Sep 2009 00:00:00 GMT";
static String missingDependencies = "a:a, a/a, a//a";
+ static String pushMissingDependencies = "hcat://a/b/c/d/f, hcat://1/2/3/4/5";
static JsonCoordinatorAction createAppAction() {
JsonCoordinatorAction app = new JsonCoordinatorAction();
@@ -40,6 +41,7 @@ public class TestJsonCoordinatorAction e
app.setStatus(CoordinatorAction.Status.WAITING);
app.setConsoleUrl("http://consoleurl:8080");
app.setMissingDependencies(missingDependencies);
+ app.setPushMissingDependencies(pushMissingDependencies);
return app;
}
@@ -56,6 +58,7 @@ public class TestJsonCoordinatorAction e
assertEquals(CoordinatorAction.Status.WAITING, app.getStatus());
assertEquals("http://consoleurl:8080", app.getConsoleUrl());
assertEquals(missingDependencies, app.getMissingDependencies());
+ assertEquals(pushMissingDependencies, app.getPushMissingDependencies());
}
Modified: oozie/branches/hcat-intre/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/release-log.txt?rev=1405693&r1=1405692&r2=1405693&view=diff
==============================================================================
--- oozie/branches/hcat-intre/release-log.txt (original)
+++ oozie/branches/hcat-intre/release-log.txt Mon Nov 5 04:14:14 2012
@@ -1,5 +1,6 @@
-- Oozie 3.4.0 release (trunk - unreleased)
+OOZIE-1042 Coordinator action table schema change. (Mohammad)
OOZIE-959 Use API from OOZIE-906 in console (Ashish via Mohammad)
OOZIE-1036 Utility class to parse HCat URI (Ryota via Mohammad)
OOZIE-1033 Generic utility class to register/unregister a JMS message handler(Mohammad)