Fix MissingValues ordinal traversal and MultiOrdinalsTests tests

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Dec 19, 2024 · b780ac5 · b780ac5
1 parent df31192
commit b780ac5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/MissingValues.java b/server/src/main/java/org/opensearch/search/aggregations/support/MissingValues.java
@@ -368,6 +368,8 @@ public long nextOrd() throws IOException {
                     final long ord = values.nextOrd();
                     if (ord < insertedOrd) {
                         return ord;
+                    } else if (ord == SortedSetDocValues.NO_MORE_DOCS /* no more docs */) {
+                        return SortedSetDocValues.NO_MORE_DOCS;
                     } else {
                         return ord + 1;
                     }

diff --git a/server/src/test/java/org/opensearch/index/fielddata/ordinals/MultiOrdinalsTests.java b/server/src/test/java/org/opensearch/index/fielddata/ordinals/MultiOrdinalsTests.java
@@ -280,7 +280,7 @@ private void assertEquals(SortedSetDocValues docs, long[][] ordinalPlan) throws
                 for (long ord : ords) {
                     assertThat(docs.nextOrd(), equalTo(ord));
                 }
-                assertThat(docs.nextOrd(), equalTo(SortedSetDocValues.NO_MORE_DOCS));
+                assertThat(docs.nextOrd(), equalTo((long) SortedSetDocValues.NO_MORE_DOCS));
             }
         }
     }