Updated Branches: refs/heads/trunk abf0d991d -> b1d12db73
r/m dead code from MurmurHash patch by dbrosius; reviewed by jbellis for CASSANDRA-4062 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1d12db7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1d12db7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1d12db7 Branch: refs/heads/trunk Commit: b1d12db7338ecf1eb6f5aa4905ddadb0500e9445 Parents: 0aa128a Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 23 17:19:26 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 23 17:19:26 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/utils/MurmurHash.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1d12db7/src/java/org/apache/cassandra/utils/MurmurHash.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/MurmurHash.java b/src/java/org/apache/cassandra/utils/MurmurHash.java index d2a3f37..eb7b75a 100644 --- a/src/java/org/apache/cassandra/utils/MurmurHash.java +++ b/src/java/org/apache/cassandra/utils/MurmurHash.java @@ -147,10 +147,11 @@ public class MurmurHash protected static long getblock(ByteBuffer key, int offset, int index) { int i_8 = index << 3; - return ((long) key.get(offset + i_8 + 0) & 0xff) + (((long) key.get(offset + i_8 + 1) & 0xff) << 8) + - (((long) key.get(offset + i_8 + 2) & 0xff) << 16) + (((long) key.get(offset + i_8 + 3) & 0xff) << 24) + - (((long) key.get(offset + i_8 + 4) & 0xff) << 32) + (((long) key.get(offset + i_8 + 5) & 0xff) << 40) + - (((long) key.get(offset + i_8 + 6) & 0xff) << 48) + (((long) key.get(offset + i_8 + 7) & 0xff) << 56); + int blockOffset = offset + i_8; + return ((long) key.get(blockOffset + 0) & 0xff) + (((long) key.get(blockOffset + 1) & 0xff) << 8) + + (((long) key.get(blockOffset + 2) & 0xff) << 16) + (((long) key.get(blockOffset + 3) & 0xff) << 24) + + (((long) key.get(blockOffset + 4) & 0xff) << 32) + (((long) key.get(blockOffset + 5) & 0xff) << 40) + + (((long) key.get(blockOffset + 6) & 0xff) << 48) + (((long) key.get(blockOffset + 7) & 0xff) << 56); } protected static long rotl64(long v, int n) @@ -184,8 +185,6 @@ public class MurmurHash for(int i = 0; i < nblocks; i++) { - int i_8 = i << 4; - long k1 = getblock(key, offset, i*2+0); long k2 = getblock(key, offset, i*2+1);
