You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pr...@apache.org on 2017/10/11 17:55:34 UTC
[4/5] drill git commit: DRILL-5854: IllegalStateException when empty
batch with valid schema is received
DRILL-5854: IllegalStateException when empty batch with valid schema is received
closes #981
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e14cb7ac
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e14cb7ac
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e14cb7ac
Branch: refs/heads/master
Commit: e14cb7ac2dacd618dc217dc3c136da8ba2fe9367
Parents: 0049f17
Author: Padma Penumarthy <pp...@yahoo.com>
Authored: Mon Oct 9 15:05:17 2017 -0700
Committer: Paul Rogers <pr...@maprtech.com>
Committed: Wed Oct 11 10:24:23 2017 -0700
----------------------------------------------------------------------
.../drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/e14cb7ac/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java
index 35c1f81..eff1ae9 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java
@@ -224,6 +224,7 @@ public class MergingRecordBatch extends AbstractRecordBatch<MergingReceiverPOP>
if (rawBatch == null) {
createDummyBatch = true;
rawBatches.add(rawBatch);
+ p++; // move to next sender
continue;
}