Repository: tez Updated Branches: refs/heads/master e9d0b1b26 -> c9c6fbf5f
TEZ-3687. Code smell in DAGStatus and VertexStatus equals implementation (Akira Ajisaka via zhiyuany) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/c9c6fbf5 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/c9c6fbf5 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/c9c6fbf5 Branch: refs/heads/master Commit: c9c6fbf5f185abc3883ac29a724b032579e47cd1 Parents: e9d0b1b Author: Zhiyuan Yang <[email protected]> Authored: Thu Apr 20 12:57:12 2017 -0700 Committer: Zhiyuan Yang <[email protected]> Committed: Thu Apr 20 12:57:12 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/tez/dag/api/client/DAGStatus.java | 4 ++-- .../main/java/org/apache/tez/dag/api/client/VertexStatus.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/c9c6fbf5/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGStatus.java ---------------------------------------------------------------------- diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGStatus.java b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGStatus.java index f530858..cbf641e 100644 --- a/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGStatus.java +++ b/tez-api/src/main/java/org/apache/tez/dag/api/client/DAGStatus.java @@ -164,8 +164,8 @@ public class DAGStatus { DAGStatus other = (DAGStatus)obj; return getState() == other.getState() && getDiagnostics().equals(other.getDiagnostics()) - && getDAGProgress().equals(getDAGProgress()) - && getVertexProgress().equals(getVertexProgress()) + && getDAGProgress().equals(other.getDAGProgress()) + && getVertexProgress().equals(other.getVertexProgress()) && ((getDAGCounters() == null && other.getDAGCounters() == null) || getDAGCounters().equals(other.getDAGCounters())); http://git-wip-us.apache.org/repos/asf/tez/blob/c9c6fbf5/tez-api/src/main/java/org/apache/tez/dag/api/client/VertexStatus.java ---------------------------------------------------------------------- diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/client/VertexStatus.java b/tez-api/src/main/java/org/apache/tez/dag/api/client/VertexStatus.java index 61f093d..dfb9bbe 100644 --- a/tez-api/src/main/java/org/apache/tez/dag/api/client/VertexStatus.java +++ b/tez-api/src/main/java/org/apache/tez/dag/api/client/VertexStatus.java @@ -120,8 +120,8 @@ public class VertexStatus { if (obj instanceof VertexStatus){ VertexStatus other = (VertexStatus)obj; return getState().equals(other.getState()) - && getDiagnostics().equals(getDiagnostics()) - && getProgress().equals(getProgress()) + && getDiagnostics().equals(other.getDiagnostics()) + && getProgress().equals(other.getProgress()) && ((getVertexCounters() == null && other.getVertexCounters() == null) || getVertexCounters().equals(other.getVertexCounters()));
