Removing nextOrd() call and directly traversing over valid range for SortedSetDocValues

tanik98 · tanik98 · commit 51909c766019 · 2025-05-07T21:46:10.000+05:30
Signed-off-by: Tanik Pansuriya &lt;panbhai@amazon.com&gt;
diff --git a/server/src/main/java/org/opensearch/index/mapper/SortedSetDocValuesFetcher.java b/server/src/main/java/org/opensearch/index/mapper/SortedSetDocValuesFetcher.java
@@ -38,8 +38,9 @@ public List<Object> fetch(LeafReader reader, int docId) throws IOException {
                 return values;
             }
             int valueCount = sortedSetDocValues.docValueCount();
-            for (long ord = sortedSetDocValues.nextOrd(), i = 0; ord != SortedSetDocValues.NO_MORE_DOCS && i < valueCount; ord =
-                sortedSetDocValues.nextOrd(), i++) {
+            // docValueCount() is equivalent to one plus the maximum ordinal, that means ordinal
+            // range is [0, docValueCount() - 1]
+            for (int ord = 0; ord < valueCount; ord++) {
                 BytesRef value = sortedSetDocValues.lookupOrd(ord);
                 values.add(BytesRef.deepCopyOf(value));
             }

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,9 @@ public List<Object> fetch(LeafReader reader, int docId) throws IOException {`
`38`	`38`	`return values;`
`39`	`39`	`}`
`40`	`40`	`int valueCount = sortedSetDocValues.docValueCount();`
`41`		`- for (long ord = sortedSetDocValues.nextOrd(), i = 0; ord != SortedSetDocValues.NO_MORE_DOCS && i < valueCount; ord =`
`42`		`- sortedSetDocValues.nextOrd(), i++) {`
	`41`	`+ // docValueCount() is equivalent to one plus the maximum ordinal, that means ordinal`
	`42`	`+ // range is [0, docValueCount() - 1]`
	`43`	`+ for (int ord = 0; ord < valueCount; ord++) {`
`43`	`44`	`BytesRef value = sortedSetDocValues.lookupOrd(ord);`
`44`	`45`	`values.add(BytesRef.deepCopyOf(value));`
`45`	`46`	`}`