Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0D26E11759 for ; Tue, 15 Jul 2014 07:16:42 +0000 (UTC) Received: (qmail 2222 invoked by uid 500); 15 Jul 2014 07:16:42 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 2144 invoked by uid 500); 15 Jul 2014 07:16:41 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 1978 invoked by uid 99); 15 Jul 2014 07:16:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jul 2014 07:16:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B89ED94BDED; Tue, 15 Jul 2014 07:16:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jihoonson@apache.org To: commits@tajo.apache.org Date: Tue, 15 Jul 2014 07:16:58 -0000 Message-Id: <60a72313679d465188c8adb7b9c2828e@git.apache.org> In-Reply-To: <15a944093b504f69802422dbee053d75@git.apache.org> References: <15a944093b504f69802422dbee053d75@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/19] git commit: Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/tajo into index_support 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/e9207f3b Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e9207f3b Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e9207f3b Branch: refs/heads/index_support Commit: e9207f3b3f63edf57731242e26edc443abd2e062 Parents: 31d524c 9cf1071 Author: Jihoon Son Authored: Tue Jul 15 16:16:13 2014 +0900 Committer: Jihoon Son Committed: Tue Jul 15 16:16:13 2014 +0900 ---------------------------------------------------------------------- CHANGES | 46 ++ .../tajo/catalog/statistics/ColumnStats.java | 10 +- .../tajo/catalog/statistics/TableStats.java | 9 +- .../tajo/catalog/statistics/TestTableStat.java | 55 ++ .../tajo-catalog-drivers/tajo-hcatalog/pom.xml | 4 +- .../tajo/catalog/store/HCatalogStore.java | 25 +- .../catalog/store/HCatalogStoreClientPool.java | 32 +- .../java/org/apache/tajo/cli/HelpCommand.java | 58 ++- .../java/org/apache/tajo/TajoConstants.java | 2 +- .../java/org/apache/tajo/conf/TajoConf.java | 6 + .../java/org/apache/tajo/util/KeyValueSet.java | 2 +- tajo-common/src/main/proto/tajo_protos.proto | 1 + .../tajo/engine/planner/LogicalPlanner.java | 3 +- .../engine/planner/PhysicalPlannerImpl.java | 1 + .../engine/planner/RangePartitionAlgorithm.java | 2 +- .../planner/global/ExecutionBlockCursor.java | 131 ++++- .../engine/planner/global/GlobalPlanner.java | 16 +- .../tajo/engine/planner/global/MasterPlan.java | 11 + .../planner/physical/ColPartitionStoreExec.java | 9 +- .../DistinctGroupbyHashAggregationExec.java | 30 +- .../planner/physical/HashLeftOuterJoinExec.java | 41 +- .../physical/HashShuffleFileWriteExec.java | 1 + .../planner/rewrite/ProjectionPushDownRule.java | 4 +- .../org/apache/tajo/engine/utils/TupleUtil.java | 70 ++- .../apache/tajo/master/querymaster/Query.java | 15 +- .../tajo/master/querymaster/QueryUnit.java | 13 + .../master/querymaster/QueryUnitAttempt.java | 2 +- .../tajo/master/querymaster/Repartitioner.java | 143 +++++- .../tajo/master/querymaster/SubQuery.java | 22 +- .../java/org/apache/tajo/worker/Fetcher.java | 119 +++-- .../main/java/org/apache/tajo/worker/Task.java | 47 +- .../apache/tajo/worker/TaskAttemptContext.java | 18 + .../apache/tajo/worker/TaskRunnerHistory.java | 5 +- .../src/main/proto/TajoWorkerProtocol.proto | 2 + .../java/org/apache/tajo/QueryTestCaseBase.java | 35 +- .../planner/global/TestBroadcastJoinPlan.java | 84 ++++ .../tajo/engine/query/TestCreateTable.java | 199 +++++--- .../tajo/engine/query/TestGroupByQuery.java | 85 +++- .../tajo/engine/query/TestJoinBroadcast.java | 26 + .../apache/tajo/engine/query/TestJoinQuery.java | 56 +++ .../apache/tajo/engine/query/TestSortQuery.java | 49 ++ .../tajo/engine/query/TestTablePartitions.java | 98 +++- .../org/apache/tajo/jdbc/TestResultSet.java | 3 + .../querymaster/TestQueryUnitStatusUpdate.java | 4 +- .../org/apache/tajo/worker/TestFetcher.java | 162 ++++-- .../testGroupByWithConstantKeys2.sql | 1 + .../testJoinFilterOfRowPreservedTable1.sql | 8 + .../testGroupByWithConstantKeys1.result | 3 + .../testGroupByWithConstantKeys2.result | 5 + .../testJoinFilterOfRowPreservedTable1.result | 15 + .../java/org/apache/tajo/rpc/TestAsyncRpc.java | 22 +- tajo-storage/pom.xml | 4 +- .../org/apache/tajo/storage/RowStoreUtil.java | 1 + .../apache/tajo/storage/TableStatistics.java | 5 +- .../tajo/storage/parquet/TajoParquetReader.java | 2 +- .../tajo/storage/parquet/TajoParquetWriter.java | 2 +- .../org/apache/tajo/storage/rcfile/RCFile.java | 1 + .../thirdparty/parquet/CodecFactory.java | 196 ++++++++ .../parquet/ColumnChunkPageWriteStore.java | 211 ++++++++ .../parquet/InternalParquetRecordReader.java | 187 +++++++ .../parquet/InternalParquetRecordWriter.java | 156 ++++++ .../thirdparty/parquet/ParquetFileWriter.java | 504 +++++++++++++++++++ .../thirdparty/parquet/ParquetReader.java | 151 ++++++ .../thirdparty/parquet/ParquetWriter.java | 220 ++++++++ .../java/org/apache/tajo/storage/v2/RCFile.java | 5 - .../org/apache/tajo/storage/TestStorages.java | 58 ++- .../tajo/pullserver/PullServerAuxService.java | 4 +- .../tajo/pullserver/TajoPullServerService.java | 32 +- 68 files changed, 3220 insertions(+), 329 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e9207f3b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e9207f3b/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e9207f3b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e9207f3b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e9207f3b/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/ProjectionPushDownRule.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e9207f3b/tajo-core/src/main/java/org/apache/tajo/worker/TaskAttemptContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e9207f3b/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java ----------------------------------------------------------------------