hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-18757 Fix improper bitwise & in bucketcache offset calculation
Date Tue, 05 Sep 2017 23:17:29 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 11c175978 -> dde799577


HBASE-18757 Fix improper bitwise & in bucketcache offset calculation

This correctly casts the operand to a long to avoid negative offsets created by sign extending
the integer operand.

Signed-off-by: tedyu <yuzhihong@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dde79957
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dde79957
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dde79957

Branch: refs/heads/branch-1.2
Commit: dde799577bf190cb5a4b4b2fcaab72183d3c39c9
Parents: 11c1759
Author: Zach York <zyork@amazon.com>
Authored: Thu Aug 31 10:25:32 2017 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Tue Sep 5 16:17:23 2017 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/io/hfile/bucket/BucketCache.java    | 4 ++--
 .../hadoop/hbase/io/hfile/bucket/TestBucketCache.java       | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/dde79957/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
index 6048881..0d04a81 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
@@ -1145,8 +1145,8 @@ public class BucketCache implements BlockCache, HeapSize {
     }
 
     long offset() { // Java has no unsigned numbers
-      long o = ((long) offsetBase) & 0xFFFFFFFF;
-      o += (((long) (offset1)) & 0xFF) << 32;
+      long o = ((long) offsetBase) & 0xFFFFFFFFL; //This needs the L cast otherwise it
will be sign extended as a negative number.
+      o += (((long) (offset1)) & 0xFF) << 32; //The 0xFF here does not need the
L cast because it is treated as a positive int.
       return o << 8;
     }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/dde79957/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java
index 7aef1d6..5a2eb01 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java
@@ -267,4 +267,13 @@ public class TestBucketCache {
 
     TEST_UTIL.cleanupTestDir();
   }
+
+  @Test
+  public void testOffsetProducesPositiveOutput() {
+    //This number is picked because it produces negative output if the values isn't ensured
to be positive.
+    //See HBASE-18757 for more information.
+    long testValue = 549888460800L;
+    BucketCache.BucketEntry bucketEntry = new BucketCache.BucketEntry(testValue, 10, 10L,
true);
+    assertEquals(testValue, bucketEntry.offset());
+  }
 }


Mime
View raw message