You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by te...@apache.org on 2017/10/31 22:08:40 UTC
[39/44] hadoop git commit: YARN-7336. Unsafe cast from long to int
Resource.hashCode() method (Contributed by Miklos Szegedi via Daniel
Templeton)
YARN-7336. Unsafe cast from long to int Resource.hashCode() method
(Contributed by Miklos Szegedi via Daniel Templeton)
(cherry picked from commit d64736d58965722b71d6eade578b6c4c266e6448)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c025c9ac
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c025c9ac
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c025c9ac
Branch: refs/heads/branch-3.0
Commit: c025c9ac62efa84ba9ae5958087703eaa235e5e6
Parents: 7689d47
Author: Daniel Templeton <te...@apache.org>
Authored: Mon Oct 30 12:40:29 2017 -0700
Committer: Daniel Templeton <te...@apache.org>
Committed: Tue Oct 31 15:06:18 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/yarn/api/records/Resource.java | 4 ++--
.../hadoop/yarn/api/records/impl/LightWeightResource.java | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c025c9ac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java
index b03cca1..1fabae8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java
@@ -463,11 +463,11 @@ public abstract class Resource implements Comparable<Resource> {
@Override
public int hashCode() {
final int prime = 47;
- long result = 0;
+ int result = 0;
for (ResourceInformation entry : resources) {
result = prime * result + entry.hashCode();
}
- return (int) result;
+ return result;
}
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c025c9ac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/LightWeightResource.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/LightWeightResource.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/LightWeightResource.java
index a64d242..7b07bbd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/LightWeightResource.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/LightWeightResource.java
@@ -155,9 +155,6 @@ public class LightWeightResource extends Resource {
@Override
public int hashCode() {
final int prime = 47;
- long result = prime + getMemorySize();
- result = prime * result + getVirtualCores();
-
- return (int) result;
+ return prime * (prime + Long.hashCode(getMemorySize())) + getVirtualCores();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org