[asterixdb] branch master updated: [NO ISSUE][FUN] Return elapsedTime in Seconds

[mh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mhubail pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d79413  [NO ISSUE][FUN] Return elapsedTime in Seconds
6d79413 is described below

commit 6d794137af54d533323ea07f24158484b37b0d51
Author: Murtadha Hubail <mh...@apache.org>
AuthorDate: Thu Apr 18 02:08:42 2019 +0300

    [NO ISSUE][FUN] Return elapsedTime in Seconds
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Details:
    - Return elapsedTime as a double in seconds in
      active/completed_requests functions' response
      rather than a string in milliseconds.
    
    Change-Id: I412101ea43c1cbe13b15ed3ebb246af3c52e7b17
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/3348
    Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Till Westmann <ti...@apache.org>
    Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
 .../main/java/org/apache/asterix/translator/BaseClientRequest.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/BaseClientRequest.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/BaseClientRequest.java
index 51971a5..eaca53b 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/BaseClientRequest.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/BaseClientRequest.java
@@ -97,7 +97,7 @@ public abstract class BaseClientRequest implements IClientRequest {
         ObjectNode json = JSONUtil.createObject();
         json.put("uuid", requestReference.getUuid());
         json.put("requestTime", new ADateTime(requestReference.getTime()).toSimpleString());
-        json.put("elapsedTime", getElapsedTime());
+        json.put("elapsedTime", getElapsedTimeInSecs());
         json.put("node", requestReference.getNode());
         json.put("state", state.getLabel());
         json.put("userAgent", ((RequestReference) requestReference).getUserAgent());
@@ -106,11 +106,10 @@ public abstract class BaseClientRequest implements IClientRequest {
         return json;
     }
 
-    private String getElapsedTime() {
+    private double getElapsedTimeInSecs() {
         // this is just an estimation as the request might have been received on a node with a different system time
-        // TODO add dynamic time unit
         long runningTime = completionTime > 0 ? completionTime : System.currentTimeMillis();
-        return runningTime - requestReference.getTime() + "ms";
+        return (runningTime - requestReference.getTime()) / 1000d;
     }
 
     protected abstract void doCancel(ICcApplicationContext appCtx) throws HyracksDataException;