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 2013/04/11 00:16:28 UTC
svn commit: r1466712 -
/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Author: larsh
Date: Wed Apr 10 22:16:28 2013
New Revision: 1466712
URL: http://svn.apache.org/r1466712
Log:
HBASE-8316 JoinedHeap for non essential column families should reseek instead of seek
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1466712&r1=1466711&r2=1466712&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Wed Apr 10 22:16:28 2013
@@ -3672,9 +3672,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);