You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by ja...@apache.org on 2014/04/20 03:18:20 UTC

[12/51] [abbrv] git commit: in partition sender, on Iteroutcome.STOP, cleanup without flushing

in partition sender, on Iteroutcome.STOP, cleanup without flushing


Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/e28e1ef3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/e28e1ef3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/e28e1ef3

Branch: refs/heads/master
Commit: e28e1ef346b2e29862fb760be973c9145b55b761
Parents: bf3fa66
Author: Steven Phillips <sp...@maprtech.com>
Authored: Mon Mar 31 17:47:56 2014 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Sat Apr 19 18:07:09 2014 -0700

----------------------------------------------------------------------
 .../impl/partitionsender/PartitionSenderRootExec.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/e28e1ef3/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java
index 19fe98b..d0efcb0 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java
@@ -95,7 +95,6 @@ public class PartitionSenderRootExec implements RootExec {
     logger.debug("Partitioner.next(): got next record batch with status {}", out);
     switch(out){
       case NONE:
-      case STOP:
         try {
           // send any pending batches
           for (OutgoingRecordBatch batch : outgoing) {
@@ -109,6 +108,12 @@ public class PartitionSenderRootExec implements RootExec {
         }
         return false;
 
+      case STOP:
+        for (OutgoingRecordBatch batch : outgoing) {
+          batch.clear();
+        }
+        return false;
+
       case OK_NEW_SCHEMA:
         try {
           // send all existing batches