HBASE-7740 Recheck matching row for joined scanners (Sergey)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1441684 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
003a05896e
commit
fd5a096d3e
|
@ -3676,10 +3676,11 @@ public class HRegion implements HeapSize { // , Writable{
|
|||
if (this.joinedHeap != null) {
|
||||
KeyValue nextJoinedKv = joinedHeap.peek();
|
||||
// If joinedHeap is pointing to some other row, try to seek to a correct one.
|
||||
// We don't need to recheck that row here - populateResult will take care of that.
|
||||
boolean mayHaveData =
|
||||
(nextJoinedKv != null && nextJoinedKv.matchingRow(currentRow, offset, length))
|
||||
|| this.joinedHeap.seek(KeyValue.createFirstOnRow(currentRow, offset, length));
|
||||
|| (this.joinedHeap.seek(KeyValue.createFirstOnRow(currentRow, offset, length))
|
||||
&& joinedHeap.peek() != null
|
||||
&& joinedHeap.peek().matchingRow(currentRow, offset, length));
|
||||
if (mayHaveData) {
|
||||
joinedContinuationRow = current;
|
||||
populateFromJoinedHeap(results, limit, metric);
|
||||
|
|
Loading…
Reference in New Issue