hbase git commit: HBASE-15884 NPE in StoreFileScanner#skipKVsNewerThanReadpoint during reverse scan (Sergey Soldatov)
Repository: hbase Updated Branches: refs/heads/0.98 60dbf6769 -> 67dc17240 HBASE-15884 NPE in StoreFileScanner#skipKVsNewerThanReadpoint during reverse scan (Sergey Soldatov) Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/67dc1724 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/67dc1724 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/67dc1724 Branch: refs/heads/0.98 Commit: 67dc17240edffdb048d63ee13e12bbcac9d51bfc Parents: 60dbf67 Author: tedyu Authored: Wed May 25 17:29:32 2016 -0700 Committer: Andrew Purtell Committed: Tue May 31 13:47:06 2016 -0700 -- .../apache/hadoop/hbase/regionserver/StoreFileScanner.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/67dc1724/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 5330ffb..0a0fed7 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 @@ -223,11 +223,11 @@ public class StoreFileScanner implements KeyValueScanner { while(enforceMVCC && cur != null && (cur.getMvccVersion() > readPt)) { - hfs.next(); + boolean hasNext = hfs.next(); cur = hfs.getKeyValue(); - if (this.stopSkippingKVsIfNextRow - && getComparator().compareRows(cur.getBuffer(), cur.getRowOffset(), - cur.getRowLength(), startKV.getBuffer(), startKV.getRowOffset(), + if (hasNext && this.stopSkippingKVsIfNextRow + && getComparator().compareRows(cur.getRowArray(), cur.getRowOffset(), + cur.getRowLength(), startKV.getRowArray(), startKV.getRowOffset(), startKV.getRowLength()) > 0) { return false; }
hbase git commit: HBASE-15884 NPE in StoreFileScanner#skipKVsNewerThanReadpoint during reverse scan (Sergey Soldatov)
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 Authored: Wed May 25 17:31:42 2016 -0700 Committer: tedyu 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) {
hbase git commit: HBASE-15884 NPE in StoreFileScanner#skipKVsNewerThanReadpoint during reverse scan (Sergey Soldatov)
Repository: hbase Updated Branches: refs/heads/branch-1 2346b5e21 -> a049b5f79 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/a049b5f7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a049b5f7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a049b5f7 Branch: refs/heads/branch-1 Commit: a049b5f799daa50bd658c8f11fd18275666e3927 Parents: 2346b5e Author: tedyu Authored: Wed May 25 17:29:32 2016 -0700 Committer: tedyu Committed: Wed May 25 17:29:32 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/a049b5f7/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 0608756..02a4cae 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 @@ -257,9 +257,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) {
hbase git commit: HBASE-15884 NPE in StoreFileScanner#skipKVsNewerThanReadpoint during reverse scan (Sergey Soldatov)
Repository: hbase Updated Branches: refs/heads/master 39dc19236 -> fa74baeb4 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/fa74baeb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fa74baeb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fa74baeb Branch: refs/heads/master Commit: fa74baeb409778de71c8a92b115b46dc63f313a0 Parents: 39dc192 Author: tedyu Authored: Wed May 25 08:58:28 2016 -0700 Committer: tedyu Committed: Wed May 25 08:58:28 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/fa74baeb/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 abade0e..4955ffe 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 @@ -253,9 +253,9 @@ public class StoreFileScanner implements KeyValueScanner { while(enforceMVCC && cur != null && (cur.getSequenceId() > readPt)) { - hfs.next(); + boolean hasNext = hfs.next(); setCurrentCell(hfs.getCell()); - if (this.stopSkippingKVsIfNextRow + if (hasNext && this.stopSkippingKVsIfNextRow && getComparator().compareRows(cur, startKV) > 0) { return false; }