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/e6b91c33 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e6b91c33 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e6b91c33 Branch: refs/heads/index_support Commit: e6b91c333ae251102f2d7ea6a68d40ee0510028a Parents: 2fe3db4 9d73267 Author: Jihoon Son <[email protected]> Authored: Wed Apr 29 10:44:21 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Wed Apr 29 10:44:21 2015 +0900 ---------------------------------------------------------------------- .travis.yml | 2 +- CHANGES | 4 + .../apache/tajo/client/SessionConnection.java | 12 +- .../java/org/apache/tajo/master/TajoMaster.java | 9 +- .../tajo/master/rm/TajoResourceTracker.java | 8 +- .../apache/tajo/querymaster/QueryMaster.java | 13 +- .../tajo/worker/ExecutionBlockContext.java | 4 +- .../tajo/worker/TajoResourceAllocator.java | 6 +- .../java/org/apache/tajo/worker/TajoWorker.java | 7 + .../java/org/apache/tajo/worker/TaskRunner.java | 14 +- .../tajo/worker/WorkerHeartbeatService.java | 19 +- .../tajo/ws/rs/resources/DatabasesResource.java | 8 +- .../responses/WorkerConnectionInfoResponse.java | 25 +- .../tajo/ws/rs/responses/WorkerResponse.java | 47 ++- .../org/apache/tajo/rpc/RpcChannelFactory.java | 6 +- .../java/org/apache/tajo/rpc/RpcConstants.java | 32 ++ .../org/apache/tajo/rpc/AsyncRpcClient.java | 206 +++------- .../org/apache/tajo/rpc/AsyncRpcServer.java | 65 +-- .../org/apache/tajo/rpc/BlockingRpcClient.java | 214 ++++------ .../org/apache/tajo/rpc/BlockingRpcServer.java | 64 +-- .../java/org/apache/tajo/rpc/CallFuture.java | 32 +- .../apache/tajo/rpc/ChannelEventListener.java | 39 ++ .../tajo/rpc/ConnectionCloseFutureListener.java | 35 -- .../apache/tajo/rpc/DefaultRpcController.java | 2 +- .../apache/tajo/rpc/MonitorClientHandler.java | 101 +++++ .../apache/tajo/rpc/MonitorServerHandler.java | 73 ++++ .../org/apache/tajo/rpc/MonitorStateEvent.java | 49 +++ .../org/apache/tajo/rpc/NettyClientBase.java | 303 ++++++++++++-- .../tajo/rpc/ProtoChannelInitializer.java | 57 --- .../tajo/rpc/ProtoClientChannelInitializer.java | 63 +++ .../org/apache/tajo/rpc/ProtoDeclaration.java | 24 ++ .../tajo/rpc/ProtoServerChannelInitializer.java | 50 +++ .../apache/tajo/rpc/RecoverableException.java | 42 ++ .../org/apache/tajo/rpc/RpcClientManager.java | 123 ++++-- .../src/main/proto/TestProtocol.proto | 3 +- .../java/org/apache/tajo/rpc/TestAsyncRpc.java | 350 +++++++++++++---- .../org/apache/tajo/rpc/TestBlockingRpc.java | 392 +++++++++++++------ .../apache/tajo/rpc/TestRpcClientManager.java | 155 ++++++-- .../rpc/test/impl/DummyProtocolAsyncImpl.java | 21 +- .../test/impl/DummyProtocolBlockingImpl.java | 13 +- 40 files changed, 1882 insertions(+), 810 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e6b91c33/tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java ----------------------------------------------------------------------
