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 ae...@apache.org on 2017/09/01 20:02:01 UTC
[73/74] [abbrv] hadoop git commit: YARN-7023. Incorrect
ReservationId.compareTo() implementation.
YARN-7023. Incorrect ReservationId.compareTo() implementation.
This closes #262
Signed-off-by: Akira Ajisaka <aa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c5281a85
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c5281a85
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c5281a85
Branch: refs/heads/HDFS-7240
Commit: c5281a85e108c7cab6e84dfe351843483d720b9b
Parents: 0d419c9
Author: Oleg Danilov <ol...@olegd.com>
Authored: Wed Aug 16 15:19:26 2017 +0300
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Sep 1 21:33:31 2017 +0200
----------------------------------------------------------------------
.../apache/hadoop/yarn/api/records/ReservationId.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5281a85/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationId.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationId.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationId.java
index a0c209d..fd01115 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationId.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationId.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.yarn.util.Records;
* {@link ReservationId} represents the <em>globally unique</em> identifier for
* a reservation.
* </p>
- *
+ *
* <p>
* The globally unique nature of the identifier is achieved by using the
* <em>cluster timestamp</em> i.e. start-time of the {@code ResourceManager}
@@ -62,7 +62,7 @@ public abstract class ReservationId implements Comparable<ReservationId> {
* Get the long identifier of the {@link ReservationId} which is unique for
* all Reservations started by a particular instance of the
* {@code ResourceManager}.
- *
+ *
* @return long identifier of the {@link ReservationId}
*/
@Public
@@ -76,7 +76,7 @@ public abstract class ReservationId implements Comparable<ReservationId> {
/**
* Get the <em>start time</em> of the {@code ResourceManager} which is used to
* generate globally unique {@link ReservationId}.
- *
+ *
* @return <em>start time</em> of the {@code ResourceManager}
*/
@Public
@@ -94,10 +94,9 @@ public abstract class ReservationId implements Comparable<ReservationId> {
@Override
public int compareTo(ReservationId other) {
if (this.getClusterTimestamp() - other.getClusterTimestamp() == 0) {
- return getId() > getId() ? 1 : getId() < getId() ? -1 : 0;
+ return Long.compare(getId(), other.getId());
} else {
- return this.getClusterTimestamp() > other.getClusterTimestamp() ? 1
- : this.getClusterTimestamp() < other.getClusterTimestamp() ? -1 : 0;
+ return Long.compare(getClusterTimestamp(), other.getClusterTimestamp());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org