tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [01/10] git commit: DAG-execplan
Date Tue, 31 Dec 2013 08:50:53 GMT
Updated Branches:
  refs/heads/DAG-execplan 6b9061432 -> f932f5d06


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/77660afb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/77660afb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/77660afb

Branch: refs/heads/DAG-execplan
Commit: 77660afb5561c9abdd09956128b356a0635b251e
Parents: 6b90614
Author: Jihoon Son <jihoonson@apache.org>
Authored: Sat Dec 28 15:54:25 2013 +0900
Committer: Jihoon Son <jihoonson@apache.org>
Committed: Sat Dec 28 15:54:25 2013 +0900

----------------------------------------------------------------------
 .../org/apache/tajo/engine/planner/global/ExecutionPlan.java   | 6 ++++++
 .../java/org/apache/tajo/engine/planner/logical/ScanNode.java  | 1 +
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/77660afb/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 e91e460..80ea564 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
@@ -432,6 +432,12 @@ public class ExecutionPlan implements GsonObject {
       if (plan.inputContext == null) {
         plan.inputContext = new InputContext();
       }
+      // TODO: update scan and the plan graph
+      for (ScanNode eachScan : plan.inputContext.getScanNodes()) {
+        if (eachScan.equals(node)) {
+          return;
+        }
+      }
       plan.inputContext.addScanNode(node);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/77660afb/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/ScanNode.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/ScanNode.java
b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/ScanNode.java
index bfd25cc..1c6efc8 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/ScanNode.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/ScanNode.java
@@ -145,6 +145,7 @@ public class ScanNode extends RelationNode implements Projectable {
 	    eq = eq && TUtil.checkEquals(this.tableDesc, other.tableDesc);
 	    eq = eq && TUtil.checkEquals(this.qual, other.qual);
 	    eq = eq && TUtil.checkEquals(this.targets, other.targets);
+      eq = eq && TUtil.checkEquals(this.renamedSchema, other.renamedSchema);
 	    
 	    return eq;
 	  }	  


Mime
View raw message