tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [6/6] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Date Tue, 11 Nov 2014 14:24:51 GMT
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 <jihoonson@apache.org>
Authored: Tue Nov 11 23:24:30 2014 +0900
Committer: Jihoon Son <jihoonson@apache.org>
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(-)
----------------------------------------------------------------------



Mime
View raw message