TAJO-1321: Cli prints wrong response time.

tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java

@@ -208,7 +208,6 @@ public void heartbeat(QueryInfo queryInfo) {
 
       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 void heartbeat(QueryInfo queryInfo) {
 
 
       if (isFinishState(this.queryInfo.getQueryState())) {
+        this.queryInfo.setFinishTime(System.currentTimeMillis());
         masterContext.getQueryJobManager().getEventHandler().handle(
             new QueryJobEvent(QueryJobEvent.Type.QUERY_JOB_STOP, this.queryInfo));
       }

tajo-core/src/main/java/org/apache/tajo/master/QueryManager.java

@@ -320,10 +320,6 @@ private QueryInfo makeQueryInfoFromHeartbeat(QueryCoordinatorProtocol.TajoHeartb
     queryInfo.setQueryState(queryHeartbeat.getState());
     queryInfo.setProgress(queryHeartbeat.getQueryProgress());
 
-    if (queryHeartbeat.hasQueryFinishTime()) {
-      queryInfo.setFinishTime(queryHeartbeat.getQueryFinishTime());
-    }
-
     if (queryHeartbeat.hasResultDesc()) {
       queryInfo.setResultDesc(new TableDesc(queryHeartbeat.getResultDesc()));
     }

tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java

@@ -393,9 +393,7 @@ public GetQueryListResponse getRunningQueryList(RpcController controller, GetQue
           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 GetQueryListResponse getFinishedQueryList(RpcController controller, GetQu
           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());

tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMaster.java

@@ -391,7 +391,6 @@ private TajoHeartbeat buildTajoHeartBeat(QueryMasterTask queryMasterTask) {
         builder.setResultDesc(queryMasterTask.getQuery().getResultDesc().getProto());
       }
       builder.setQueryProgress(queryMasterTask.getQuery().getProgress());
-      builder.setQueryFinishTime(queryMasterTask.getQuery().getFinishTime());
     }
     return builder.build();
   }

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 {