From 6d32cc088144763114f88203ac97a5e20b8fe1c0 Mon Sep 17 00:00:00 2001 From: larsh Date: Wed, 10 Apr 2013 22:15:21 +0000 Subject: [PATCH] HBASE-8316 JoinedHeap for non essential column families should reseek instead of seek git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1466711 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 79d00e682d6..f46e460db5b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -3625,9 +3625,10 @@ public class HRegion implements HeapSize { // , Writable{ // 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);