aboutsummaryrefslogtreecommitdiff
path: root/exec/java-exec/src/main
diff options
context:
space:
mode:
authorSteven Phillips <sphillips@maprtech.com>2014-08-06 12:40:04 -0700
committerJacques Nadeau <jacques@apache.org>2014-08-06 16:44:21 -0700
commit4a70d568e0c0a3c69ef977bacd98e6740cd8bfee (patch)
treeaafff2cf1cf7dbe516c88d9fe35b595d77060f2c /exec/java-exec/src/main
parenta564da9e55eab2e85bb38827bc577fbdfea78576 (diff)
DRILL-1063: Fix bug in merge join when value is repeating across batch boundary
Diffstat (limited to 'exec/java-exec/src/main')
-rw-r--r--exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinTemplate.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinTemplate.java
index 0bfef5b55..c704a8a3d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinTemplate.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinTemplate.java
@@ -157,7 +157,7 @@ public abstract class JoinTemplate implements JoinWorker {
}
status.advanceRight();
- } while (status.isRightPositionInCurrentBatch() && doCompare(status.getLeftPosition(), status.getRightPosition()) == 0);
+ } while ((!status.isLeftRepeating() || status.isRightPositionInCurrentBatch()) && status.isRightPositionAllowed() && doCompare(status.getLeftPosition(), status.getRightPosition()) == 0);
if (status.getRightPosition() > initialRightPosition &&
(status.isLeftRepeating() || ! status.isNextLeftPositionInCurrentBatch()))