Author: rkanter
Date: Mon Feb 4 18:03:01 2013
New Revision: 1442254
URL: http://svn.apache.org/viewvc?rev=1442254&view=rev
Log:
OOZIE-1084 When use IBM jdk , UT TestCallbackServlet and TestHadoopELFunctions
fail (zhujinwei via rkanter)
Modified:
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/CallbackService.java
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java
oozie/branches/branch-3.3/release-log.txt
Modified:
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/CallbackService.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/CallbackService.java?rev=1442254&r1=1442253&r2=1442254&view=diff
==============================================================================
---
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/CallbackService.java
(original)
+++
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/CallbackService.java
Mon Feb 4 18:03:01 2013
@@ -62,8 +62,8 @@ public class CallbackService implements
}
private static final String ID_PARAM = "id=";
- private static final String STATUS_PARAM = "&status=";
- private static final String CALL_BACK_QUERY_STRING = "{0}?" + ID_PARAM +
"{1}" + STATUS_PARAM + "{2}&";
+ private static final String STATUS_PARAM = "status=";
+ private static final String CALL_BACK_QUERY_STRING = "{0}?" + ID_PARAM +
"{1}" + "&" + STATUS_PARAM + "{2}&";
/**
* Create a callback URL.
Modified:
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java?rev=1442254&r1=1442253&r2=1442254&view=diff
==============================================================================
---
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java
(original)
+++
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java
Mon Feb 4 18:03:01 2013
@@ -33,6 +33,7 @@ import org.apache.oozie.workflow.lite.En
import org.apache.oozie.workflow.lite.LiteWorkflowApp;
import org.apache.oozie.workflow.lite.LiteWorkflowInstance;
import org.apache.oozie.workflow.lite.StartNodeDef;
+import java.util.HashMap;
public class TestHadoopELFunctions extends ActionExecutorTestCase {
@@ -113,14 +114,52 @@ public class TestHadoopELFunctions exten
String version = "0.9.0";
String jobGraph = "job_201111300933_0004,job_201111300933_0005";
- String job1Stats =
"{\"MAP_INPUT_RECORDS\":\"33\",\"MIN_REDUCE_TIME\":\"0\",\"MULTI_STORE_COUNTERS\":{},\"ERROR_MESSAGE\":null,\"JOB_ID\":\"job_201111300933_0004\"}";
- String job2Stats =
"{\"MAP_INPUT_RECORDS\":\"37\",\"MIN_REDUCE_TIME\":\"0\",\"MULTI_STORE_COUNTERS\":{},\"ERROR_MESSAGE\":null,\"JOB_ID\":\"job_201111300933_0005\"}";
+ HashMap<String, String> job1StatusMap = new HashMap<String, String>();
+ job1StatusMap.put("\"MAP_INPUT_RECORDS\"", "\"33\"");
+ job1StatusMap.put("\"MIN_REDUCE_TIME\"", "\"0\"");
+ job1StatusMap.put("\"MULTI_STORE_COUNTERS\"", "{}");
+ job1StatusMap.put("\"ERROR_MESSAGE\"", "null");
+ job1StatusMap.put("\"JOB_ID\"", "\"job_201111300933_0004\"");
+
+ HashMap<String, String> job2StatusMap = new HashMap<String, String>();
+ job2StatusMap.put("\"MAP_INPUT_RECORDS\"", "\"37\"");
+ job2StatusMap.put("\"MIN_REDUCE_TIME\"", "\"0\"");
+ job2StatusMap.put("\"MULTI_STORE_COUNTERS\"", "{}");
+ job2StatusMap.put("\"ERROR_MESSAGE\"", "null");
+ job2StatusMap.put("\"JOB_ID\"", "\"job_201111300933_0005\"");
assertEquals(ActionType.PIG.toString(),
eval.evaluate("${hadoop:counters('H')['ACTION_TYPE']}", String.class));
assertEquals(version,
eval.evaluate("${hadoop:counters('H')['PIG_VERSION']}", String.class));
assertEquals(jobGraph,
eval.evaluate("${hadoop:counters('H')['JOB_GRAPH']}", String.class));
- assertEquals(job1Stats,
eval.evaluate("${hadoop:counters('H')['job_201111300933_0004']}",
String.class));
- assertEquals(job2Stats,
eval.evaluate("${hadoop:counters('H')['job_201111300933_0005']}",
String.class));
+
+ String[] jobStatusItems =
{"\"MAP_INPUT_RECORDS\"","\"MIN_REDUCE_TIME\"","\"MULTI_STORE_COUNTERS\"","\"ERROR_MESSAGE\"",
+ "\"JOB_ID\""};
+
+ String job1StatusResult =
eval.evaluate("${hadoop:counters('H')['job_201111300933_0004']}", String.class);
+ job1StatusResult =
job1StatusResult.substring(job1StatusResult.indexOf('{') + 1,
job1StatusResult.lastIndexOf('}'));
+ String[] job1StatusResArray = job1StatusResult.split(",");
+ HashMap<String, String> job1StatusResMap = new HashMap<String,
String>();
+ for(String status: job1StatusResArray){
+ String[] tmp = status.split(":");
+ job1StatusResMap.put(tmp[0], tmp[1]);
+ }
+ for(String item: jobStatusItems){
+ assertEquals(job1StatusMap.get(item),
job1StatusResMap.get(item));
+ }
+
+ String job2StatusResult =
eval.evaluate("${hadoop:counters('H')['job_201111300933_0005']}", String.class);
+ job2StatusResult = job2StatusResult.substring(job2StatusResult
+ .indexOf('{') + 1, job2StatusResult.lastIndexOf('}'));
+ String[] job2StatusResArray = job2StatusResult.split(",");
+ HashMap<String, String> job2StatusResMap = new HashMap<String,
String>();
+ for(String status: job2StatusResArray){
+ String[] tmp = status.split(":");
+ job2StatusResMap.put(tmp[0], tmp[1]);
+ }
+ for(String item: jobStatusItems){
+ assertEquals(job2StatusMap.get(item),
job2StatusResMap.get(item));
+ }
+
assertEquals(new Long(33),
eval.evaluate("${hadoop:counters('H')['job_201111300933_0004']['MAP_INPUT_RECORDS']}",
Long.class));
}
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1442254&r1=1442253&r2=1442254&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Feb 4 18:03:01 2013
@@ -1,5 +1,6 @@
-- Oozie 3.3.2 (unreleased)
+OOZIE-1084 When use IBM jdk , UT TestCallbackServlet and TestHadoopELFunctions
fail (zhujinwei via rkanter)
OOZIE-1127 Missed one services.destroy() in OOZIE-1114 (rkanter)
OOZIE-1071 latest EL function is based on action materialization time (rohini
via virag)
OOZIE-1114 Some tests don't use the Services singleton properly (rkanter)
