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 3B2BE17A44 for ; Mon, 6 Oct 2014 02:52:18 +0000 (UTC) Received: (qmail 52881 invoked by uid 500); 6 Oct 2014 02:52:18 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 52773 invoked by uid 500); 6 Oct 2014 02:52:18 -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 52604 invoked by uid 99); 6 Oct 2014 02:52:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2014 02:52:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9CACB81AD0E; Mon, 6 Oct 2014 02:52:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blrunner@apache.org To: commits@tajo.apache.org Date: Mon, 06 Oct 2014 02:52:25 -0000 Message-Id: In-Reply-To: <22d3f392f690457aa484482d1f61b89c@git.apache.org> References: <22d3f392f690457aa484482d1f61b89c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/19] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo 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/52a94213 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/52a94213 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/52a94213 Branch: refs/heads/master Commit: 52a942136c549f197d6d1c3d1a13717e6f14a83f Parents: 42a6c4e 5a7e272 Author: Jaehwa Jung Authored: Wed Sep 24 10:26:36 2014 +0900 Committer: Jaehwa Jung Committed: Wed Sep 24 10:26:36 2014 +0900 ---------------------------------------------------------------------- CHANGES | 49 +- .../java/org/apache/tajo/catalog/Schema.java | 3 +- .../main/java/org/apache/tajo/cli/TajoCli.java | 21 +- .../java/org/apache/tajo/client/TajoAdmin.java | 36 +- .../java/org/apache/tajo/client/TajoClient.java | 137 +++++- .../org/apache/tajo/jdbc/FetchResultSet.java | 91 ++++ .../org/apache/tajo/jdbc/TajoResultSetBase.java | 2 +- tajo-client/src/main/proto/ClientProtos.proto | 66 +-- .../main/proto/TajoMasterClientProtocol.proto | 4 +- .../main/java/org/apache/tajo/SessionVars.java | 3 + .../java/org/apache/tajo/conf/TajoConf.java | 8 +- .../java/org/apache/tajo/util/BytesUtils.java | 2 +- tajo-common/src/main/proto/tajo_protos.proto | 10 + .../java/org/apache/tajo/benchmark/TPCH.java | 32 +- .../apache/tajo/engine/planner/PlannerUtil.java | 138 +++++- .../engine/planner/PreLogicalPlanVerifier.java | 4 + .../tajo/master/DefaultTaskScheduler.java | 68 +-- .../org/apache/tajo/master/GlobalEngine.java | 31 +- .../apache/tajo/master/LazyTaskScheduler.java | 4 +- .../master/NonForwardQueryResultScanner.java | 165 +++++++ .../apache/tajo/master/TajoContainerProxy.java | 9 +- .../tajo/master/TajoMasterClientService.java | 83 +++- .../apache/tajo/master/TajoMasterService.java | 9 +- .../master/cluster/WorkerConnectionInfo.java | 178 ++++++++ .../master/event/TaskAttemptAssignedEvent.java | 17 +- .../tajo/master/event/TaskRequestEvent.java | 13 +- .../master/querymaster/QueryInProgress.java | 6 +- .../master/querymaster/QueryJobManager.java | 11 +- .../tajo/master/querymaster/QueryMaster.java | 24 +- .../querymaster/QueryMasterManagerService.java | 7 +- .../tajo/master/querymaster/QueryUnit.java | 12 +- .../master/querymaster/QueryUnitAttempt.java | 32 +- .../tajo/master/querymaster/SubQuery.java | 53 +-- .../apache/tajo/master/rm/TajoRMContext.java | 14 +- .../tajo/master/rm/TajoResourceTracker.java | 24 +- .../master/rm/TajoWorkerResourceManager.java | 33 +- .../java/org/apache/tajo/master/rm/Worker.java | 73 +-- .../org/apache/tajo/master/rm/WorkerEvent.java | 6 +- .../tajo/master/rm/WorkerLivelinessMonitor.java | 4 +- .../tajo/master/rm/WorkerReconnectEvent.java | 2 +- .../tajo/master/rm/WorkerResourceManager.java | 6 +- .../tajo/master/rm/WorkerStatusEvent.java | 2 +- .../org/apache/tajo/master/session/Session.java | 54 +++ .../tajo/master/session/SessionManager.java | 13 +- .../tajo/worker/AbstractResourceAllocator.java | 15 + .../tajo/worker/ExecutionBlockContext.java | 446 +++++++++++++++++++ .../worker/ExecutionBlockSharedResource.java | 36 +- .../java/org/apache/tajo/worker/Fetcher.java | 9 +- .../tajo/worker/TajoResourceAllocator.java | 58 ++- .../java/org/apache/tajo/worker/TajoWorker.java | 244 +++++----- .../tajo/worker/TajoWorkerClientService.java | 6 +- .../tajo/worker/TajoWorkerManagerService.java | 65 +-- .../main/java/org/apache/tajo/worker/Task.java | 290 ++++-------- .../apache/tajo/worker/TaskAttemptContext.java | 49 +- .../java/org/apache/tajo/worker/TaskRunner.java | 279 ++---------- .../apache/tajo/worker/TaskRunnerManager.java | 261 ++++------- .../tajo/worker/WorkerHeartbeatService.java | 78 ++-- .../tajo/worker/event/TaskRunnerEvent.java | 41 ++ .../tajo/worker/event/TaskRunnerStartEvent.java | 59 +++ .../tajo/worker/event/TaskRunnerStopEvent.java | 28 ++ .../src/main/proto/QueryMasterProtocol.proto | 2 +- .../main/proto/ResourceTrackerProtocol.proto | 12 +- .../src/main/proto/TajoMasterProtocol.proto | 36 +- .../src/main/proto/TajoWorkerProtocol.proto | 23 +- .../main/resources/webapps/admin/cluster.jsp | 54 +-- .../src/main/resources/webapps/admin/index.jsp | 4 +- .../src/main/resources/webapps/admin/query.jsp | 8 +- .../resources/webapps/worker/querytasks.jsp | 9 +- .../resources/webapps/worker/taskdetail.jsp | 2 + .../src/main/resources/webapps/worker/tasks.jsp | 4 +- .../org/apache/tajo/TajoTestingCluster.java | 83 +++- .../tajo/cluster/TestWorkerConnectionInfo.java | 36 ++ .../tajo/engine/planner/TestPlannerUtil.java | 62 +++ .../tajo/engine/query/TestNullValues.java | 32 +- .../tajo/engine/query/TestSelectQuery.java | 15 + .../org/apache/tajo/jdbc/TestResultSet.java | 10 +- .../apache/tajo/master/TestGlobalPlanner.java | 68 ++- .../tajo/master/querymaster/TestKillQuery.java | 108 +++++ .../tajo/master/rm/TestTajoResourceManager.java | 8 +- .../org/apache/tajo/worker/TestFetcher.java | 17 +- .../queries/TestSelectQuery/customer_ddl.sql | 9 + .../TestSelectQuery/insert_into_customer.sql | 11 + ...testSimpleQueryWithLimitPartitionedTable.sql | 1 + ...tSimpleQueryWithLimitPartitionedTable.result | 12 + .../TestTajoCli/testHelpSessionVars.result | 1 + tajo-dist/src/main/bin/tajo | 1 + .../functions/math_func_and_operators.rst | 276 +++++++++++- .../org/apache/tajo/rpc/AsyncRpcClient.java | 11 +- .../org/apache/tajo/rpc/AsyncRpcServer.java | 4 +- .../org/apache/tajo/rpc/BlockingRpcClient.java | 13 +- .../org/apache/tajo/rpc/NettyClientBase.java | 86 ++-- .../org/apache/tajo/rpc/RpcConnectionPool.java | 24 +- .../java/org/apache/tajo/rpc/TestAsyncRpc.java | 91 +++- .../org/apache/tajo/rpc/TestBlockingRpc.java | 73 ++- .../pullserver/FadvisedFileRegionWrapper.java | 35 -- .../pullserver/listener/FileCloseListener.java | 53 --- .../pullserver/FadvisedFileRegionWrapper.java | 34 -- .../pullserver/listener/FileCloseListener.java | 55 --- .../pullserver/FadvisedFileRegionWrapper.java | 36 -- .../pullserver/listener/FileCloseListener.java | 55 --- .../tajo/pullserver/FadvisedChunkedFile.java | 81 ++++ .../tajo/pullserver/FadvisedFileRegion.java | 170 +++++++ .../tajo/pullserver/FileCloseListener.java | 53 +++ .../tajo/pullserver/PullServerAuxService.java | 4 +- .../apache/tajo/pullserver/PullServerUtil.java | 90 ++++ .../tajo/pullserver/TajoPullServerService.java | 24 +- 106 files changed, 3682 insertions(+), 1737 deletions(-) ----------------------------------------------------------------------