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 59702200C4E for ; Thu, 6 Apr 2017 15:20:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5613F160B83; Thu, 6 Apr 2017 13:20:36 +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 A3C9C160B84 for ; Thu, 6 Apr 2017 15:20:35 +0200 (CEST) Received: (qmail 66998 invoked by uid 500); 6 Apr 2017 13:20:34 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 66921 invoked by uid 99); 6 Apr 2017 13:20:34 -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; Thu, 06 Apr 2017 13:20:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 670D0DFE5C; Thu, 6 Apr 2017 13:20:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ab@apache.org To: commits@lucene.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:jira/solr-9959: SOLR-9959 Fix a few bugs in conversion methods. Date: Thu, 6 Apr 2017 13:20:34 +0000 (UTC) archived-at: Thu, 06 Apr 2017 13:20:36 -0000 Repository: lucene-solr Updated Branches: refs/heads/jira/solr-9959 7c576a7ce -> a8d4e677c SOLR-9959 Fix a few bugs in conversion methods. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a8d4e677 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a8d4e677 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a8d4e677 Branch: refs/heads/jira/solr-9959 Commit: a8d4e677c21c193274162e005335361f402c24b8 Parents: 7c576a7 Author: Andrzej Bialecki Authored: Thu Apr 6 15:19:56 2017 +0200 Committer: Andrzej Bialecki Committed: Thu Apr 6 15:19:56 2017 +0200 ---------------------------------------------------------------------- solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a8d4e677/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java b/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java index 986d27f..2900857 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java +++ b/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java @@ -353,10 +353,10 @@ public class MetricUtils { consumer.accept(name + "." + MEAN, snapshot.getMean()); } else { Map response = new LinkedHashMap<>(); - consumer.accept(name, response); response.put("count", histogram.getCount()); // non-time based values addSnapshot(response, snapshot, false); + consumer.accept(name, response); } } @@ -397,7 +397,6 @@ public class MetricUtils { consumer.accept(name + ".meanRate", timer.getMeanRate()); } else { Map response = new LinkedHashMap<>(); - consumer.accept(name, response); response.put("count", timer.getCount()); response.put("meanRate", timer.getMeanRate()); response.put("1minRate", timer.getOneMinuteRate()); @@ -407,6 +406,7 @@ public class MetricUtils { // time-based values in nanoseconds addSnapshot(response, timer.getSnapshot(), true); } + consumer.accept(name, response); } }