You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/02/10 05:52:12 UTC
hbase git commit: HBASE-15238 HFileReaderV2 prefetch overreaches;
runs off the end of the data; ADDENDUM
Repository: hbase
Updated Branches:
refs/heads/branch-1.2 6f6cd661d -> d5fd9932b
HBASE-15238 HFileReaderV2 prefetch overreaches; runs off the end of the data; ADDENDUM
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d5fd9932
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d5fd9932
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d5fd9932
Branch: refs/heads/branch-1.2
Commit: d5fd9932bdc782ea25ec4550ebe5ec2b51fa31e0
Parents: 6f6cd66
Author: stack <st...@apache.org>
Authored: Tue Feb 9 20:52:05 2016 -0800
Committer: stack <st...@apache.org>
Committed: Tue Feb 9 20:52:05 2016 -0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java | 2 +-
.../src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5fd9932/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java
index 0f7ede5..c3a73ac 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/ChecksumUtil.java
@@ -87,7 +87,7 @@ public class ChecksumUtil {
* The header is extracted from the specified HFileBlock while the
* data-to-be-verified is extracted from 'data'.
*/
- static boolean validateBlockChecksum(Path path, HFileBlock block,
+ static boolean validateBlockChecksum(Path path, long offset, HFileBlock block,
byte[] data, int hdrSize) throws IOException {
// If this is an older version of the block that does not have
http://git-wip-us.apache.org/repos/asf/hbase/blob/d5fd9932/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
index 20d1d3d..e2f3b44 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
@@ -1745,6 +1745,7 @@ public class HFileBlock implements Cacheable {
*/
protected boolean validateBlockChecksum(HFileBlock block, long offset, byte[] data,
int hdrSize)
+ throws IOException {
return ChecksumUtil.validateBlockChecksum(path, offset, block, data, hdrSize);
}