HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum) (cherry picked from commit a284c493b127fbf785fbee401f0854ad1979eb26) (cherry picked from commit aa36c3f6b69ef47b6f53158eda4a87e1a72e4fad)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c856758a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c856758a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c856758a Branch: refs/heads/branch-2.0 Commit: c856758a3a92181b7ae9d9e269a3d015c4e9e37b Parents: 4020fd4 Author: Sean Busbey <bus...@apache.org> Authored: Fri Dec 14 11:23:36 2018 -0600 Committer: Sean Busbey <bus...@apache.org> Committed: Fri Dec 14 15:50:16 2018 -0600 ---------------------------------------------------------------------- .../apache/hadoop/hbase/regionserver/StoreScanner.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c856758a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java index cd2ab40..37424dd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java @@ -790,8 +790,9 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner Cell previousIndexedKey = null; do { Cell nextIndexedKey = getNextIndexedKey(); - if (nextIndexedKey != null && nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY - && (nextIndexedKey == previousIndexedKey || matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) { + if (nextIndexedKey != null && nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY && + (nextIndexedKey == previousIndexedKey || + matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) { this.heap.next(); ++kvsScanned; previousIndexedKey = nextIndexedKey; @@ -815,8 +816,9 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner Cell previousIndexedKey = null; do { Cell nextIndexedKey = getNextIndexedKey(); - if (nextIndexedKey != null && nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY - && (nextIndexedKey == previousIndexedKey || matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) { + if (nextIndexedKey != null && nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY && + (nextIndexedKey == previousIndexedKey || + matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) { this.heap.next(); ++kvsScanned; previousIndexedKey = nextIndexedKey;