You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by la...@apache.org on 2014/03/22 05:08:44 UTC

svn commit: r1580148 - /hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java

Author: larsh
Date: Sat Mar 22 04:08:44 2014
New Revision: 1580148

URL: http://svn.apache.org/r1580148
Log:
HBASE-10805 Speed up KeyValueHeap.next() a bit

Modified:
    hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java

Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java?rev=1580148&r1=1580147&r2=1580148&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java Sat Mar 22 04:08:44 2014
@@ -112,8 +112,8 @@ public class KeyValueHeap extends NonRev
       this.current = pollRealKV();
     } else {
       KeyValueScanner topScanner = this.heap.peek();
-      if (topScanner == null ||
-          this.comparator.compare(kvNext, topScanner.peek()) >= 0) {
+      // no need to add current back to the heap if it is the only scanner left
+      if (topScanner != null && this.comparator.compare(kvNext, topScanner.peek()) >= 0) {
         this.heap.add(this.current);
         this.current = pollRealKV();
       }