HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)

(cherry picked from commit a284c493b127fbf785fbee401f0854ad1979eb26)
(cherry picked from commit aa36c3f6b6)
This commit is contained in:
Sean Busbey 2018-12-14 11:23:36 -06:00
parent 5c7c425e34
commit 47099d1b17
1 changed files with 6 additions and 4 deletions

View File

@ -813,8 +813,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;
@ -838,8 +839,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;