You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/01/08 17:10:52 UTC
git commit: TAJO-477: Rename killQuery of QMClientProtocol to
closeQuery.
Updated Branches:
refs/heads/master 3a2416766 -> 3c91fe06e
TAJO-477: Rename killQuery of QMClientProtocol to closeQuery.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/3c91fe06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/3c91fe06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/3c91fe06
Branch: refs/heads/master
Commit: 3c91fe06ee3bcf7284beabf332af1d747f758c94
Parents: 3a24167
Author: Hyunsik Choi <hy...@apache.org>
Authored: Thu Jan 9 01:06:28 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Thu Jan 9 01:06:28 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java | 2 +-
tajo-client/src/main/proto/QueryMasterClientProtocol.proto | 2 +-
.../main/java/org/apache/tajo/worker/TajoWorkerClientService.java | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3c91fe06/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 410ce47..d63248f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -207,6 +207,8 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-477: Rename killQuery of QMClientProtocol to closeQuery. (hyunsik)
+
TAJO-484: Fix bug [: !=: unary operator expected when execute start-tajo.sh.
(DaeMyung Kang via jihoon)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3c91fe06/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java b/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
index 1e7d169..70b4c53 100644
--- a/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
+++ b/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
@@ -105,7 +105,7 @@ public class TajoClient {
try {
qmClient = connPool.getConnection(queryMasterMap.get(queryId), QueryMasterClientProtocol.class, false);
QueryMasterClientProtocolService.BlockingInterface queryMasterService = qmClient.getStub();
- queryMasterService.killQuery(null, queryId.getProto());
+ queryMasterService.closeQuery(null, queryId.getProto());
} catch (Exception e) {
LOG.warn("Fail to close a QueryMaster connection (qid=" + queryId + ", msg=" + e.getMessage() + ")", e);
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3c91fe06/tajo-client/src/main/proto/QueryMasterClientProtocol.proto
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/proto/QueryMasterClientProtocol.proto b/tajo-client/src/main/proto/QueryMasterClientProtocol.proto
index d20301f..9d96505 100644
--- a/tajo-client/src/main/proto/QueryMasterClientProtocol.proto
+++ b/tajo-client/src/main/proto/QueryMasterClientProtocol.proto
@@ -31,5 +31,5 @@ service QueryMasterClientProtocolService {
rpc updateSessionVariables(UpdateSessionVariableRequest) returns (BoolProto);
rpc getQueryResult(GetQueryResultRequest) returns (GetQueryResultResponse);
rpc getQueryStatus(GetQueryStatusRequest) returns (GetQueryStatusResponse);
- rpc killQuery(QueryIdProto) returns (BoolProto);
+ rpc closeQuery(QueryIdProto) returns (BoolProto);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3c91fe06/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorkerClientService.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorkerClientService.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorkerClientService.java
index 9bcdf3a..f6e7742 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorkerClientService.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/TajoWorkerClientService.java
@@ -196,7 +196,7 @@ public class TajoWorkerClientService extends AbstractService {
}
@Override
- public PrimitiveProtos.BoolProto killQuery (
+ public PrimitiveProtos.BoolProto closeQuery (
RpcController controller,
TajoIdProtos.QueryIdProto request) throws ServiceException {
final QueryId queryId = new QueryId(request);