diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.java index 7bd580d..69f9fd5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.java @@ -97,18 +97,6 @@ class ReversedStoreScanner extends StoreScanner implements KeyValueScanner { } @Override - protected void checkScanOrder(KeyValue prevKV, KeyValue kv, - KeyValue.KVComparator comparator) throws IOException { - // Check that the heap gives us KVs in an increasing order for same row and - // decreasing order for different rows. - assert prevKV == null || comparator == null || comparator.compareRows(kv, prevKV) < 0 - || (comparator.matchingRows(kv, prevKV) && comparator.compare(kv, - prevKV) >= 0) : "Key " + prevKV - + " followed by a " + "error order key " + kv + " in cf " + store - + " in reversed scan"; - } - - @Override public boolean reseek(KeyValue kv) throws IOException { throw new IllegalStateException( "reseek cannot be called on ReversedStoreScanner"); 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 fc034ed..7c89cab 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 @@ -85,7 +85,6 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner * KVs skipped via seeking to next row/column. TODO: estimate them? */ private long kvsScanned = 0; - private KeyValue prevKV = null; /** We don't ever expect to change this, the constant is just for clarity. */ static final boolean LAZY_SEEK_ENABLED_BY_DEFAULT = true; @@ -466,15 +465,9 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner matcher.setRow(row, offset, length); } - // Only do a sanity-check if store and comparator are available. - KeyValue.KVComparator comparator = - store != null ? store.getComparator() : null; - int count = 0; LOOP: do { - if (prevKV != kv) ++kvsScanned; // Do object compare - we set prevKV from the same heap. - checkScanOrder(prevKV, kv, comparator); - prevKV = kv; + ++kvsScanned; ScanQueryMatcher.MatchCode qcode = matcher.match(kv); qcode = optimize(qcode, kv); @@ -696,21 +689,6 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner } } - /** - * Check whether scan as expected order - * @param prevKV - * @param kv - * @param comparator - * @throws IOException - */ - protected void checkScanOrder(KeyValue prevKV, KeyValue kv, - KeyValue.KVComparator comparator) throws IOException { - // Check that the heap gives us KVs in an increasing order. - assert prevKV == null || comparator == null - || comparator.compare(prevKV, kv) <= 0 : "Key " + prevKV - + " followed by a " + "smaller key " + kv + " in cf " + store; - } - protected boolean seekToNextRow(KeyValue kv) throws IOException { return reseek(matcher.getKeyForNextRow(kv)); }