Small iter

Author: martijnvg

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

@@ -98,7 +98,7 @@ public void processArrayOffsets(DocumentParserContext context) throws IOExceptio
         }
 
         @Override
-        public ArrayOffsetContext getOffSetContext() {
+        public FieldArrayContext getOffSetContext() {
             return in.getOffSetContext();
         }
 
@@ -166,7 +166,7 @@ private enum Scope {
     private final SeqNoFieldMapper.SequenceIDFields seqID;
     private final Set<String> fieldsAppliedFromTemplates;
 
-    private ArrayOffsetContext arrayOffsetContext;
+    private FieldArrayContext fieldArrayContext;
 
     /**
      * Fields that are copied from values of other fields via copy_to.
@@ -488,16 +488,16 @@ public boolean isCopyToDestinationField(String name) {
     }
 
     public void processArrayOffsets(DocumentParserContext context) throws IOException {
-        if (arrayOffsetContext != null) {
-            arrayOffsetContext.processArrayOffsets(context);
+        if (fieldArrayContext != null) {
+            fieldArrayContext.addToLuceneDocument(context);
         }
     }
 
-    public ArrayOffsetContext getOffSetContext() {
-        if (arrayOffsetContext == null) {
-            arrayOffsetContext = new ArrayOffsetContext();
+    public FieldArrayContext getOffSetContext() {
+        if (fieldArrayContext == null) {
+            fieldArrayContext = new FieldArrayContext();
         }
-        return arrayOffsetContext;
+        return fieldArrayContext;
     }
 
     private XContentParser.Token token;

…rch/index/mapper/ArrayOffsetContext.java …arch/index/mapper/FieldArrayContext.javaserver/src/main/java/org/elasticsearch/index/mapper/ArrayOffsetContext.java renamed to server/src/main/java/org/elasticsearch/index/mapper/FieldArrayContext.java server/src/main/java/org/elasticsearch/index/mapper/ArrayOffsetContext.java renamed to server/src/main/java/org/elasticsearch/index/mapper/FieldArrayContext.java

@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-public class ArrayOffsetContext {
+public class FieldArrayContext {
 
     private final Map<String, Offsets> offsetsPerField = new HashMap<>();
 
@@ -41,7 +41,7 @@ void maybeRecordEmptyArray(String field) {
         offsetsPerField.computeIfAbsent(field, k -> new Offsets());
     }
 
-    void processArrayOffsets(DocumentParserContext context) throws IOException {
+    void addToLuceneDocument(DocumentParserContext context) throws IOException {
         for (var entry : offsetsPerField.entrySet()) {
             var fieldName = entry.getKey();
             var offset = entry.getValue();
@@ -70,11 +70,13 @@ void processArrayOffsets(DocumentParserContext context) throws IOException {
         }
     }
 
-    static class Offsets {
+    private static class Offsets {
 
-        public int currentOffset;
-        public final Map<String, List<Integer>> valueToOffsets = new TreeMap<>();
-        public final List<Integer> nullValueOffsets = new ArrayList<>(2);
+        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 was document gets parsed) so we store offsets in right order.
+        final Map<String, List<Integer>> valueToOffsets = new TreeMap<>();
+        final List<Integer> nullValueOffsets = new ArrayList<>(2);
 
     }
 

…ndex/mapper/ArrayOffsetContextTests.java …index/mapper/FieldArrayContextTests.javaserver/src/test/java/org/elasticsearch/index/mapper/ArrayOffsetContextTests.java renamed to server/src/test/java/org/elasticsearch/index/mapper/FieldArrayContextTests.java server/src/test/java/org/elasticsearch/index/mapper/ArrayOffsetContextTests.java renamed to server/src/test/java/org/elasticsearch/index/mapper/FieldArrayContextTests.java

@@ -16,10 +16,10 @@
 
 import static org.elasticsearch.index.mapper.SortedSetWithOffsetsDocValuesSyntheticFieldLoaderLayer.parseOffsetArray;
 
-public class ArrayOffsetContextTests extends ESTestCase {
+public class FieldArrayContextTests extends ESTestCase {
 
     public void testOffsets() throws IOException {
-        var context = new ArrayOffsetContext();
+        var context = new FieldArrayContext();
         context.recordOffset("field", "a");
         context.recordOffset("field", "a");
         context.recordOffset("field", "b");
@@ -28,15 +28,15 @@ public void testOffsets() throws IOException {
         context.recordOffset("field", "b");
 
         var parserContext = new TestDocumentParserContext();
-        context.processArrayOffsets(parserContext);
+        context.addToLuceneDocument(parserContext);
 
         var binaryDocValues = parserContext.doc().getField("field");
         int[] offsetToOrd = parseOffsetArray(new ByteArrayStreamInput(binaryDocValues.binaryValue().bytes));
         assertArrayEquals(new int[] { 0, 0, 1, 2, 0, 1 }, offsetToOrd);
     }
 
     public void testOffsetsWithNull() throws IOException {
-        var context = new ArrayOffsetContext();
+        var context = new FieldArrayContext();
         context.recordNull("field");
         context.recordOffset("field", "a");
         context.recordOffset("field", "b");
@@ -45,19 +45,19 @@ public void testOffsetsWithNull() throws IOException {
         context.recordOffset("field", "b");
 
         var parserContext = new TestDocumentParserContext();
-        context.processArrayOffsets(parserContext);
+        context.addToLuceneDocument(parserContext);
 
         var binaryDocValues = parserContext.doc().getField("field");
         int[] offsetToOrd = parseOffsetArray(new ByteArrayStreamInput(binaryDocValues.binaryValue().bytes));
         assertArrayEquals(new int[] { -1, 0, 1, 2, -1, 1 }, offsetToOrd);
     }
 
     public void testEmptyOffset() throws IOException {
-        var context = new ArrayOffsetContext();
+        var context = new FieldArrayContext();
         context.maybeRecordEmptyArray("field");
 
         var parserContext = new TestDocumentParserContext();
-        context.processArrayOffsets(parserContext);
+        context.addToLuceneDocument(parserContext);
 
         var binaryDocValues = parserContext.doc().getField("field");
         int[] offsetToOrd = parseOffsetArray(new ByteArrayStreamInput(binaryDocValues.binaryValue().bytes));