You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2014/06/09 07:04:05 UTC
[03/11] git commit: Reset fragment allocation for each minor fragment
Reset fragment allocation for each minor fragment
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/4935b19b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/4935b19b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/4935b19b
Branch: refs/heads/master
Commit: 4935b19b184f3036c7eff12025dc67cf1e0a49e1
Parents: 3c47c07
Author: Steven Phillips <sp...@maprtech.com>
Authored: Sat Jun 7 17:29:21 2014 -0700
Committer: Steven Phillips <sp...@maprtech.com>
Committed: Sat Jun 7 17:29:21 2014 -0700
----------------------------------------------------------------------
.../apache/drill/exec/planner/fragment/SimpleParallelizer.java | 1 +
.../java/org/apache/drill/exec/planner/fragment/Wrapper.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4935b19b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java
index d226b08..9b84724 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java
@@ -129,6 +129,7 @@ public class SimpleParallelizer {
// Create a minorFragment for each major fragment.
for (int minorFragmentId = 0; minorFragmentId < wrapper.getWidth(); minorFragmentId++) {
IndexedFragmentNode iNode = new IndexedFragmentNode(minorFragmentId, wrapper);
+ wrapper.resetAllocation();
PhysicalOperator op = physicalOperatorRoot.accept(materializer, iNode);
Preconditions.checkArgument(op instanceof FragmentRoot);
FragmentRoot root = (FragmentRoot) op;
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4935b19b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java
index 5e46aaf..78b813d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java
@@ -69,6 +69,11 @@ public class Wrapper {
return stats;
}
+ public void resetAllocation() {
+ initialAllocation = 0;
+ maxAllocation = 0;
+ }
+
public void addEndpointAffinity(List<EndpointAffinity> affinities){
Preconditions.checkState(!endpointsAssigned);
for(EndpointAffinity ea : affinities){