Repository: hadoop Updated Branches: refs/heads/branch-2 3fac95f48 -> ed7f847c9
HADOOP-11709. Time.NANOSECONDS_PER_MILLISECOND - use class-level final constant instead of method variable. Contributed by Ajith S. (cherry picked from commit 43dde502b3be2133d62f1f074f016f35a56a7e2c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ed7f847c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ed7f847c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ed7f847c Branch: refs/heads/branch-2 Commit: ed7f847c959a0c1bf10c5cf3e972f8926ea21eb7 Parents: 3fac95f Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Sat Mar 21 00:54:20 2015 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Sat Mar 21 00:54:39 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/util/Time.java | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed7f847c/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 74eeb6d..fb47820 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -20,6 +20,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11659. o.a.h.fs.FileSystem.Cache#remove should use a single hash map lookup. (Brahma Reddy Battula via aajisaka) + HADOOP-11709. Time.NANOSECONDS_PER_MILLISECOND - use class-level final + constant instead of method variable (Ajith S via ozawa) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed7f847c/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Time.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Time.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Time.java index 347cdc5..b988923 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Time.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Time.java @@ -28,6 +28,11 @@ import org.apache.hadoop.classification.InterfaceStability; public final class Time { /** + * number of nano seconds in 1 millisecond + */ + private static final long NANOSECONDS_PER_MILLISECOND = 1000000; + + /** * Current system time. Do not use this to calculate a duration or interval * to sleep, because it will be broken by settimeofday. Instead, use * monotonicNow. @@ -45,8 +50,6 @@ public final class Time { * @return a monotonic clock that counts in milliseconds. */ public static long monotonicNow() { - final long NANOSECONDS_PER_MILLISECOND = 1000000; - return System.nanoTime() / NANOSECONDS_PER_MILLISECOND; } }
