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/6a8ac97d Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/6a8ac97d Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/6a8ac97d Branch: refs/heads/index_support Commit: 6a8ac97de2fd8f469923c0e051746157d99ea968 Parents: dfaf6a5 cb9793b Author: Jihoon Son <[email protected]> Authored: Mon Jan 5 19:11:41 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Jan 5 19:11:41 2015 +0900 ---------------------------------------------------------------------- CHANGES | 6 + .../org/apache/tajo/client/QueryClientImpl.java | 99 ++-------- .../apache/tajo/client/SessionConnection.java | 19 +- tajo-client/src/main/proto/ClientProtos.proto | 22 ++- .../main/proto/QueryMasterClientProtocol.proto | 4 - .../tajo/master/TajoMasterClientService.java | 18 +- .../master/querymaster/QueryInProgress.java | 66 +++---- .../tajo/master/querymaster/QueryInfo.java | 41 ++++- .../master/querymaster/QueryJobManager.java | 5 + .../tajo/master/querymaster/QueryMaster.java | 6 +- .../tajo/worker/TajoWorkerClientService.java | 127 ------------- .../src/main/proto/TajoMasterProtocol.proto | 7 +- .../org/apache/tajo/TajoTestingCluster.java | 24 +-- tajo-docs/src/main/sphinx/getting_started.rst | 184 ++++++++++++++++++- .../main/sphinx/getting_started/building.rst | 30 --- .../getting_started/downloading_source.rst | 31 ---- .../main/sphinx/getting_started/first_query.rst | 78 -------- .../main/sphinx/getting_started/local_setup.rst | 31 ---- .../sphinx/getting_started/prerequisites.rst | 7 - 19 files changed, 314 insertions(+), 491 deletions(-) ----------------------------------------------------------------------
