This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch ishan/upgrade-to-lucene-10
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/ishan/upgrade-to-lucene-10 by
this push:
new a6ede2492e3 Fixing SortedSetDocValues.NO_MORE_ORDS removal issue,
fixed SolrIndexConfigTest
a6ede2492e3 is described below
commit a6ede2492e36a37c38fce4667f53fffe805fd6c5
Author: Ishan Chattopadhyaya <[email protected]>
AuthorDate: Wed Jan 22 22:30:15 2025 +0530
Fixing SortedSetDocValues.NO_MORE_ORDS removal issue, fixed
SolrIndexConfigTest
---
.../org/apache/solr/request/DocValuesFacets.java | 7 ++++---
.../org/apache/solr/request/DocValuesStats.java | 4 +++-
.../org/apache/solr/request/IntervalFacets.java | 3 ++-
.../apache/solr/search/SolrDocumentFetcher.java | 5 ++---
.../org/apache/solr/search/SolrIndexSearcher.java | 1 +
.../java/org/apache/solr/search/facet/AvgAgg.java | 3 ++-
.../org/apache/solr/search/facet/CountValsAgg.java | 3 ++-
.../org/apache/solr/search/facet/DocValuesAcc.java | 3 ++-
.../org/apache/solr/search/facet/MinMaxAgg.java | 3 ++-
.../apache/solr/search/facet/PercentileAgg.java | 3 ++-
.../java/org/apache/solr/search/facet/SumAgg.java | 3 ++-
.../org/apache/solr/search/facet/SumsqAgg.java | 3 ++-
.../solr/search/join/GraphEdgeCollector.java | 3 ++-
.../join/MultiValueTermOrdinalCollector.java | 5 +++--
.../org/apache/solr/uninverting/DocTermOrds.java | 2 +-
.../solr/collection1/conf/schema_codec.xml | 2 +-
.../apache/solr/cloud/DocValuesNotIndexedTest.java | 1 +
.../org/apache/solr/core/TestCodecSupport.java | 3 ++-
.../org/apache/solr/schema/DocValuesMultiTest.java | 5 ++---
.../apache/solr/uninverting/TestDocTermOrds.java | 23 +++++++++++-----------
.../apache/solr/uninverting/TestFieldCache.java | 8 ++------
.../uninverting/TestFieldCacheVsDocValues.java | 2 +-
.../solr/uninverting/TestUninvertingReader.java | 16 +++++++--------
.../apache/solr/update/SolrIndexConfigTest.java | 2 +-
24 files changed, 62 insertions(+), 51 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java
b/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java
index b76bca4a3a1..b1d3d82f57e 100644
--- a/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java
@@ -448,10 +448,11 @@ public class DocValuesFacets {
int doc;
while ((doc = disi.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
if (si.advanceExact(doc)) {
- int term = (int) si.nextOrd();
- do {
+ for (int o=0; o<si.docValueCount(); o++) {
+ long ord = si.nextOrd();
+ int term = (int) ord;
segCounts[1 + term]++;
- } while ((term = (int) si.nextOrd()) >= 0);
+ }
} else {
counts[0]++; // missing
}
diff --git a/solr/core/src/java/org/apache/solr/request/DocValuesStats.java
b/solr/core/src/java/org/apache/solr/request/DocValuesStats.java
index 7524f4b48df..4e89265a9ef 100644
--- a/solr/core/src/java/org/apache/solr/request/DocValuesStats.java
+++ b/solr/core/src/java/org/apache/solr/request/DocValuesStats.java
@@ -222,7 +222,9 @@ public class DocValuesStats {
}
if (doc == si.docID()) {
long ord;
- while ((ord = si.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ //while ((ord = si.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<si.docValueCount(); o++) {
+ ord = si.nextOrd();
int term = (int) ord;
if (map != null) {
term = (int) ordMap.get(term);
diff --git a/solr/core/src/java/org/apache/solr/request/IntervalFacets.java
b/solr/core/src/java/org/apache/solr/request/IntervalFacets.java
index d4d1ef206f1..491b23efca5 100644
--- a/solr/core/src/java/org/apache/solr/request/IntervalFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/IntervalFacets.java
@@ -371,7 +371,8 @@ public class IntervalFacets implements
Iterable<FacetInterval> {
if (doc == ssdv.docID()) {
long currOrd;
int currentInterval = 0;
- while ((currOrd = ssdv.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<ssdv.docValueCount(); o++) {
+ currOrd = ssdv.nextOrd();
boolean evaluateNextInterval = true;
while (evaluateNextInterval && currentInterval < intervals.length) {
IntervalCompareResult result =
intervals[currentInterval].includes(currOrd);
diff --git a/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
b/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
index 591197d8381..cdf56855f4a 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrDocumentFetcher.java
@@ -678,9 +678,8 @@ public class SolrDocumentFetcher {
final SortedSetDocValues values = e.getSortedSetDocValues(localId,
leafReader, readerOrd);
if (values != null) {
final List<Object> outValues = new ArrayList<>();
- for (long ord = values.nextOrd();
- ord != SortedSetDocValues.NO_MORE_DOCS;
- ord = values.nextOrd()) {
+ for (int o=0; o<values.docValueCount(); o++) {
+ long ord = values.nextOrd();
BytesRef value = values.lookupOrd(ord);
outValues.add(e.schemaField.getType().toObject(e.schemaField,
value));
}
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index b78085e2cd5..c337a12eb9c 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -316,6 +316,7 @@ public class SolrIndexSearcher extends IndexSearcher
implements Closeable, SolrI
}
try {
+ log.info("Offending query: " + query);
super.search(query, collector);
} catch (ExitableDirectoryReader.ExitingReaderException
| CancellableCollector.QueryCancelledException x) {
diff --git a/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java
b/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java
index d58bd3f477c..27a6da09c46 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java
@@ -152,7 +152,8 @@ public class AvgAgg extends SimpleAggValueSource {
@Override
protected void collectValues(int doc, int slot) throws IOException {
long ord;
- while ((ord = values.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<values.docValueCount(); o++) {
+ ord = values.nextOrd();
BytesRef term = values.lookupOrd(ord);
Object obj = sf.getType().toObject(sf, term);
double val = obj instanceof Date ? ((Date) obj).getTime() : ((Number)
obj).doubleValue();
diff --git a/solr/core/src/java/org/apache/solr/search/facet/CountValsAgg.java
b/solr/core/src/java/org/apache/solr/search/facet/CountValsAgg.java
index 807b4b2d839..2bd1eadfa36 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/CountValsAgg.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/CountValsAgg.java
@@ -102,7 +102,8 @@ public class CountValsAgg extends SimpleAggValueSource {
@Override
protected void collectValues(int doc, int slot) throws IOException {
- while (values.nextOrd() != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<values.docValueCount(); o++) {
+ values.nextOrd();
result[slot]++;
}
}
diff --git a/solr/core/src/java/org/apache/solr/search/facet/DocValuesAcc.java
b/solr/core/src/java/org/apache/solr/search/facet/DocValuesAcc.java
index 7f4eca64ca4..922690f16a4 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/DocValuesAcc.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/DocValuesAcc.java
@@ -376,7 +376,8 @@ public abstract class DocValuesAcc extends SlotAcc {
@Override
protected void collectValues(int doc, int slot) throws IOException {
long ord;
- while ((ord = values.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<values.docValueCount(); o++) {
+ ord = values.nextOrd();
BytesRef term = values.lookupOrd(ord);
Object obj = sf.getType().toObject(sf, term);
double val = obj instanceof Date ? ((Date) obj).getTime() : ((Number)
obj).doubleValue();
diff --git a/solr/core/src/java/org/apache/solr/search/facet/MinMaxAgg.java
b/solr/core/src/java/org/apache/solr/search/facet/MinMaxAgg.java
index 72b53ae7d23..487f9aad9bf 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/MinMaxAgg.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/MinMaxAgg.java
@@ -540,7 +540,8 @@ public class MinMaxAgg extends SimpleAggValueSource {
newOrd = subDv.nextOrd();
} else { // max
long ord;
- while ((ord = subDv.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<subDv.docValueCount(); o++) {
+ ord = subDv.nextOrd();
newOrd = ord;
}
}
diff --git a/solr/core/src/java/org/apache/solr/search/facet/PercentileAgg.java
b/solr/core/src/java/org/apache/solr/search/facet/PercentileAgg.java
index cea2c801d38..de9416a68f0 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/PercentileAgg.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/PercentileAgg.java
@@ -355,7 +355,8 @@ public class PercentileAgg extends SimpleAggValueSource {
digests[slot] = digest = new AVLTreeDigest(100);
}
long ord;
- while ((ord = values.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<values.docValueCount(); o++) {
+ ord = values.nextOrd();
BytesRef term = values.lookupOrd(ord);
Object obj = sf.getType().toObject(sf, term);
double val = obj instanceof Date ? ((Date) obj).getTime() : ((Number)
obj).doubleValue();
diff --git a/solr/core/src/java/org/apache/solr/search/facet/SumAgg.java
b/solr/core/src/java/org/apache/solr/search/facet/SumAgg.java
index f7f9dbff286..cec75e6e372 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/SumAgg.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/SumAgg.java
@@ -107,7 +107,8 @@ public class SumAgg extends SimpleAggValueSource {
@Override
protected void collectValues(int doc, int slot) throws IOException {
long ord;
- while ((ord = values.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<values.docValueCount(); o++) {
+ ord = values.nextOrd();
BytesRef term = values.lookupOrd(ord);
Object obj = sf.getType().toObject(sf, term);
double val = obj instanceof Date ? ((Date) obj).getTime() : ((Number)
obj).doubleValue();
diff --git a/solr/core/src/java/org/apache/solr/search/facet/SumsqAgg.java
b/solr/core/src/java/org/apache/solr/search/facet/SumsqAgg.java
index bdc6d3d1efa..15b03abd7c8 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/SumsqAgg.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/SumsqAgg.java
@@ -94,7 +94,8 @@ public class SumsqAgg extends SimpleAggValueSource {
@Override
protected void collectValues(int doc, int slot) throws IOException {
long ord;
- while ((ord = values.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<values.docValueCount(); o++) {
+ ord = values.nextOrd();
BytesRef term = values.lookupOrd(ord);
Object obj = sf.getType().toObject(sf, term);
double val = obj instanceof Date ? ((Date) obj).getTime() : ((Number)
obj).doubleValue();
diff --git
a/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
b/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
index 49fc19fdc8e..a1f14bec9bd 100644
--- a/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
+++ b/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
@@ -147,7 +147,8 @@ abstract class GraphEdgeCollector extends SimpleCollector
implements Collector {
if (doc == docTermOrds.docID()) {
BytesRef edgeValue = new BytesRef();
long ord;
- while ((ord = docTermOrds.nextOrd()) !=
SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<docTermOrds.docValueCount(); o++) {
+ ord = docTermOrds.nextOrd();
edgeValue = docTermOrds.lookupOrd(ord);
// add the edge id to the collector terms.
collectorTerms.add(edgeValue);
diff --git
a/solr/core/src/java/org/apache/solr/search/join/MultiValueTermOrdinalCollector.java
b/solr/core/src/java/org/apache/solr/search/join/MultiValueTermOrdinalCollector.java
index 60ebb4ca786..ea2ffcc7309 100644
---
a/solr/core/src/java/org/apache/solr/search/join/MultiValueTermOrdinalCollector.java
+++
b/solr/core/src/java/org/apache/solr/search/join/MultiValueTermOrdinalCollector.java
@@ -55,8 +55,9 @@ public class MultiValueTermOrdinalCollector extends
SimpleCollector {
final int globalDoc = docBase + doc;
if (topLevelDocValues.advanceExact(globalDoc)) {
- long ord = SortedSetDocValues.NO_MORE_DOCS;
- while ((ord = topLevelDocValues.nextOrd()) !=
SortedSetDocValues.NO_MORE_DOCS) {
+ long ord;
+ for (int o=0; o<topLevelDocValues.docValueCount(); o++) {
+ ord = topLevelDocValues.nextOrd();
topLevelDocValuesBitSet.set(ord);
}
}
diff --git a/solr/core/src/java/org/apache/solr/uninverting/DocTermOrds.java
b/solr/core/src/java/org/apache/solr/uninverting/DocTermOrds.java
index 6574fde07d6..4d2c02fef8f 100644
--- a/solr/core/src/java/org/apache/solr/uninverting/DocTermOrds.java
+++ b/solr/core/src/java/org/apache/solr/uninverting/DocTermOrds.java
@@ -919,7 +919,7 @@ public class DocTermOrds implements Accountable {
return d;
}
}
- return doc = NO_MORE_DOCS;
+ return doc = -1; // nocommit is this the right fix?
}
@Override
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
index 5095c0c01ac..a23f5fbc285 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
@@ -20,7 +20,7 @@
as a way to vet that the configuration actually matters.
-->
<fieldType name="string_direct" class="solr.StrField"
postingsFormat="Direct" docValuesFormat="Asserting" />
- <fieldType name="string_standard" class="solr.StrField"
postingsFormat="Lucene912"/>
+ <fieldType name="string_standard" class="solr.StrField"
postingsFormat="Lucene101"/>
<fieldType name="string_disk" class="solr.StrField" />
diff --git
a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
index 5937ed75cfd..c65da110ec7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
@@ -478,6 +478,7 @@ public class DocValuesNotIndexedTest extends
SolrCloudTestCase {
fieldAttributes.put("indexed", "false");
fieldAttributes.put("multiValued", multi ? "true" : "false");
fieldAttributes.put("docValues", "true");
+ fieldAttributes.put("useDocValuesAsStored", "true");
updateList.add(new AddField(fieldAttributes));
}
}
diff --git a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
index 811efc3a791..780bd3c676e 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
@@ -25,6 +25,7 @@ import java.util.Set;
//TBD which codec to fall back to
import org.apache.lucene.backward_codecs.lucene90.Lucene90Codec;
import org.apache.lucene.codecs.Codec;
+import org.apache.lucene.codecs.lucene101.Lucene101Codec;
import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
import org.apache.lucene.index.SegmentInfo;
@@ -227,7 +228,7 @@ public class TestCodecSupport extends SolrTestCaseJ4 {
assertEquals(
"Default Solr compression mode changed. Is this expected?",
SchemaCodecFactory.SOLR_DEFAULT_COMPRESSION_MODE,
- Lucene90Codec.Mode.valueOf("BEST_SPEED"));
+ Lucene101Codec.Mode.valueOf("BEST_SPEED"));
String previousCoreName = h.coreName;
String newCoreName = "core_with_default_compression";
diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java
b/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java
index 87f0469a95a..c6cb0bf6d59 100644
--- a/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java
@@ -96,14 +96,13 @@ public class DocValuesMultiTest extends SolrTestCaseJ4 {
assertEquals(0, dv.nextDoc());
assertEquals(0, dv.nextOrd());
assertEquals(1, dv.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, dv.nextOrd());
+ assertEquals(2, dv.docValueCount());
dv = reader.getSortedSetDocValues("booldv");
assertEquals(0, dv.nextDoc());
assertEquals(0, dv.nextOrd());
assertEquals(1, dv.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, dv.nextOrd());
-
+ assertEquals(2, dv.docValueCount());
} finally {
searcherRef.decref();
}
diff --git
a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
index 92e80b87a35..c7f5d955965 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
@@ -123,18 +123,18 @@ public class TestDocTermOrds extends SolrTestCase {
assertEquals(0, iter.nextOrd());
assertEquals(1, iter.nextOrd());
assertEquals(2, iter.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, iter.nextOrd());
+ assertEquals(3, iter.docValueCount());
assertEquals(1, iter.nextDoc());
assertEquals(3, iter.nextOrd());
assertEquals(4, iter.nextOrd());
assertEquals(5, iter.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, iter.nextOrd());
+ assertEquals(3, iter.docValueCount());
assertEquals(2, iter.nextDoc());
assertEquals(0, iter.nextOrd());
assertEquals(5, iter.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, iter.nextOrd());
+ assertEquals(2, iter.docValueCount());
r.close();
dir.close();
@@ -439,7 +439,8 @@ public class TestDocTermOrds extends SolrTestCase {
final int[] answers = idToOrds[(int) docIDToID.longValue()];
int upto = 0;
long ord;
- while ((ord = iter.nextOrd()) != SortedSetDocValues.NO_MORE_DOCS) {
+ for (int o=0; o<iter.docValueCount(); o++) {
+ ord = iter.nextOrd();
te.seekExact(ord);
final BytesRef expected = termsArray[answers[upto++]];
if (VERBOSE) {
@@ -517,12 +518,12 @@ public class TestDocTermOrds extends SolrTestCase {
assertEquals(0, v.nextDoc());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(1, v.docValueCount());
assertEquals(1, v.nextDoc());
assertEquals(0, v.nextOrd());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(2, v.getValueCount());
BytesRef value = v.lookupOrd(0);
assertEquals(-3, LegacyNumericUtils.prefixCodedToInt(value));
@@ -559,12 +560,12 @@ public class TestDocTermOrds extends SolrTestCase {
assertEquals(0, v.nextDoc());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(1, v.docValueCount());
assertEquals(1, v.nextDoc());
assertEquals(0, v.nextOrd());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(2, v.docValueCount());
BytesRef value = v.lookupOrd(0);
assertEquals(-3, LegacyNumericUtils.prefixCodedToLong(value));
@@ -694,15 +695,15 @@ public class TestDocTermOrds extends SolrTestCase {
assertEquals(0, v.nextDoc());
assertEquals(0, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(1, v.docValueCount());
assertEquals(1, v.nextDoc());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(1, v.docValueCount());
assertEquals(3, v.nextDoc());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(1, v.docValueCount());
BytesRef value = v.lookupOrd(0);
assertEquals("bar", value.utf8ToString());
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java
b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java
index de97436c38e..c0d7985955f 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCache.java
@@ -281,13 +281,10 @@ public class TestFieldCache extends SolrTestCase {
assertEquals(i, termOrds.nextDoc());
}
long ord = termOrds.nextOrd();
- assertNotEquals(ord, SortedSetDocValues.NO_MORE_DOCS);
BytesRef scratch = termOrds.lookupOrd(ord);
assertEquals(v, scratch);
}
- if (i == termOrds.docID()) {
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, termOrds.nextOrd());
- }
+ assertEquals(i, termOrds.docValueCount());
}
// test bad field
@@ -501,7 +498,7 @@ public class TestFieldCache extends SolrTestCase {
SortedSetDocValues sortedSet = FieldCache.DEFAULT.getDocTermOrds(ar,
"sorted", null);
assertEquals(0, sortedSet.nextDoc());
assertEquals(0, sortedSet.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, sortedSet.nextOrd());
+ assertEquals(1, sortedSet.docValueCount());
assertEquals(1, sortedSet.getValueCount());
bits = FieldCache.DEFAULT.getDocsWithField(ar, "sorted", null);
@@ -569,7 +566,6 @@ public class TestFieldCache extends SolrTestCase {
assertEquals(0, sortedSet.nextDoc());
assertEquals(0, sortedSet.nextOrd());
assertEquals(1, sortedSet.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, sortedSet.nextOrd());
assertEquals(2, sortedSet.getValueCount());
bits = FieldCache.DEFAULT.getDocsWithField(ar, "sortedset", null);
diff --git
a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
index 76a5992ea11..e135b9a6867 100644
---
a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
+++
b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
@@ -435,7 +435,7 @@ public class TestFieldCacheVsDocValues extends SolrTestCase
{
if (docID == NO_MORE_DOCS) {
break;
}
- long expectedOrd;
+ long expectedOrd; // nocommit fix
while ((expectedOrd = expected.nextOrd()) != NO_MORE_ORDS) {
assertEquals(expectedOrd, actual.nextOrd());
}
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 85290734443..2f02e74f601 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestUninvertingReader.java
@@ -86,12 +86,12 @@ public class TestUninvertingReader extends SolrTestCase {
assertEquals(0, v.nextDoc());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(1, v.docValueCount());
assertEquals(1, v.nextDoc());
assertEquals(0, v.nextOrd());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(2, v.getValueCount());
BytesRef value = v.lookupOrd(0);
assertEquals(-3, LegacyNumericUtils.prefixCodedToInt(value));
@@ -129,12 +129,12 @@ public class TestUninvertingReader extends SolrTestCase {
assertEquals(0, v.nextDoc());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(1, v.getValueCount());
assertEquals(1, v.nextDoc());
assertEquals(0, v.nextOrd());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(2, v.docValueCount());
BytesRef value = v.lookupOrd(0);
assertEquals(Float.floatToRawIntBits(-3f),
LegacyNumericUtils.prefixCodedToInt(value));
@@ -171,12 +171,12 @@ public class TestUninvertingReader extends SolrTestCase {
assertEquals(0, v.nextDoc());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(1, v.docValueCount());
assertEquals(1, v.nextDoc());
assertEquals(0, v.nextOrd());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(2, v.docValueCount());
BytesRef value = v.lookupOrd(0);
assertEquals(-3, LegacyNumericUtils.prefixCodedToLong(value));
@@ -213,12 +213,12 @@ public class TestUninvertingReader extends SolrTestCase {
assertEquals(0, v.nextDoc());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(1, v.docValueCount());
assertEquals(1, v.nextDoc());
assertEquals(0, v.nextOrd());
assertEquals(1, v.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_DOCS, v.nextOrd());
+ assertEquals(2, v.docValueCount());
BytesRef value = v.lookupOrd(0);
assertEquals(Double.doubleToRawLongBits(-3d),
LegacyNumericUtils.prefixCodedToLong(value));
diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
index 2a59bbb8312..845d7af4d60 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
@@ -115,7 +115,7 @@ public class SolrIndexConfigTest extends SolrTestCaseJ4 {
ConcurrentMergeScheduler ms = (ConcurrentMergeScheduler)
iwc.getMergeScheduler();
assertEquals("ms.maxMergeCount", 987, ms.getMaxMergeCount());
assertEquals("ms.maxThreadCount", 42, ms.getMaxThreadCount());
- assertTrue("ms.isAutoIOThrottle", ms.getAutoIOThrottle());
+ assertFalse("ms.isAutoIOThrottle", ms.getAutoIOThrottle());
}
@Test
