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 2017/03/14 09:21:09 UTC
[31/32] lucene-solr:jira/solr-10247: SOLR-10247 Use "compact" boolean
param instead of already used "version".
SOLR-10247 Use "compact" boolean param instead of already used "version".
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/be807c95
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/be807c95
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/be807c95
Branch: refs/heads/jira/solr-10247
Commit: be807c95b25a508352deb74d03197f30309cb674
Parents: 29a38f1
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Mar 13 22:49:26 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Mar 13 22:49:26 2017 +0100
----------------------------------------------------------------------
.../solr/handler/admin/MetricsHandler.java | 7 ++-----
.../solr/handler/admin/MetricsHandlerTest.java | 22 ++++++++++++++++++--
2 files changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/be807c95/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
index d51c2b4..25f317c 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
@@ -50,9 +50,7 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionName
final CoreContainer container;
final SolrMetricManager metricManager;
- public static final String VERSION_PARAM = "version";
- public static final int VERSION_1 = 1;
- public static final int VERSION_2 = 2;
+ public static final String COMPACT_PARAM = "compact";
public MetricsHandler() {
this.container = null;
@@ -75,8 +73,7 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionName
throw new SolrException(SolrException.ErrorCode.INVALID_STATE, "Core container instance not initialized");
}
- int version = req.getParams().getInt(VERSION_PARAM, VERSION_1);
- boolean compact = version == VERSION_2;
+ boolean compact = req.getParams().getBool(COMPACT_PARAM, false);
MetricFilter mustMatchFilter = parseMustMatchFilter(req);
List<MetricType> metricTypes = parseMetricTypes(req);
List<MetricFilter> metricFilters = metricTypes.stream().map(MetricType::asMetricFilter).collect(Collectors.toList());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/be807c95/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
index a1b29db..0dcfbcd 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
@@ -47,8 +47,10 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
assertNotNull(values.get("solr.node"));
NamedList nl = (NamedList) values.get("solr.core.collection1");
assertNotNull(nl);
- assertNotNull(nl.get("SEARCHER.new.errors")); // counter type
- assertNotNull(((NamedList) nl.get("SEARCHER.new.errors")).get("count"));
+ Object o = nl.get("SEARCHER.new.errors");
+ assertNotNull(o); // counter type
+ assertTrue(o instanceof NamedList);
+ assertNotNull(((NamedList) o).get("count"));
assertEquals(0L, ((NamedList) nl.get("SEARCHER.new.errors")).get("count"));
nl = (NamedList) values.get("solr.node");
assertNotNull(nl.get("CONTAINER.cores.loaded")); // int gauge
@@ -146,4 +148,20 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
assertEquals(1, values.size());
assertEquals(0, ((NamedList)values.get("solr.node")).size());
}
+
+ @Test
+ public void testCompact() throws Exception {
+ MetricsHandler handler = new MetricsHandler(h.getCoreContainer());
+
+ SolrQueryResponse resp = new SolrQueryResponse();
+ handler.handleRequestBody(req(CommonParams.QT, "/admin/metrics", CommonParams.WT, "json", MetricsHandler.COMPACT_PARAM, "true"), resp);
+ NamedList values = resp.getValues();
+ assertNotNull(values.get("metrics"));
+ values = (NamedList) values.get("metrics");
+ NamedList nl = (NamedList) values.get("solr.core.collection1");
+ assertNotNull(nl);
+ Object o = nl.get("SEARCHER.new.errors");
+ assertNotNull(o); // counter type
+ assertTrue(o instanceof Number);
+ }
}