You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2013/12/28 07:36:45 UTC
[48/50] [abbrv] git commit: DAG-execplan
DAG-execplan
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/ded3409d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/ded3409d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/ded3409d
Branch: refs/heads/DAG-execplan
Commit: ded3409d385696aa455dbb8e3f6dbffada9e44d6
Parents: bc50ff7
Author: Jihoon Son <ji...@apache.org>
Authored: Fri Dec 27 20:11:30 2013 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Fri Dec 27 20:11:30 2013 +0900
----------------------------------------------------------------------
.../org/apache/tajo/engine/planner/global/ExecutionPlan.java | 5 +++--
.../org/apache/tajo/engine/planner/global/GlobalPlanner.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ded3409d/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/ExecutionPlan.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/ExecutionPlan.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/ExecutionPlan.java
index a3506d5..d6a7063 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/ExecutionPlan.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/ExecutionPlan.java
@@ -91,8 +91,9 @@ public class ExecutionPlan implements GsonObject {
if (nodes[i] instanceof UnaryNode) {
((UnaryNode)nodes[i]).setChild(nodes[++i]);
} else if (nodes[i] instanceof BinaryNode) {
- ((BinaryNode)nodes[i]).setLeftChild(nodes[++i]);
- ((BinaryNode)nodes[i]).setRightChild(nodes[++i]);
+ ((BinaryNode)nodes[i]).setLeftChild(nodes[i+1]);
+ ((BinaryNode)nodes[i]).setRightChild(nodes[i+2]);
+ i += 2;
} else if (nodes[i] instanceof TableSubQueryNode) {
((TableSubQueryNode)nodes[i]).setSubQuery(nodes[++i]);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ded3409d/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
index 912f367..2dbd1ed 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
@@ -80,7 +80,7 @@ public class GlobalPlanner {
ExecutionBlock childExecBlock = globalPlanContext.execBlockMap.get(lastNode.getPID());
- if (childExecBlock.getPlan() != null) {
+ if (childExecBlock.getPlan().hasPlanGroup()) {
ExecutionBlock terminalBlock = masterPlan.createTerminalBlock();
DataChannel dataChannel = new DataChannel(childExecBlock, terminalBlock, NONE_PARTITION, 1);
dataChannel.setStoreType(CatalogProtos.StoreType.CSV);