From bd74b7d721c8b28e3240f88c852c75fde96d7e27 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 28 Aug 2008 16:49:51 +0000 Subject: [PATCH] HBASE-849 Speed improvement in JenkinsHash git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@689888 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + src/java/org/apache/hadoop/hbase/util/JenkinsHash.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 099b2a3f129..b489c2e458a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -34,6 +34,7 @@ Release 0.18.0 - Unreleased Kellerman) HBASE-843 Deleting and recreating a table in a single process does not work (Jonathan Gray via Jim Kellerman) + HBASE-849 Speed improvement in JenkinsHash (Andrzej Bialecki via Stack) IMPROVEMENTS HBASE-801 When a table haven't disable, shell could response in a "user diff --git a/src/java/org/apache/hadoop/hbase/util/JenkinsHash.java b/src/java/org/apache/hadoop/hbase/util/JenkinsHash.java index 28f39f73e74..d196312ed39 100644 --- a/src/java/org/apache/hadoop/hbase/util/JenkinsHash.java +++ b/src/java/org/apache/hadoop/hbase/util/JenkinsHash.java @@ -43,8 +43,8 @@ public class JenkinsHash { private static long BYTE_MASK = 0x00000000000000ffL; private static long rot(long val, int pos) { - return Long.valueOf(Integer.rotateLeft( - Long.valueOf(val & INT_MASK).intValue(), pos)).longValue() & INT_MASK; + return ((long)(Integer.rotateLeft( + (int)(val & INT_MASK), pos)) & INT_MASK); } /** @@ -202,7 +202,7 @@ public class JenkinsHash { a = (a + (key[offset + 0] & BYTE_MASK)) & INT_MASK; break; case 0: - return Long.valueOf(c & INT_MASK).intValue(); + return (int)(c & INT_MASK); } /* * final -- final mixing of 3 32-bit values (a,b,c) into c @@ -249,7 +249,7 @@ public class JenkinsHash { b ^= a; b = (b - rot(a,14)) & INT_MASK; c ^= b; c = (c - rot(b,24)) & INT_MASK; - return Long.valueOf(c & INT_MASK).intValue(); + return (int)(c & INT_MASK); } /**