hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From la...@apache.org
Subject svn commit: r1466711 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Date Wed, 10 Apr 2013 22:15:21 GMT
Author: larsh
Date: Wed Apr 10 22:15:21 2013
New Revision: 1466711

URL: http://svn.apache.org/r1466711
Log:
HBASE-8316 JoinedHeap for non essential column families should reseek instead of seek

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

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1466711&r1=1466710&r2=1466711&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Wed Apr 10 22:15:21 2013
@@ -3625,9 +3625,10 @@ public class HRegion implements HeapSize
             // If joinedHeap is pointing to some other row, try to seek to a correct one.
             boolean mayHaveData =
               (nextJoinedKv != null && nextJoinedKv.matchingRow(currentRow, offset,
length))
-              || (this.joinedHeap.seek(KeyValue.createFirstOnRow(currentRow, offset, length))
-                  && joinedHeap.peek() != null
-                  && joinedHeap.peek().matchingRow(currentRow, offset, length));
+              || (this.joinedHeap.requestSeek(KeyValue.createFirstOnRow(currentRow, offset,
length), 
+                true, true)
+                && joinedHeap.peek() != null
+                && joinedHeap.peek().matchingRow(currentRow, offset, length));
             if (mayHaveData) {
               joinedContinuationRow = current;
               populateFromJoinedHeap(results, limit, metric);



Mime
View raw message