Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/aa01e838 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/aa01e838 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/aa01e838 Branch: refs/heads/TAJO-1027 Commit: aa01e83859ef553ac4eb90c1678e3bc6be20c6c9 Parents: 45f5ed3 96b6c2a Author: Jaehwa Jung <[email protected]> Authored: Mon Aug 18 18:56:24 2014 +0900 Committer: Jaehwa Jung <[email protected]> Committed: Mon Aug 18 18:56:24 2014 +0900 ---------------------------------------------------------------------- CHANGES | 21 +++ LICENSE | 25 +++ NOTICE | 6 + .../main/java/org/apache/tajo/cli/TajoCli.java | 10 +- .../java/org/apache/tajo/client/TajoAdmin.java | 2 +- .../java/org/apache/tajo/client/TajoClient.java | 26 +++- tajo-common/pom.xml | 15 ++ .../java/org/apache/tajo/datum/TextDatum.java | 8 +- .../java/org/apache/tajo/unit/StorageUnit.java | 2 +- .../org/apache/tajo/datum/TestTextDatum.java | 36 ++++- .../org/apache/tajo/engine/eval/BinaryEval.java | 14 +- .../apache/tajo/engine/eval/EvalTreeUtil.java | 23 ++- .../apache/tajo/engine/eval/FunctionEval.java | 6 +- .../eval/EvalTreeOptimizationRule.java | 27 ++++ .../optimizer/eval/EvalTreeOptimizer.java | 76 +++++++++ .../tajo/engine/optimizer/eval/Prioritized.java | 30 ++++ .../optimizer/eval/rules/ConstantFolding.java | 92 +++++++++++ .../eval/rules/ConstantPropagation.java | 112 ++++++++++++++ .../tajo/engine/planner/ExprAnnotator.java | 12 +- .../tajo/engine/planner/ExprNormalizer.java | 2 +- .../apache/tajo/engine/planner/LogicalPlan.java | 56 ++++++- .../engine/planner/LogicalPlanPreprocessor.java | 120 +++++++-------- .../tajo/engine/planner/LogicalPlanner.java | 154 ++++++++++++------- .../tajo/engine/planner/NamedExprsManager.java | 15 +- .../apache/tajo/engine/planner/PlannerUtil.java | 2 +- .../tajo/engine/planner/TypeDeterminant.java | 41 ++--- .../planner/rewrite/ProjectionPushDownRule.java | 2 +- .../apache/tajo/master/querymaster/Query.java | 25 ++- .../tajo/master/querymaster/QueryMaster.java | 14 ++ .../master/querymaster/QueryMasterTask.java | 4 +- .../tajo/master/querymaster/SubQuery.java | 85 ++++++---- .../tajo/worker/TajoResourceAllocator.java | 2 +- .../tajo/worker/TajoWorkerClientService.java | 12 +- .../org/apache/tajo/client/TestTajoClient.java | 2 +- .../tajo/engine/eval/TestEvalTreeUtil.java | 14 +- .../tajo/engine/planner/TestLogicalPlan.java | 34 +--- .../tajo/engine/query/TestGroupByQuery.java | 54 +++++++ .../apache/tajo/engine/query/TestJoinQuery.java | 28 ++++ .../tajo/engine/query/TestSelectQuery.java | 11 +- .../apache/tajo/engine/query/TestSortQuery.java | 17 ++ .../tajo/engine/query/TestWindowQuery.java | 7 + .../testGroupByWithConstantKeys3.sql | 8 + .../testGroupByWithConstantKeys4.sql | 12 ++ .../testGroupByWithConstantKeys5.sql | 13 ++ .../testLeftOuterJoinWithConstantExpr4.sql | 6 + .../testLeftOuterJoinWithConstantExpr5.sql | 9 ++ ...SelectSameConstantsWithDifferentAliases3.sql | 10 ++ .../TestSortQuery/testSortWithConstKeys.sql | 10 ++ .../queries/TestWindowQuery/testWindow8.sql | 7 + .../testGroupByWithConstantKeys3.result | 3 + .../testGroupByWithConstantKeys4.result | 5 + .../testGroupByWithConstantKeys5.result | 5 + .../testLeftOuterJoinWithConstantExpr4.result | 7 + .../testLeftOuterJoinWithConstantExpr5.result | 6 + .../TestSelectQuery/testSelectAsterisk5.result | 2 +- ...ectSameConstantsWithDifferentAliases3.result | 7 + .../TestSortQuery/testSortWithConstKeys.result | 7 + .../testLocalQueryWithoutFrom.result | 4 +- .../results/TestWindowQuery/testWindow8.result | 7 + tajo-project/pom.xml | 37 ++++- tajo-project/src/site/apt/index.apt | 2 + 61 files changed, 1141 insertions(+), 270 deletions(-) ----------------------------------------------------------------------
