You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by pr...@apache.org on 2015/09/04 16:03:49 UTC
tez git commit: TEZ-2761. addendum fix build failure for java 6
(pramachandran)
Repository: tez
Updated Branches:
refs/heads/branch-0.7 a10d382d0 -> f027eb9d2
TEZ-2761. addendum fix build failure for java 6 (pramachandran)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/f027eb9d
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/f027eb9d
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/f027eb9d
Branch: refs/heads/branch-0.7
Commit: f027eb9d239a4fe38e0909a4db54643e7ea1a218
Parents: a10d382
Author: Prakash Ramachandran <pr...@hortonworks.com>
Authored: Fri Sep 4 19:32:04 2015 +0530
Committer: Prakash Ramachandran <pr...@hortonworks.com>
Committed: Fri Sep 4 19:32:04 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../java/org/apache/tez/dag/app/web/AMWebController.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/f027eb9d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 728a713..1e3cb3d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.7.1: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-2761. addendum fix build failure for java 6
TEZ-2761. Tez UI: update the progress on the dag and vertices pages with info from AM
TEZ-2754. Tez UI: StartTime & EndTime is not displayed with right format in Graphical View
TEZ-2731. Fix Tez GenericCounter performance bottleneck
http://git-wip-us.apache.org/repos/asf/tez/blob/f027eb9d/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java b/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java
index db27d59..2c45a06 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java
@@ -340,7 +340,7 @@ public class AMWebController extends Controller {
Collection<Integer> getVertexIDsFromRequest() {
final String valueStr = $(WebUIService.VERTEX_ID).trim();
- List<Integer> vertexIDs = new ArrayList<>();
+ List<Integer> vertexIDs = new ArrayList<Integer>();
if (!valueStr.equals("")) {
String[] vertexIdsStr = valueStr.split(",", MAX_VERTICES_QUERIED);
@@ -369,7 +369,7 @@ public class AMWebController extends Controller {
return;
}
- Map<String, String> dagInfo = new HashMap<>();
+ Map<String, String> dagInfo = new HashMap<String, String>();
dagInfo.put("id", dag.getID().toString());
dagInfo.put("progress", Float.toString(dag.getProgress()));
dagInfo.put("status", dag.getState().toString());
@@ -380,7 +380,7 @@ public class AMWebController extends Controller {
}
private Map<String,String> getVertexInfoMap(Vertex vertex) {
- Map<String, String> vertexInfo = new HashMap<>();
+ Map<String, String> vertexInfo = new HashMap<String, String>();
vertexInfo.put("id", vertex.getVertexId().toString());
vertexInfo.put("status", vertex.getState().toString());
vertexInfo.put("progress", Float.toString(vertex.getProgress()));
@@ -420,7 +420,7 @@ public class AMWebController extends Controller {
vertexList = getVerticesByIdx(dag, requestedIDs);
}
- ArrayList<Map<String, String>> verticesInfo = new ArrayList<>();
+ ArrayList<Map<String, String>> verticesInfo = new ArrayList<Map<String, String>>();
for(Vertex v : vertexList) {
verticesInfo.add(getVertexInfoMap(v));
}