From 545c86c2b9a90274f47ce17debc81bd22d8b2f6a Mon Sep 17 00:00:00 2001
From: sbower <sbower5@bloomberg.net>
Date: Wed, 21 Dec 2016 14:09:12 +0000
Subject: [PATCH] SOLR-9884 Adding version to segment handler

---
 .../admin/SegmentsInfoRequestHandler.java       |  1 +
 .../admin/SegmentsInfoRequestHandlerTest.java   | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

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 ee2cf5ea0e16..df1bbd8e9e69 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 @@ private SimpleOrderedMap<Object> getSegmentInfo(
     segmentInfoMap.add("age", new Date(timestamp));
     segmentInfoMap.add("source",
         segmentCommitInfo.info.getDiagnostics().get("source"));
+    segmentInfoMap.add("version", segmentCommitInfo.info.getVersion().toString());
 
     return segmentInfoMap;
   }
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 50333a21d2cd..885e4198c784 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 void before() throws Exception {
       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 void testSegmentInfos() {
         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'])");
   }
 }