Address test failures in old-lucene-versions

Author: javanna

x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacyDocValuesIterables.java

@@ -222,24 +222,30 @@ public Iterator<Number> iterator() {
 
                 return new Iterator<Number>() {
                     private boolean nextIsSet;
+                    private int currentIndex = 0;
                     private long nextOrd;
 
                     private void setNext() {
                         try {
                             if (nextIsSet == false) {
                                 if (values.docID() == -1) {
                                     values.nextDoc();
+                                    currentIndex = 0;
                                 }
                                 while (true) {
                                     if (values.docID() == DocIdSetIterator.NO_MORE_DOCS) {
                                         nextOrd = -1;
                                         break;
                                     }
-                                    nextOrd = values.nextOrd();
-                                    if (nextOrd != -1) {
-                                        break;
+                                    if (currentIndex < values.docValueCount()) {
+                                        nextOrd = values.nextOrd();
+                                        currentIndex++;
+                                        if (nextOrd != -1) {
+                                            break;
+                                        }
                                     }
                                     values.nextDoc();
+                                    currentIndex = 0;
                                 }
                                 nextIsSet = true;
                             }

x-pack/plugin/old-lucene-versions/src/test/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesFormatTests.java

@@ -10,12 +10,12 @@
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 
 import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.tests.index.BaseDocValuesFormatTestCase;
+import org.apache.lucene.tests.index.LegacyBaseDocValuesFormatTestCase;
 import org.apache.lucene.tests.util.TestUtil;
 import org.elasticsearch.test.GraalVMThreadsFilter;
 
 @ThreadLeakFilters(filters = { GraalVMThreadsFilter.class })
-public class Lucene54DocValuesFormatTests extends BaseDocValuesFormatTestCase {
+public class Lucene54DocValuesFormatTests extends LegacyBaseDocValuesFormatTestCase {
 
     private final Codec codec = TestUtil.alwaysDocValuesFormat(new Lucene54DocValuesFormat());