aboutsummaryrefslogtreecommitdiff
path: root/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/MergingReceiverCreator.java
diff options
context:
space:
mode:
authorJacques Nadeau <jacques@apache.org>2014-11-19 09:08:12 -0800
committerJacques Nadeau <jacques@apache.org>2014-11-20 08:40:25 -0800
commitfc58c693ae0cd9234e5e62a7602b4cc216b8549d (patch)
treee34afffbb9d8f9ae2d352062683f5d20e3b14b3d /exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/MergingReceiverCreator.java
parentf2180b8fc1edddc77ad7f6d9c615a4141cdc51ae (diff)
DRILL-1517: Update Foreman to improve state management.
Diffstat (limited to 'exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/MergingReceiverCreator.java')
-rw-r--r--exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/MergingReceiverCreator.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/MergingReceiverCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/MergingReceiverCreator.java
index 528611e3b..daef44cce 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/MergingReceiverCreator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/MergingReceiverCreator.java
@@ -20,6 +20,7 @@ package org.apache.drill.exec.physical.impl;
import java.util.List;
import org.apache.drill.common.exceptions.ExecutionSetupException;
+import org.apache.drill.exec.memory.OutOfMemoryException;
import org.apache.drill.exec.ops.FragmentContext;
import org.apache.drill.exec.physical.config.MergingReceiverPOP;
import org.apache.drill.exec.physical.impl.mergereceiver.MergingRecordBatch;
@@ -34,7 +35,7 @@ public class MergingReceiverCreator implements BatchCreator<MergingReceiverPOP>
public RecordBatch getBatch(FragmentContext context,
MergingReceiverPOP receiver,
List<RecordBatch> children)
- throws ExecutionSetupException {
+ throws ExecutionSetupException, OutOfMemoryException {
assert children == null || children.isEmpty();
IncomingBuffers bufHolder = context.getBuffers();