Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 50B6C200B3C for ; Tue, 28 Jun 2016 00:00:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4F690160A62; Mon, 27 Jun 2016 22:00:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 973B7160A5B for ; Tue, 28 Jun 2016 00:00:43 +0200 (CEST) Received: (qmail 45874 invoked by uid 500); 27 Jun 2016 22:00:42 -0000 Mailing-List: contact commits-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list commits@asterixdb.apache.org Received: (qmail 45865 invoked by uid 99); 27 Jun 2016 22:00:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2016 22:00:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55F6FDFFF8; Mon, 27 Jun 2016 22:00:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: buyingyi@apache.org To: commits@asterixdb.apache.org Message-Id: <9d390803e7c94d18b64264f029f93807@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: asterixdb git commit: ASTERIXDB-1501: fix the reported executionTime and elapsedTime. Date: Mon, 27 Jun 2016 22:00:42 +0000 (UTC) archived-at: Mon, 27 Jun 2016 22:00:44 -0000 Repository: asterixdb Updated Branches: refs/heads/master fd4e1e510 -> 09a764458 ASTERIXDB-1501: fix the reported executionTime and elapsedTime. Change-Id: Ide5ba41e1b9fbbfdc1a9abf5a0971dfa17e980cf Reviewed-on: https://asterix-gerrit.ics.uci.edu/961 Reviewed-by: Jenkins Tested-by: Jenkins Reviewed-by: Michael Blow Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/09a76445 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/09a76445 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/09a76445 Branch: refs/heads/master Commit: 09a764458e5908e1b2e27ebfbc6c5fb0fd4c17d8 Parents: fd4e1e5 Author: Yingyi Bu Authored: Sun Jun 26 22:36:47 2016 -0700 Committer: Yingyi Bu Committed: Mon Jun 27 14:52:23 2016 -0700 ---------------------------------------------------------------------- .../org/apache/asterix/api/http/servlet/QueryServiceServlet.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/09a76445/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java index a080c83..c62389f 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java @@ -352,8 +352,7 @@ public class QueryServiceServlet extends HttpServlet { printStatus(resultWriter, ResultStatus.fatal); respCode = HttpServletResponse.SC_INTERNAL_SERVER_ERROR; } - printMetrics(resultWriter, (System.nanoTime() - elapsedStart) / 1000, (execEnd - execStart) / 1000, stats.count, - stats.size); + printMetrics(resultWriter, System.nanoTime() - elapsedStart, execEnd - execStart, stats.count, stats.size); resultWriter.print("}\n"); resultWriter.flush(); String result = stringWriter.toString();