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-15884 NPE in StoreFileScanner#skipKVsNewerThanReadpoint during reverse scan (Sergey Soldatov)
Date Thu, 26 May 2016 00:31:48 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 b2e8a4158 -> f6e145e23


HBASE-15884 NPE in StoreFileScanner#skipKVsNewerThanReadpoint during reverse scan (Sergey
Soldatov)


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

Branch: refs/heads/branch-1.3
Commit: f6e145e23d747d42892f24bc7766400a2e852d1b
Parents: b2e8a41
Author: tedyu <yuzhihong@gmail.com>
Authored: Wed May 25 17:31:42 2016 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Wed May 25 17:31:42 2016 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/regionserver/StoreFileScanner.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/f6e145e2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java
index 4055188..77857b0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java
@@ -234,9 +234,9 @@ public class StoreFileScanner implements KeyValueScanner {
     while(enforceMVCC
         && cur != null
         && (cur.getMvccVersion() > readPt)) {
-      hfs.next();
+      boolean hasNext = hfs.next();
       setCurrentCell(hfs.getKeyValue());
-      if (this.stopSkippingKVsIfNextRow
+      if (hasNext && this.stopSkippingKVsIfNextRow
           && getComparator().compareRows(cur.getRowArray(), cur.getRowOffset(),
               cur.getRowLength(), startKV.getRowArray(), startKV.getRowOffset(),
               startKV.getRowLength()) > 0) {


Mime
View raw message