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:38 UTC
[41/50] [abbrv] git commit: Merge branch 'DAG-execplan' of
bitbucket.org:jihoonson/tajo-ta into DAG-execplan
Merge branch 'DAG-execplan' of bitbucket.org:jihoonson/tajo-ta into 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/6474b348
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/6474b348
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/6474b348
Branch: refs/heads/DAG-execplan
Commit: 6474b348931e5448ad63ceae8051169d53de5095
Parents: eac2507 2495601
Author: Jihoon Son <ji...@apache.org>
Authored: Thu Dec 26 20:16:23 2013 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Thu Dec 26 20:16:23 2013 +0900
----------------------------------------------------------------------
.../java/org/apache/tajo/catalog/Schema.java | 5 +
.../java/org/apache/tajo/catalog/TableDesc.java | 5 +
.../apache/tajo/engine/json/CoreGsonHelper.java | 4 +
.../tajo/engine/json/ExecutionPlanAdapter.java | 49 ++
.../tajo/engine/json/SourceContextAdapter.java | 47 ++
.../apache/tajo/engine/planner/LogicalPlan.java | 22 +-
.../tajo/engine/planner/PhysicalPlanner.java | 6 +-
.../engine/planner/PhysicalPlannerImpl.java | 516 ++++++++++++-------
.../apache/tajo/engine/planner/PlannerUtil.java | 234 ++++++++-
.../tajo/engine/planner/global/DataChannel.java | 87 +++-
.../planner/global/DestinationContext.java | 104 ++++
.../engine/planner/global/ExecutionBlock.java | 73 +--
.../planner/global/ExecutionBlockPID.java | 43 ++
.../engine/planner/global/ExecutionPlan.java | 393 ++++++++++++++
.../planner/global/ExecutionPlanEdge.java | 51 ++
.../engine/planner/global/GlobalPlanner.java | 56 +-
.../engine/planner/global/InputContext.java | 78 +++
.../tajo/engine/planner/global/MasterPlan.java | 21 +-
.../engine/planner/graph/DirectedGraph.java | 6 +-
.../planner/graph/SimpleDirectedGraph.java | 35 +-
.../planner/graph/SimpleUndirectedGraph.java | 12 +-
.../tajo/engine/planner/logical/ExceptNode.java | 19 +-
.../engine/planner/logical/GroupbyNode.java | 12 +-
.../engine/planner/logical/IntersectNode.java | 14 +-
.../tajo/engine/planner/logical/JoinNode.java | 8 +-
.../tajo/engine/planner/logical/LimitNode.java | 4 +-
.../engine/planner/logical/LogicalNode.java | 14 +-
.../engine/planner/logical/LogicalRootNode.java | 6 +-
.../tajo/engine/planner/logical/NodeType.java | 1 -
.../engine/planner/logical/ProjectionNode.java | 8 +-
.../tajo/engine/planner/logical/ScanNode.java | 4 +-
.../engine/planner/logical/SelectionNode.java | 8 +-
.../tajo/engine/planner/logical/SortNode.java | 6 +-
.../engine/planner/logical/StoreTableNode.java | 6 +-
.../tajo/engine/planner/logical/UnionNode.java | 19 +-
.../planner/physical/IndexedStoreExec.java | 10 +-
.../planner/physical/MultiOutputExec.java | 52 ++
.../planner/physical/PartitionedStoreExec.java | 27 +-
.../planner/physical/PhysicalRootExec.java | 81 +++
.../engine/planner/physical/StoreTableExec.java | 6 +-
.../tajo/engine/query/QueryUnitRequest.java | 3 +-
.../tajo/engine/query/QueryUnitRequestImpl.java | 82 ++-
.../tajo/master/DefaultTaskScheduler.java | 11 +-
.../master/querymaster/QueryMasterTask.java | 2 +-
.../tajo/master/querymaster/QueryUnit.java | 62 +--
.../tajo/master/querymaster/Repartitioner.java | 52 +-
.../tajo/master/querymaster/SubQuery.java | 24 +-
.../org/apache/tajo/worker/TajoQueryEngine.java | 7 +-
.../main/java/org/apache/tajo/worker/Task.java | 55 +-
.../apache/tajo/worker/TaskAttemptContext.java | 19 +-
.../src/main/proto/TajoWorkerProtocol.proto | 8 +-
.../tajo/engine/planner/TestLogicalPlan.java | 4 +-
.../planner/global/TestExecutionPlan.java | 98 ++++
.../engine/planner/global/TestMasterPlan.java | 6 +-
.../planner/physical/TestBNLJoinExec.java | 24 +-
.../planner/physical/TestBSTIndexExec.java | 12 +-
.../planner/physical/TestExternalSortExec.java | 14 +-
.../physical/TestFullOuterHashJoinExec.java | 37 +-
.../physical/TestFullOuterMergeJoinExec.java | 56 +-
.../planner/physical/TestHashAntiJoinExec.java | 12 +-
.../planner/physical/TestHashJoinExec.java | 10 +-
.../planner/physical/TestHashSemiJoinExec.java | 8 +-
.../physical/TestLeftOuterHashJoinExec.java | 77 +--
.../physical/TestLeftOuterNLJoinExec.java | 72 +--
.../planner/physical/TestMergeJoinExec.java | 14 +-
.../engine/planner/physical/TestNLJoinExec.java | 20 +-
.../planner/physical/TestPhysicalPlanner.java | 222 +++++---
.../physical/TestRightOuterHashJoinExec.java | 51 +-
.../physical/TestRightOuterMergeJoinExec.java | 103 ++--
.../engine/planner/physical/TestSortExec.java | 12 +-
.../tajo/worker/TestRangeRetrieverHandler.java | 24 +-
71 files changed, 2590 insertions(+), 763 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/6474b348/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
----------------------------------------------------------------------
diff --cc tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
index 877a179,0e37ea4..e0118ea
--- 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
@@@ -25,10 -25,11 +25,12 @@@ import com.google.common.collect.Sets
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.Path;
+ import org.apache.tajo.ExecutionBlockId;
import org.apache.tajo.algebra.JoinType;
import org.apache.tajo.catalog.*;
+import org.apache.tajo.catalog.partition.PartitionDesc;
import org.apache.tajo.catalog.proto.CatalogProtos;
+ import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.engine.eval.AggregationFunctionCallEval;
import org.apache.tajo.engine.eval.EvalTreeUtil;