hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From la...@apache.org
Subject svn commit: r1373537 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
Date Wed, 15 Aug 2012 17:37:49 GMT
Author: larsh
Date: Wed Aug 15 17:37:49 2012
New Revision: 1373537

URL: http://svn.apache.org/viewvc?rev=1373537&view=rev
Log:
HBASE-6579 Unnecessary KV order check in StoreScanner

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=1373537&r1=1373536&r2=1373537&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
Wed Aug 15 17:37:49 2012
@@ -366,11 +366,8 @@ public class StoreScanner extends NonLaz
 
     LOOP: while((kv = this.heap.peek()) != null) {
       // Check that the heap gives us KVs in an increasing order.
-      if (prevKV != null && comparator != null
-          && comparator.compare(prevKV, kv) > 0) {
-        throw new IOException("Key " + prevKV + " followed by a " +
-            "smaller key " + kv + " in cf " + store);
-      }
+      assert prevKV == null || comparator == null || comparator.compare(prevKV, kv) <=
0 :
+        "Key " + prevKV + " followed by a " + "smaller key " + kv + " in cf " + store;
       prevKV = kv;
       ScanQueryMatcher.MatchCode qcode = matcher.match(kv);
       switch(qcode) {



Mime
View raw message