You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/01/17 21:50:27 UTC
[2/2] lucene-solr:branch_6x: SOLR-9976: Fix init bug in
SegmentsInfoRequestHandlerTest
SOLR-9976: Fix init bug in SegmentsInfoRequestHandlerTest
(cherry picked from commit 39eec660ca79b62947321390e07e83d84be419e5)
manually resolved conflicts:
solr/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/47141736
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/47141736
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/47141736
Branch: refs/heads/branch_6x
Commit: 4714173611deac077ee5f4d78ab0d7cc0692a4bd
Parents: c76b394
Author: Chris Hostetter <ho...@apache.org>
Authored: Tue Jan 17 14:42:41 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Tue Jan 17 14:48:26 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../admin/SegmentsInfoRequestHandlerTest.java | 20 +++++++++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47141736/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0a49963..333f553 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -49,6 +49,8 @@ Optimizations
Bug Fixes
----------------------
+* SOLR-9976: Fix init bug in SegmentsInfoRequestHandlerTest (hossman)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47141736/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 885e419..1355e56 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,9 +16,11 @@
*/
package org.apache.solr.handler.admin;
+import org.apache.lucene.index.LogDocMergePolicy;
import org.apache.lucene.util.Version;
+import org.apache.solr.index.LogDocMergePolicyFactory;
import org.apache.solr.util.AbstractSolrTestCase;
-import org.junit.Before;
+
import org.junit.BeforeClass;
import org.junit.Test;
@@ -32,13 +34,17 @@ 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");
- }
- @Before
- public void before() throws Exception {
+ // we need a consistent segmentation to ensure we don't get a random
+ // merge that reduces the total num docs in all segments, or the number of deletes
+ //
+ systemSetPropertySolrTestsMergePolicy(LogDocMergePolicy.class.getName());
+ systemSetPropertySolrTestsMergePolicyFactory(LogDocMergePolicyFactory.class.getName());
+
+ System.setProperty("enable.update.log", "false"); // no _version_ in our schema
+ initCore("solrconfig.xml", "schema12.xml"); // segments API shouldn't depend on _version_ or ulog
+
+ // build up an index with at least 2 segments and some deletes
for (int i = 0; i < DOC_COUNT; i++) {
assertU(adoc("id","SOLR100" + i, "name","Apache Solr:" + i));
}