Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/tajo into index_support
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/645d306a Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/645d306a Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/645d306a Branch: refs/heads/index_support Commit: 645d306a525dca62acfbfc966774755408ed7660 Parents: c9b8f51 b637416 Author: Jihoon Son <[email protected]> Authored: Fri Aug 1 10:39:20 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Fri Aug 1 10:39:20 2014 +0900 ---------------------------------------------------------------------- CHANGES | 26 ++- .../java/org/apache/tajo/conf/TajoConf.java | 3 +- .../java/org/apache/tajo/datum/Float4Datum.java | 3 +- .../java/org/apache/tajo/datum/Float8Datum.java | 3 +- .../java/org/apache/tajo/datum/Int2Datum.java | 3 +- .../java/org/apache/tajo/datum/Int4Datum.java | 3 +- .../java/org/apache/tajo/datum/Int8Datum.java | 3 +- .../java/org/apache/tajo/datum/TextDatum.java | 4 +- .../java/org/apache/tajo/util/MurmurHash.java | 213 +++++++++++++++++++ .../engine/planner/global/GlobalPlanner.java | 4 +- .../planner/physical/ColPartitionStoreExec.java | 3 +- .../planner/physical/HashPartitioner.java | 3 +- .../apache/tajo/engine/utils/SchemaUtil.java | 20 +- .../tajo/master/querymaster/QueryUnit.java | 10 +- .../tajo/master/querymaster/Repartitioner.java | 25 ++- .../tajo/master/querymaster/SubQuery.java | 23 +- .../tajo/webapp/QueryExecutorServlet.java | 200 +++++++++++------ .../java/org/apache/tajo/worker/FetchImpl.java | 24 ++- .../apache/tajo/worker/TaskAttemptContext.java | 26 ++- .../planner/global/TestBroadcastJoinPlan.java | 94 ++++---- .../planner/physical/TestHashPartitioner.java | 39 +++- .../tajo/engine/query/TestCaseByCases.java | 38 +++- .../tajo/engine/query/TestGroupByQuery.java | 109 +++++++++- .../tajo/engine/query/TestInsertQuery.java | 70 ++++++ .../tajo/engine/query/TestJoinBroadcast.java | 91 +++++++- .../TestCaseByCases/testTAJO914Case1.sql | 10 + .../TestCaseByCases/testTAJO914Case2.sql | 9 + .../TestCaseByCases/testTAJO914Case3.sql | 10 + .../TestCaseByCases/testTAJO914Case4.sql | 10 + .../testGroupByWithSameConstantKeys1.sql | 2 +- .../testGroupByWithSameExprs1.sql | 2 + .../testGroupByWithSameExprs2.sql | 4 +- .../testHavingWithNamedTarget.sql | 14 +- .../TestCaseByCases/testTAJO914Case1.result | 5 + .../TestCaseByCases/testTAJO914Case2.result | 5 + .../TestCaseByCases/testTAJO914Case3.result | 5 + .../TestCaseByCases/testTAJO914Case4.result | 5 + .../TestGroupByQuery/testGroupBy2.result | 4 +- .../testGroupByWithSameConstantKeys1.result | 4 +- .../TestGroupByQuery/testGroupbyWithJson.result | 4 +- .../testHavingWithNamedTarget.result | 4 +- ...estBroadcastMultiColumnPartitionTable.result | 4 +- 42 files changed, 967 insertions(+), 174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/645d306a/CHANGES ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/645d306a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/645d306a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/645d306a/tajo-core/src/main/java/org/apache/tajo/worker/TaskAttemptContext.java ----------------------------------------------------------------------
