You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2016/12/21 18:50:15 UTC
lucene-solr:branch_6x: SOLR-9884: Add version to segments handler
output (cherry picked from commit d952952)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 9b4d0391f -> 813252969
SOLR-9884: Add version to segments handler output
(cherry picked from commit d952952)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/81325296
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/81325296
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/81325296
Branch: refs/heads/branch_6x
Commit: 81325296977abfebe0159f6a6f15a8739c909ff3
Parents: 9b4d039
Author: Erick Erickson <er...@apache.org>
Authored: Wed Dec 21 10:41:27 2016 -0800
Committer: Erick Erickson <er...@apache.org>
Committed: Wed Dec 21 10:43:31 2016 -0800
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../handler/admin/SegmentsInfoRequestHandler.java | 1 +
.../admin/SegmentsInfoRequestHandlerTest.java | 17 +++++++++++++++--
3 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/81325296/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d2cb56c..576b6f1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -119,6 +119,8 @@ New Features
* SOLR-9860: Enable configuring invariantParams via HttpSolrClient.Builder (Hrishikesh Gadre, Ishan Chattopadhyaya)
+* SOLR-9884: Add version to segments handler output (Steven Bower via Erick Erickson)
+
Optimizations
----------------------
* SOLR-9704: Facet Module / JSON Facet API: Optimize blockChildren facets that have
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/81325296/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java
index ee2cf5e..df1bbd8 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java
@@ -84,6 +84,7 @@ public class SegmentsInfoRequestHandler extends RequestHandlerBase {
segmentInfoMap.add("age", new Date(timestamp));
segmentInfoMap.add("source",
segmentCommitInfo.info.getDiagnostics().get("source"));
+ segmentInfoMap.add("version", segmentCommitInfo.info.getVersion().toString());
return segmentInfoMap;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/81325296/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
index 50333a2..885e419 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.handler.admin;
+import org.apache.lucene.util.Version;
import org.apache.solr.util.AbstractSolrTestCase;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -32,6 +33,7 @@ public class SegmentsInfoRequestHandlerTest extends AbstractSolrTestCase {
@BeforeClass
public static void beforeClass() throws Exception {
System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.tests.useMergePolicy", "false");
initCore("solrconfig.xml", "schema12.xml");
}
@@ -44,6 +46,10 @@ public class SegmentsInfoRequestHandlerTest extends AbstractSolrTestCase {
assertU(delI("SOLR100" + i));
}
assertU(commit());
+ for (int i = 0; i < DOC_COUNT; i++) {
+ assertU(adoc("id","SOLR200" + i, "name","Apache Solr:" + i));
+ }
+ assertU(commit());
}
@Test
@@ -52,14 +58,21 @@ public class SegmentsInfoRequestHandlerTest extends AbstractSolrTestCase {
req("qt","/admin/segments"),
"0<count(//lst[@name='segments']/lst)");
}
+
+ @Test
+ public void testSegmentInfosVersion() {
+ assertQ("No segments mentioned in result",
+ req("qt","/admin/segments"),
+ "2=count(//lst[@name='segments']/lst/str[@name='version'][.='"+Version.LATEST+"'])");
+ }
@Test
public void testSegmentInfosData() {
assertQ("No segments mentioned in result",
req("qt","/admin/segments"),
//#Document
- DOC_COUNT+"=sum(//lst[@name='segments']/lst[*]/int[@name='size'])",
+ (DOC_COUNT*2)+"=sum(//lst[@name='segments']/lst/int[@name='size'])",
//#Deletes
- DEL_COUNT+"=sum(//lst[@name='segments']/lst[*]/int[@name='delCount'])");
+ DEL_COUNT+"=sum(//lst[@name='segments']/lst/int[@name='delCount'])");
}
}