Repository: tez Updated Branches: refs/heads/TEZ-3334 1a746f7e1 -> 0f65db78b
TEZ-3618. Shuffle Handler Loading cache equality tests always results is false (jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/0f65db78 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/0f65db78 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/0f65db78 Branch: refs/heads/TEZ-3334 Commit: 0f65db78b79e2168fcb879d91c9a7f1b3e829e3f Parents: 1a746f7 Author: Jonathan Eagles <[email protected]> Authored: Fri Feb 10 13:27:53 2017 -0600 Committer: Jonathan Eagles <[email protected]> Committed: Fri Feb 10 13:27:53 2017 -0600 ---------------------------------------------------------------------- TEZ-3334-CHANGES.txt | 1 + .../src/main/java/org/apache/tez/auxservices/ShuffleHandler.java | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/0f65db78/TEZ-3334-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-3334-CHANGES.txt b/TEZ-3334-CHANGES.txt index 7f0e1ee..a898ba5 100644 --- a/TEZ-3334-CHANGES.txt +++ b/TEZ-3334-CHANGES.txt @@ -4,6 +4,7 @@ Apache Tez Change Log INCOMPATIBLE CHANGES: ALL CHANGES: + TEZ-3618. Shuffle Handler Loading cache equality tests always results is false TEZ-3612. Tez Shuffle Handler Content length does not match actual TEZ-3608. Fetcher can hang if copyMapOutput/fetchInputs returns early TEZ-3606. Fix debug log for empty partitions to the expanded partitionId in the Composite case http://git-wip-us.apache.org/repos/asf/tez/blob/0f65db78/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java index 85b781f..9f0125b 100644 --- a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java +++ b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java @@ -1437,9 +1437,6 @@ public class ShuffleHandler extends AuxiliaryService { if (!attemptId.equals(that.attemptId)) { return false; } - if (dagId != that.dagId) { - return false; - } if (!jobId.equals(that.jobId)) { return false; @@ -1451,7 +1448,6 @@ public class ShuffleHandler extends AuxiliaryService { @Override public int hashCode() { int result = jobId.hashCode(); - result = 31 * result + dagId.hashCode(); result = 31 * result + attemptId.hashCode(); return result; }
