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 A81F217C2C for ; Tue, 11 Nov 2014 14:24:49 +0000 (UTC) Received: (qmail 2753 invoked by uid 500); 11 Nov 2014 14:24:48 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 2699 invoked by uid 500); 11 Nov 2014 14:24:48 -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 2663 invoked by uid 99); 11 Nov 2014 14:24:47 -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, 11 Nov 2014 14:24:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5A40C9AC7E8; Tue, 11 Nov 2014 14:24:47 +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, 11 Nov 2014 14:24:51 -0000 Message-Id: <6c003cdaa73440e69006858388d779bd@git.apache.org> In-Reply-To: <54aae47cff5f411681532b4cd1ed1c9a@git.apache.org> References: <54aae47cff5f411681532b4cd1ed1c9a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support Merge branch 'master' of https://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/4a364cf0 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4a364cf0 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4a364cf0 Branch: refs/heads/index_support Commit: 4a364cf08a22ab50eb50eb6b8ca373e2f6f0ce42 Parents: a5298fb 2b8d30c Author: Jihoon Son Authored: Tue Nov 11 23:24:30 2014 +0900 Committer: Jihoon Son Committed: Tue Nov 11 23:24:30 2014 +0900 ---------------------------------------------------------------------- CHANGES | 7 + .../org/apache/tajo/client/QueryClient.java | 6 + .../org/apache/tajo/client/QueryClientImpl.java | 52 +++ .../org/apache/tajo/client/TajoClientImpl.java | 13 +- tajo-client/src/main/proto/ClientProtos.proto | 60 +++ .../main/proto/QueryMasterClientProtocol.proto | 1 + .../main/proto/TajoMasterClientProtocol.proto | 1 + tajo-common/pom.xml | 4 - .../java/org/apache/tajo/conf/TajoConf.java | 26 ++ .../tajo/util/datetime/DateTimeConstants.java | 22 + .../tajo/util/datetime/DateTimeFormat.java | 2 +- .../apache/tajo/util/datetime/DateTimeUtil.java | 96 ++-- .../apache/tajo/util/TestDateTimeFormat.java | 12 +- .../org/apache/tajo/util/TestDateTimeUtil.java | 79 ++-- .../datetime/DateTimePartFromUnixTimestamp.java | 18 +- .../java/org/apache/tajo/master/TajoMaster.java | 21 + .../tajo/master/TajoMasterClientService.java | 33 ++ .../apache/tajo/master/querymaster/Query.java | 39 ++ .../master/querymaster/QueryInProgress.java | 3 + .../tajo/master/querymaster/QueryInfo.java | 79 +++- .../tajo/master/querymaster/QueryMaster.java | 89 ++-- .../tajo/master/querymaster/QueryUnit.java | 79 ++++ .../tajo/master/querymaster/SubQuery.java | 76 ++++ .../main/java/org/apache/tajo/util/JSPUtil.java | 162 ++++++- .../org/apache/tajo/util/history/History.java | 27 ++ .../tajo/util/history/HistoryCleaner.java | 136 ++++++ .../apache/tajo/util/history/HistoryReader.java | 308 +++++++++++++ .../apache/tajo/util/history/HistoryWriter.java | 450 +++++++++++++++++++ .../apache/tajo/util/history/QueryHistory.java | 151 +++++++ .../tajo/util/history/QueryUnitHistory.java | 167 +++++++ .../tajo/util/history/SubQueryHistory.java | 270 +++++++++++ .../java/org/apache/tajo/worker/TajoWorker.java | 20 + .../tajo/worker/TajoWorkerClientService.java | 34 ++ .../main/java/org/apache/tajo/worker/Task.java | 5 +- .../org/apache/tajo/worker/TaskHistory.java | 8 +- .../src/main/resources/webapps/admin/query.jsp | 72 +-- .../resources/webapps/admin/querydetail.jsp | 116 +++++ .../main/resources/webapps/admin/querytasks.jsp | 249 ++++++++++ .../main/resources/webapps/admin/queryunit.jsp | 134 ++++++ .../resources/webapps/worker/querydetail.jsp | 43 +- .../resources/webapps/worker/querytasks.jsp | 126 ++++-- .../resources/webapps/worker/taskhistory.jsp | 123 +++++ .../org/apache/tajo/client/TestTajoClient.java | 54 +++ .../engine/function/TestDateTimeFunctions.java | 15 +- .../java/org/apache/tajo/util/TestJSPUtil.java | 37 +- .../util/history/TestHistoryWriterReader.java | 251 +++++++++++ tajo-project/pom.xml | 5 - tajo-rpc/pom.xml | 4 - 48 files changed, 3549 insertions(+), 236 deletions(-) ----------------------------------------------------------------------