You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2016/11/29 17:39:55 UTC
lucene-solr:feature/metrics: SOLR-4735 Cleanup and fix lint errors.
Repository: lucene-solr
Updated Branches:
refs/heads/feature/metrics db1339ff6 -> f027098b4
SOLR-4735 Cleanup and fix lint errors.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f027098b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f027098b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f027098b
Branch: refs/heads/feature/metrics
Commit: f027098b4c0a27c70c7cb33dc80492a199bc44cf
Parents: db1339f
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Nov 29 18:38:51 2016 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Nov 29 18:38:51 2016 +0100
----------------------------------------------------------------------
.../org/apache/solr/metrics/SolrMetricManager.java | 13 -------------
.../apache/solr/metrics/reporters/SolrJmxReporter.java | 2 --
.../org/apache/solr/metrics/SolrMetricTestUtils.java | 2 --
.../solr/metrics/reporters/SolrJmxReporterTest.java | 4 ----
4 files changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f027098b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
index 872db18..c3b7956 100644
--- a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
+++ b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
@@ -24,9 +24,7 @@ import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.SharedMetricRegistries;
-import com.codahale.metrics.Snapshot;
import com.codahale.metrics.Timer;
-import org.apache.solr.common.util.NamedList;
/**
*
@@ -34,7 +32,6 @@ import org.apache.solr.common.util.NamedList;
public class SolrMetricManager {
public static final String REGISTRY_NAME_PREFIX = "solr";
- public static final String DEFAULT_REGISTRY = MetricRegistry.name(REGISTRY_NAME_PREFIX, "default");
// don't create instances of this class
private SolrMetricManager() { }
@@ -185,14 +182,4 @@ public class SolrMetricManager {
else
return MetricRegistry.name(REGISTRY_NAME_PREFIX, name);
}
-
- /**
- * Timers return measurements as a double representing nanos.
- * This converts that to a double representing millis.
- * @param ns Nanoseconds
- * @return Milliseconds
- */
- public static double nsToMs(double ns) {
- return ns / 1000000; // Using TimeUnit involves casting to Long, so don't bother.
- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f027098b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
index 1bedc56..97db12a 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
@@ -22,14 +22,12 @@ import javax.management.ObjectName;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import java.util.Hashtable;
import java.util.Locale;
import com.codahale.metrics.JmxReporter;
import com.codahale.metrics.ObjectNameFactory;
import org.apache.solr.core.PluginInfo;
import org.apache.solr.metrics.SolrMetricInfo;
-import org.apache.solr.metrics.SolrCoreMetricManager;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricReporter;
import org.apache.solr.util.JmxUtil;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f027098b/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java
index 7f69461..2c1c452 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java
@@ -25,8 +25,6 @@ import java.util.Map;
import java.util.Random;
import com.codahale.metrics.Counter;
-import com.codahale.metrics.Metric;
-import com.codahale.metrics.MetricRegistry;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoMBean;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f027098b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
index 23d15ed..b4b4c8c 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.metrics.reporters;
import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
@@ -28,8 +27,6 @@ import java.util.Random;
import java.util.Set;
import com.codahale.metrics.Counter;
-import com.codahale.metrics.Metric;
-import com.codahale.metrics.MetricRegistryListener;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CoreAdminParams;
@@ -37,7 +34,6 @@ import org.apache.solr.core.PluginInfo;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.metrics.SolrCoreMetricManager;
-import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricProducer;
import org.apache.solr.metrics.SolrMetricTestUtils;
import org.apache.solr.schema.FieldType;