You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/02/02 13:27:19 UTC
tajo git commit: TAJO-1321: Cli prints wrong response time. (jihoon)
Repository: tajo
Updated Branches:
refs/heads/master 1e007595d -> 58bbb1bb4
TAJO-1321: Cli prints wrong response time. (jihoon)
Closes #369
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/58bbb1bb
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/58bbb1bb
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/58bbb1bb
Branch: refs/heads/master
Commit: 58bbb1bb424288fdb3e731374de9938911d8e0f3
Parents: 1e00759
Author: Jihoon Son <ji...@apache.org>
Authored: Mon Feb 2 21:26:40 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Mon Feb 2 21:27:01 2015 +0900
----------------------------------------------------------------------
CHANGES | 2 ++
.../main/java/org/apache/tajo/master/QueryInProgress.java | 2 +-
.../src/main/java/org/apache/tajo/master/QueryManager.java | 4 ----
.../java/org/apache/tajo/master/TajoMasterClientService.java | 8 ++------
.../main/java/org/apache/tajo/querymaster/QueryMaster.java | 1 -
tajo-core/src/main/proto/QueryCoordinatorProtocol.proto | 1 -
6 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/58bbb1bb/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 666ee9a..3667991 100644
--- a/CHANGES
+++ b/CHANGES
@@ -174,6 +174,8 @@ Release 0.10.0 - unreleased
BUG FIXES
+ TAJO-1321: Cli prints wrong response time. (jihoon)
+
TAJO-1313: Tajo-dump creates DDLs for information_schema tables.
(jihun)
http://git-wip-us.apache.org/repos/asf/tajo/blob/58bbb1bb/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java b/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java
index e7371dd..45bdc5a 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java
@@ -208,7 +208,6 @@ public class QueryInProgress {
this.queryInfo.setQueryState(queryInfo.getQueryState());
this.queryInfo.setProgress(queryInfo.getProgress());
- this.queryInfo.setFinishTime(queryInfo.getFinishTime());
// Update diagnosis message
if (queryInfo.getLastMessage() != null && !queryInfo.getLastMessage().isEmpty()) {
@@ -223,6 +222,7 @@ public class QueryInProgress {
if (isFinishState(this.queryInfo.getQueryState())) {
+ this.queryInfo.setFinishTime(System.currentTimeMillis());
masterContext.getQueryJobManager().getEventHandler().handle(
new QueryJobEvent(QueryJobEvent.Type.QUERY_JOB_STOP, this.queryInfo));
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/58bbb1bb/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java b/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java
index bc6f07b..db895ef 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java
@@ -320,10 +320,6 @@ public class QueryManager extends CompositeService {
queryInfo.setQueryState(queryHeartbeat.getState());
queryInfo.setProgress(queryHeartbeat.getQueryProgress());
- if (queryHeartbeat.hasQueryFinishTime()) {
- queryInfo.setFinishTime(queryHeartbeat.getQueryFinishTime());
- }
-
if (queryHeartbeat.hasResultDesc()) {
queryInfo.setResultDesc(new TableDesc(queryHeartbeat.getResultDesc()));
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/58bbb1bb/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java b/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
index 16e4fea..6af3248 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
@@ -393,9 +393,7 @@ public class TajoMasterClientService extends AbstractService {
infoBuilder.setState(queryInfo.getQueryState());
infoBuilder.setQuery(queryInfo.getSql());
infoBuilder.setStartTime(queryInfo.getStartTime());
- long endTime = (queryInfo.getFinishTime() == 0) ?
- System.currentTimeMillis() : queryInfo.getFinishTime();
- infoBuilder.setFinishTime(endTime);
+ infoBuilder.setFinishTime(System.currentTimeMillis());
infoBuilder.setProgress(queryInfo.getProgress());
infoBuilder.setQueryMasterPort(queryInfo.getQueryMasterPort());
infoBuilder.setQueryMasterHost(queryInfo.getQueryMasterHost());
@@ -428,9 +426,7 @@ public class TajoMasterClientService extends AbstractService {
infoBuilder.setState(queryInfo.getQueryState());
infoBuilder.setQuery(queryInfo.getSql());
infoBuilder.setStartTime(queryInfo.getStartTime());
- long endTime = (queryInfo.getFinishTime() == 0) ?
- System.currentTimeMillis() : queryInfo.getFinishTime();
- infoBuilder.setFinishTime(endTime);
+ infoBuilder.setFinishTime(queryInfo.getFinishTime());
infoBuilder.setProgress(queryInfo.getProgress());
infoBuilder.setQueryMasterPort(queryInfo.getQueryMasterPort());
infoBuilder.setQueryMasterHost(queryInfo.getQueryMasterHost());
http://git-wip-us.apache.org/repos/asf/tajo/blob/58bbb1bb/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMaster.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMaster.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMaster.java
index a30df54..234a46a 100644
--- a/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMaster.java
+++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMaster.java
@@ -391,7 +391,6 @@ public class QueryMaster extends CompositeService implements EventHandler {
builder.setResultDesc(queryMasterTask.getQuery().getResultDesc().getProto());
}
builder.setQueryProgress(queryMasterTask.getQuery().getProgress());
- builder.setQueryFinishTime(queryMasterTask.getQuery().getFinishTime());
}
return builder.build();
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/58bbb1bb/tajo-core/src/main/proto/QueryCoordinatorProtocol.proto
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/proto/QueryCoordinatorProtocol.proto b/tajo-core/src/main/proto/QueryCoordinatorProtocol.proto
index 41a382f..cef385e 100644
--- a/tajo-core/src/main/proto/QueryCoordinatorProtocol.proto
+++ b/tajo-core/src/main/proto/QueryCoordinatorProtocol.proto
@@ -69,7 +69,6 @@ message TajoHeartbeat {
optional TableDescProto resultDesc = 4;
optional string statusMessage = 5;
optional float queryProgress = 6;
- optional int64 queryFinishTime = 7;
}
message TajoHeartbeatResponse {