iter

Author: martijnvg

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

@@ -214,14 +214,14 @@ public static FieldType freezeAndDeduplicateFieldType(FieldType fieldType) {
     public abstract int getTotalFieldsCount();
 
     /**
-     * @return whether this mapper support storing leaf array elements natively when synthetic source is enabled.
+     * @return whether this mapper supports storing leaf array elements natively when synthetic source is enabled.
      */
     public boolean supportStoringArrayOffsets(DocumentParserContext context) {
         return false;
     }
 
     /**
-     * @return the offset field name use the store offsets iff {@link #supportStoringArrayOffsets(DocumentParserContext)} returns
+     * @return the offset field name used the store offsets iff {@link #supportStoringArrayOffsets(DocumentParserContext)} returns
      * <code>true</code>.
      */
     public String getOffsetFieldName() {

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

@@ -31,7 +31,7 @@ final class SortedSetWithOffsetsDocValuesSyntheticFieldLoaderLayer implements Co
 
     private final String name;
     private final String offsetsFieldName;
-    private ImmediateDocValuesLoader docValues;
+    private DocValuesWithOffsetsLoader docValues;
 
     SortedSetWithOffsetsDocValuesSyntheticFieldLoaderLayer(String name, String offsetsFieldName) {
         this.name = Objects.requireNonNull(name);
@@ -48,9 +48,7 @@ public DocValuesLoader docValuesLoader(LeafReader leafReader, int[] docIdsInLeaf
         SortedSetDocValues valueDocValues = DocValues.getSortedSet(leafReader, name);
         BinaryDocValues offsetDocValues = DocValues.getBinary(leafReader, offsetsFieldName);
 
-        ImmediateDocValuesLoader loader = new ImmediateDocValuesLoader(valueDocValues, offsetDocValues);
-        docValues = loader;
-        return loader;
+        return docValues = new DocValuesWithOffsetsLoader(valueDocValues, offsetDocValues);
     }
 
     @Override
@@ -78,7 +76,7 @@ public void write(XContentBuilder b) throws IOException {
         }
     }
 
-    static final class ImmediateDocValuesLoader implements DocValuesLoader {
+    static final class DocValuesWithOffsetsLoader implements DocValuesLoader {
         private final BinaryDocValues offsetDocValues;
         private final SortedSetDocValues valueDocValues;
         private final ByteArrayStreamInput scratch = new ByteArrayStreamInput();
@@ -87,7 +85,7 @@ static final class ImmediateDocValuesLoader implements DocValuesLoader {
         private boolean hasOffset;
         private int[] offsetToOrd;
 
-        ImmediateDocValuesLoader(SortedSetDocValues valueDocValues, BinaryDocValues offsetDocValues) {
+        DocValuesWithOffsetsLoader(SortedSetDocValues valueDocValues, BinaryDocValues offsetDocValues) {
             this.valueDocValues = valueDocValues;
             this.offsetDocValues = offsetDocValues;
         }
@@ -148,6 +146,7 @@ public void write(XContentBuilder b) throws IOException {
 
                     long ord = ords[offset];
                     BytesRef c = valueDocValues.lookupOrd(ord);
+                    // This is keyword specific and needs to be updated once support is added for other field types:
                     b.utf8Value(c.bytes, c.offset, c.length);
                 }
             } else if (offsetToOrd != null) {

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

@@ -13,7 +13,7 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.index.mapper.SortedSetWithOffsetsDocValuesSyntheticFieldLoaderLayer.ImmediateDocValuesLoader;
+import org.elasticsearch.index.mapper.SortedSetWithOffsetsDocValuesSyntheticFieldLoaderLayer.DocValuesWithOffsetsLoader;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentType;
 
@@ -203,7 +203,7 @@ private void verifyOffsets(String mapping, String source, String expectedSource)
                 try (var indexReader = wrapInMockESDirectoryReader(DirectoryReader.open(directory))) {
                     var layer = new SortedSetWithOffsetsDocValuesSyntheticFieldLoaderLayer("field", "field.offsets");
                     var leafReader = indexReader.leaves().getFirst().reader();
-                    var loader = (ImmediateDocValuesLoader) layer.docValuesLoader(leafReader, new int[] { 0 });
+                    var loader = (DocValuesWithOffsetsLoader) layer.docValuesLoader(leafReader, new int[] { 0 });
                     assertTrue(loader.advanceToDoc(0));
                     assertTrue(loader.count() > 0);
                     XContentBuilder builder = jsonBuilder().startObject();