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/c3f231d7 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/c3f231d7 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/c3f231d7 Branch: refs/heads/index_support Commit: c3f231d7e72225d4b29a8c2ddde9759a94da8953 Parents: 935b944 80afe99 Author: Jihoon Son <[email protected]> Authored: Fri Nov 21 20:48:39 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Fri Nov 21 20:48:39 2014 +0900 ---------------------------------------------------------------------- CHANGES | 8 + .../tajo/master/TajoMasterClientService.java | 32 ++-- .../master/querymaster/QueryJobManager.java | 70 +++++-- .../master/querymaster/QueryMasterTask.java | 1 + .../tajo/webapp/QueryExecutorServlet.java | 24 ++- .../main/java/org/apache/tajo/worker/Task.java | 4 +- .../src/main/resources/webapps/admin/index.jsp | 42 +---- .../resources/webapps/admin/query_executor.jsp | 4 +- .../org/apache/tajo/worker/TestHistory.java | 6 +- .../org/apache/tajo/storage/avro/AvroUtil.java | 35 +++- .../java/org/apache/tajo/HttpFileServer.java | 84 +++++++++ .../org/apache/tajo/HttpFileServerHandler.java | 184 +++++++++++++++++++ .../tajo/HttpFileServerPipelineFactory.java | 54 ++++++ .../apache/tajo/storage/avro/TestAvroUtil.java | 108 +++++++++++ 14 files changed, 576 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
