You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2014/05/23 21:36:58 UTC

[1/2] git commit: Revert "HBASE-11234 FastDiffDeltaEncoder#getFirstKeyInBlock returns wrong result" due to test issues

Repository: hbase
Updated Branches:
  refs/heads/0.94 c8fb799b1 -> e2eefd60e


Revert "HBASE-11234 FastDiffDeltaEncoder#getFirstKeyInBlock returns wrong result" due to test issues

This reverts commit b2a2e060982634cfae4bec2665f2b63e1f680ff1.


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

Branch: refs/heads/0.94
Commit: 5f4537f06c76044ee3aa6d9e28378c0534f33d51
Parents: c8fb799
Author: Lars Hofhansl <la...@apache.org>
Authored: Fri May 23 12:35:12 2014 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Fri May 23 12:35:12 2014 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java  | 2 +-
 .../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5f4537f0/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java b/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java
index 7959e0e..0ca02c8 100644
--- a/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java
+++ b/src/main/java/org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.java
@@ -389,7 +389,7 @@ public class FastDiffDeltaEncoder extends BufferedDataBlockEncoder {
     ByteBufferUtils.readCompressedInt(block); // commonLength
     int pos = block.position();
     block.reset();
-    return ByteBuffer.wrap(block.array(), block.arrayOffset() + pos, keyLength).slice();
+    return ByteBuffer.wrap(block.array(), pos, keyLength).slice();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/5f4537f0/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java b/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java
index 3e4416f..ac63ead 100644
--- a/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java
+++ b/src/main/java/org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.java
@@ -154,7 +154,7 @@ public class PrefixKeyDeltaEncoder extends BufferedDataBlockEncoder {
     }
     int pos = block.position();
     block.reset();
-    return ByteBuffer.wrap(block.array(), block.arrayOffset() + pos, keyLength).slice();
+    return ByteBuffer.wrap(block.array(), pos, keyLength).slice();
   }
 
   @Override


[2/2] git commit: Revert "updated CHANGES.txt for 0.94.20RC0", remove a jira again

Posted by la...@apache.org.
Revert "updated CHANGES.txt for 0.94.20RC0", remove a jira again

This reverts commit c8fb799b1010df9c340641acb2c90f752bba776a.


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

Branch: refs/heads/0.94
Commit: e2eefd60eb66b907223f2316e56fe67d238d48d0
Parents: 5f4537f
Author: Lars Hofhansl <la...@apache.org>
Authored: Fri May 23 12:35:46 2014 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Fri May 23 12:35:46 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e2eefd60/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ad0abf2..51571e6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,7 +12,6 @@ Bug
     [HBASE-11188] - "Inconsistent configuration" for SchemaMetrics is always shown
     [HBASE-11212] - Fix increment index in KeyValueSortReducer
     [HBASE-11225] - Backport fix for HBASE-10417 'index is not incremented in PutSortReducer#reduce()'
-    [HBASE-11234] - FastDiffDeltaEncoder#getFirstKeyInBlock returns wrong result
 
 Improvement