Skip to content

Remove NO_MORE_DOCS assertion as Lucene 10 APIs changed #17721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Remove NO_MORE_DOCS assertion as Lucene 10 APIs changed #17721

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ab5b10
Remove NO_MORE_DOCS assertion as Lucene APIs changed
expani Mar 28, 2025
4d6126e
Spotless
expani Mar 28, 2025
7d02b34
Merge branch 'opensearch-project:main' into ssdv_nextord_17628
expani Mar 28, 2025
77a3dbf
Merge branch 'opensearch-project:main' into ssdv_nextord_17628
expani Mar 28, 2025
bc66a60
Adding assertions on docValueCount
expani Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions server/src/test/java/org/opensearch/index/fielddata/AbstractStringFieldDataTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
Expand Down Expand Up @@ -499,27 +498,26 @@ public void testGlobalOrdinals() throws Exception {
LeafOrdinalsFieldData afd = globalOrdinals.load(leaf);
SortedSetDocValues values = afd.getOrdinalsValues();
assertTrue(values.advanceExact(0));
assertEquals(2, values.docValueCount());
long ord = values.nextOrd();
assertThat(ord, equalTo(3L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("02"));
ord = values.nextOrd();
assertThat(ord, equalTo(5L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("04"));
ord = values.nextOrd();
assertThat(ord, equalTo((long) DocIdSetIterator.NO_MORE_DOCS));
assertFalse(values.advanceExact(1));
assertTrue(values.advanceExact(2));
assertEquals(1, values.docValueCount());
ord = values.nextOrd();
assertThat(ord, equalTo(4L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("03"));
ord = values.nextOrd();
assertThat(ord, equalTo((long) DocIdSetIterator.NO_MORE_DOCS));

// Second segment
leaf = topLevelReader.leaves().get(1);
afd = globalOrdinals.load(leaf);
values = afd.getOrdinalsValues();
assertTrue(values.advanceExact(0));
assertEquals(3, values.docValueCount());
ord = values.nextOrd();
assertThat(ord, equalTo(5L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("04"));
Expand All @@ -529,9 +527,8 @@ public void testGlobalOrdinals() throws Exception {
ord = values.nextOrd();
assertThat(ord, equalTo(7L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("06"));
ord = values.nextOrd();
assertThat(ord, equalTo((long) DocIdSetIterator.NO_MORE_DOCS));
assertTrue(values.advanceExact(1));
assertEquals(3, values.docValueCount());
ord = values.nextOrd();
assertThat(ord, equalTo(7L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("06"));
Expand All @@ -541,10 +538,9 @@ public void testGlobalOrdinals() throws Exception {
ord = values.nextOrd();
assertThat(ord, equalTo(9L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("08"));
ord = values.nextOrd();
assertThat(ord, equalTo((long) DocIdSetIterator.NO_MORE_DOCS));
assertFalse(values.advanceExact(2));
assertTrue(values.advanceExact(3));
assertEquals(3, values.docValueCount());
ord = values.nextOrd();
assertThat(ord, equalTo(9L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("08"));
Expand All @@ -554,14 +550,13 @@ public void testGlobalOrdinals() throws Exception {
ord = values.nextOrd();
assertThat(ord, equalTo(11L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("10"));
ord = values.nextOrd();
assertThat(ord, equalTo((long) DocIdSetIterator.NO_MORE_DOCS));

// Third segment
leaf = topLevelReader.leaves().get(2);
afd = globalOrdinals.load(leaf);
values = afd.getOrdinalsValues();
assertTrue(values.advanceExact(0));
assertEquals(3, values.docValueCount());
ord = values.nextOrd();
assertThat(ord, equalTo(0L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("!08"));
Expand All @@ -571,8 +566,6 @@ public void testGlobalOrdinals() throws Exception {
ord = values.nextOrd();
assertThat(ord, equalTo(2L));
assertThat(values.lookupOrd(ord).utf8ToString(), equalTo("!10"));
ord = values.nextOrd();
assertThat(ord, equalTo((long) DocIdSetIterator.NO_MORE_DOCS));
}

public void testTermsEnum() throws Exception {
Expand Down
Loading