Fix TestUninvertingReader (#2422)
Ensure docs don't get re-ordered by random MP
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.java b/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.java
index 9137ad3..bd02e80 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.java
@@ -37,6 +37,7 @@
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedSetDocValues;
@@ -50,12 +51,19 @@
import org.apache.solr.legacy.LegacyLongField;
import org.apache.solr.legacy.LegacyNumericUtils;
import org.apache.solr.uninverting.UninvertingReader.Type;
+import org.apache.solr.util.RandomMergePolicy;
public class TestUninvertingReader extends SolrTestCase {
+ private static IndexWriterConfig newIndexConfig() {
+ // don't allow random doc re-orders; this test isn't tolerant to that
+ final var allowMockMP = false;
+ return newIndexWriterConfig(null).setMergePolicy(new RandomMergePolicy(allowMockMP));
+ }
+
public void testSortedSetInteger() throws IOException {
Directory dir = newDirectory();
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(null));
+ IndexWriter iw = new IndexWriter(dir, newIndexConfig());
Document doc = new Document();
doc.add(new LegacyIntField("foo", 5, Field.Store.NO));
@@ -97,7 +105,7 @@
public void testSortedSetFloat() throws IOException {
Directory dir = newDirectory();
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(null));
+ IndexWriter iw = new IndexWriter(dir, newIndexConfig());
Document doc = new Document();
doc.add(new LegacyIntField("foo", Float.floatToRawIntBits(5f), Field.Store.NO));
@@ -140,7 +148,7 @@
public void testSortedSetLong() throws IOException {
Directory dir = newDirectory();
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(null));
+ IndexWriter iw = new IndexWriter(dir, newIndexConfig());
Document doc = new Document();
doc.add(new LegacyLongField("foo", 5, Field.Store.NO));
@@ -182,7 +190,7 @@
public void testSortedSetDouble() throws IOException {
Directory dir = newDirectory();
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(null));
+ IndexWriter iw = new IndexWriter(dir, newIndexConfig());
Document doc = new Document();
doc.add(new LegacyLongField("foo", Double.doubleToRawLongBits(5d), Field.Store.NO));
@@ -227,7 +235,7 @@
*/
public void testSortedSetIntegerManyValues() throws IOException {
final Directory dir = newDirectory();
- final IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(null));
+ final IndexWriter iw = new IndexWriter(dir, newIndexConfig());
final LegacyFieldType NO_TRIE_TYPE = new LegacyFieldType(LegacyIntField.TYPE_NOT_STORED);
NO_TRIE_TYPE.setNumericPrecisionStep(Integer.MAX_VALUE);
@@ -328,7 +336,7 @@
public void testSortedSetEmptyIndex() throws IOException {
final Directory dir = newDirectory();
- final IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(null));
+ final IndexWriter iw = new IndexWriter(dir, newIndexConfig());
iw.close();
final Map<String, Type> UNINVERT_MAP = new LinkedHashMap<>();
@@ -364,7 +372,7 @@
public void testFieldInfos() throws IOException {
Directory dir = newDirectory();
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(null));
+ IndexWriter iw = new IndexWriter(dir, newIndexConfig());
Document doc = new Document();
BytesRef idBytes = new BytesRef("id");
