[DRAFT] Throw exceptions if nextOrd called more than docValueCount times

Signed-off-by: Michael Froh <[email protected]>

Author: msfroh

server/src/main/java/org/opensearch/index/fielddata/ordinals/GlobalOrdinalMapping.java

@@ -89,11 +89,11 @@ public boolean advanceExact(int target) throws IOException {
     @Override
     public long nextOrd() throws IOException {
         if (++nextOrd > docValueCount) {
-            return SortedSetDocValues.NO_MORE_DOCS;
+            throw new IllegalStateException("Called nextOrd after docValueCount");
         }
         long segmentOrd = values.nextOrd();
         if (segmentOrd == SortedSetDocValues.NO_MORE_DOCS) {
-            return SortedSetDocValues.NO_MORE_DOCS;
+            throw new IllegalStateException("Wrapped values returned no more docs too early");
         } else {
             return getGlobalOrd(segmentOrd);
         }

server/src/main/java/org/opensearch/search/aggregations/support/MissingValues.java

@@ -338,6 +338,7 @@ public String toString() {
     static SortedSetDocValues insertOrd(final SortedSetDocValues values, final long insertedOrd, final BytesRef missingValue) {
         return new AbstractSortedSetDocValues() {
 
+            private int ordCount = 0;
             private boolean hasOrds;
             private long nextMissingOrd;
 
@@ -365,6 +366,9 @@ public int docValueCount() {
             @Override
             public long nextOrd() throws IOException {
                 if (hasOrds) {
+                    if (++ordCount == values.getValueCount()) {
+                        throw new IllegalStateException("Called nextOrd after docValueCount");
+                    }
                     final long ord = values.nextOrd();
                     if (ord < insertedOrd) {
                         return ord;
@@ -374,6 +378,9 @@ public long nextOrd() throws IOException {
                         return ord + 1;
                     }
                 } else {
+                    if (nextMissingOrd == SortedSetDocValues.NO_MORE_DOCS) {
+                        throw new IllegalStateException("Called nextOrd after docValueCount");
+                    }
                     // we want to return the next missing ord but set this to
                     // NO_MORE_DOCS so on the next call we indicate there are no
                     // more values
@@ -386,6 +393,7 @@ public long nextOrd() throws IOException {
             @Override
             public boolean advanceExact(int doc) throws IOException {
                 hasOrds = values.advanceExact(doc);
+                ordCount = 0;
                 nextMissingOrd = insertedOrd;
                 // always return true because we want to return a value even if
                 // the document does not have a value