applied feedback

Author: martijnvg

server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java

@@ -615,7 +615,7 @@ private static void throwOnCreateDynamicNestedViaCopyTo(Mapper dynamicObjectMapp
     private static void parseArray(DocumentParserContext context, String lastFieldName) throws IOException {
         // Record previous immediate parent, so that it can be reset after array has been parsed.
         // This is for recording array offset with synthetic source. Only if the immediate parent is an array,
-        // then we offsets can be accounted accurately.
+        // then the offsets can be accounted accurately.
         var prev = context.getImmediateXContentParent();
         context.setImmediateXContentParent(context.parser().currentToken());
 

server/src/main/java/org/elasticsearch/index/mapper/FieldArrayContext.java

@@ -12,6 +12,7 @@
 import org.apache.lucene.document.SortedDocValuesField;
 import org.apache.lucene.util.BitUtil;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
+import org.elasticsearch.common.io.stream.StreamInput;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -70,11 +71,20 @@ void addToLuceneDocument(DocumentParserContext context) throws IOException {
         }
     }
 
+    static int[] parseOffsetArray(StreamInput in) throws IOException {
+        int[] offsetToOrd = new int[BitUtil.zigZagDecode(in.readVInt())];
+        for (int i = 0; i < offsetToOrd.length; i++) {
+            offsetToOrd[i] = BitUtil.zigZagDecode(in.readVInt());
+        }
+        return offsetToOrd;
+    }
+
     private static class Offsets {
 
         int currentOffset;
-        // Need to use TreeMap here, so that we maintain the order in which each value (with offset) gets inserted,
-        // (which is in the same order the document gets parsed) so we store offsets in right order.
+        // Need to use TreeMap here, so that we maintain the order in which each value (with offset) stored inserted,
+        // (which is in the same order the document gets parsed) so we store offsets in right order. This is the same
+        // order in what the values get stored in SortedSetDocValues.
         final Map<String, List<Integer>> valueToOffsets = new TreeMap<>();
         final List<Integer> nullValueOffsets = new ArrayList<>(2);
 

server/src/main/java/org/elasticsearch/index/mapper/SortedSetWithOffsetsDocValuesSyntheticFieldLoaderLayer.java

@@ -14,10 +14,8 @@
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.SortedDocValues;
 import org.apache.lucene.index.SortedSetDocValues;
-import org.apache.lucene.util.BitUtil;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.io.stream.ByteArrayStreamInput;
-import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -100,7 +98,7 @@ public boolean advanceToDoc(int docId) throws IOException {
                     int offsetOrd = offsetDocValues.ordValue();
                     var encodedValue = offsetDocValues.lookupOrd(offsetOrd);
                     scratch.reset(encodedValue.bytes, encodedValue.offset, encodedValue.length);
-                    offsetToOrd = parseOffsetArray(scratch);
+                    offsetToOrd = FieldArrayContext.parseOffsetArray(scratch);
                 } else {
                     offsetToOrd = null;
                 }
@@ -166,11 +164,4 @@ public void write(XContentBuilder b) throws IOException {
         }
     }
 
-    static int[] parseOffsetArray(StreamInput in) throws IOException {
-        int[] offsetToOrd = new int[BitUtil.zigZagDecode(in.readVInt())];
-        for (int i = 0; i < offsetToOrd.length; i++) {
-            offsetToOrd[i] = BitUtil.zigZagDecode(in.readVInt());
-        }
-        return offsetToOrd;
-    }
 }

server/src/test/java/org/elasticsearch/index/mapper/FieldArrayContextTests.java

@@ -14,7 +14,7 @@
 
 import java.io.IOException;
 
-import static org.elasticsearch.index.mapper.SortedSetWithOffsetsDocValuesSyntheticFieldLoaderLayer.parseOffsetArray;
+import static org.elasticsearch.index.mapper.FieldArrayContext.parseOffsetArray;
 
 public class FieldArrayContextTests extends ESTestCase {