Repository: tez Updated Branches: refs/heads/master e762a35fd -> 210619a56
TEZ-2408. TestTaskAttempt fails to compile against hadoop-2.4 and hadoop-2.2. (hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/210619a5 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/210619a5 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/210619a5 Branch: refs/heads/master Commit: 210619a56905941d8551f169a0848b4754c2809a Parents: e762a35 Author: Hitesh Shah <[email protected]> Authored: Mon May 4 18:01:15 2015 -0700 Committer: Hitesh Shah <[email protected]> Committed: Mon May 4 18:01:15 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/210619a5/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5b18258..2ff7601 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES TEZ-1993. Implement a pluggable InputSizeEstimator for grouping fairly ALL CHANGES: + TEZ-2408. TestTaskAttempt fails to compile against hadoop-2.4 and hadoop-2.2. TEZ-2405. PipelinedSorter can throw NPE with custom compartor. TEZ-1897. Create a concurrent version of AsyncDispatcher TEZ-2394. Issues when there is an error in VertexManager callbacks http://git-wip-us.apache.org/repos/asf/tez/blob/210619a5/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java index 50bb68c..60c4c88 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java @@ -725,7 +725,7 @@ public class TestTaskAttempt { Resource resource = Resource.newInstance(1024, 1); NodeId nid = NodeId.newInstance("127.0.0.1", 0); - ContainerId contId = ContainerId.newContainerId(appAttemptId, 3); + ContainerId contId = ContainerId.newInstance(appAttemptId, 3); Container container = mock(Container.class); when(container.getId()).thenReturn(contId); when(container.getNodeId()).thenReturn(nid); @@ -816,7 +816,7 @@ public class TestTaskAttempt { Resource resource = Resource.newInstance(1024, 1); NodeId nid = NodeId.newInstance("127.0.0.1", 0); - ContainerId contId = ContainerId.newContainerId(appAttemptId, 3); + ContainerId contId = ContainerId.newInstance(appAttemptId, 3); Container container = mock(Container.class); when(container.getId()).thenReturn(contId); when(container.getNodeId()).thenReturn(nid); @@ -911,7 +911,7 @@ public class TestTaskAttempt { Resource resource = Resource.newInstance(1024, 1); NodeId nid = NodeId.newInstance("127.0.0.1", 0); - ContainerId contId = ContainerId.newContainerId(appAttemptId, 3); + ContainerId contId = ContainerId.newInstance(appAttemptId, 3); Container container = mock(Container.class); when(container.getId()).thenReturn(contId); when(container.getNodeId()).thenReturn(nid); @@ -1014,7 +1014,7 @@ public class TestTaskAttempt { Resource resource = Resource.newInstance(1024, 1); NodeId nid = NodeId.newInstance("127.0.0.1", 0); - ContainerId contId = ContainerId.newContainerId(appAttemptId, 3); + ContainerId contId = ContainerId.newInstance(appAttemptId, 3); Container container = mock(Container.class); when(container.getId()).thenReturn(contId); when(container.getNodeId()).thenReturn(nid); @@ -1114,7 +1114,7 @@ public class TestTaskAttempt { Resource resource = Resource.newInstance(1024, 1); NodeId nid = NodeId.newInstance("127.0.0.1", 0); - ContainerId contId = ContainerId.newContainerId(appAttemptId, 3); + ContainerId contId = ContainerId.newInstance(appAttemptId, 3); Container container = mock(Container.class); when(container.getId()).thenReturn(contId); when(container.getNodeId()).thenReturn(nid);
