iter5

Author: martijnvg

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java

@@ -399,7 +399,7 @@ public Builder builder(BlockFactory factory, int expectedCount) {
                     }
                 };
             }
-            ValueFetcher valueFetcher = sourceValueFetcher(blContext.sourcePaths(name()), blContext.indexSettings());
+            var valueFetcher = sourceValueFetcher(blContext.sourcePaths(name()), blContext.indexSettings());
             BlockSourceReader.LeafIteratorLookup lookup = hasDocValues() == false && isStored()
                 // We only write the field names field if there aren't doc values
                 ? BlockSourceReader.lookupFromFieldNames(blContext.fieldNames(), name())

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

@@ -173,7 +173,7 @@ protected Object parseSourceValue(Object value) {
             };
         }
 
-        public ValueFetcher valueFetcher(Set<String> sourcePaths, T nullValue, String format, IndexSettings indexSettings) {
+        public SourceBasedValueFetcher valueFetcher(Set<String> sourcePaths, T nullValue, String format, IndexSettings indexSettings) {
             Function<List<T>, List<Object>> formatter = getFormatter(format != null ? format : GeometryFormatterFactory.GEOJSON);
             return new ArraySourceValueFetcher(sourcePaths, nullValueAsSource(nullValue), indexSettings.getIgnoredSourceFormat()) {
                 @Override

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

@@ -28,7 +28,7 @@
  * array values in parsing. Field types should use this class if their corresponding
  * mapper returns true for {@link FieldMapper#parsesArrayValue()}.
  */
-public abstract class ArraySourceValueFetcher implements ValueFetcher {
+public abstract class ArraySourceValueFetcher implements SourceBasedValueFetcher {
     private final Set<String> sourcePaths;
     private final @Nullable Object nullValue;
     private final IgnoredSourceFormat ignoredSourceFormat;
@@ -80,15 +80,7 @@ public List<Object> fetchValues(Source source, int doc, List<Object> ignoredValu
 
     @Override
     public StoredFieldsSpec storedFieldsSpec() {
-        return StoredFieldsSpec.NEEDS_SOURCE;
-    }
-
-    public Set<String> getSourcePaths() {
-        return sourcePaths;
-    }
-
-    public IgnoredSourceFormat getIgnoredSourceFormat() {
-        return ignoredSourceFormat;
+        return StoredFieldsSpec.withSourcePaths(ignoredSourceFormat, sourcePaths);
     }
 
     /**

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

@@ -18,15 +18,13 @@
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.UnicodeUtil;
-import org.elasticsearch.index.mapper.IgnoredSourceFieldMapper.IgnoredSourceFormat;
 import org.elasticsearch.search.fetch.StoredFieldsSpec;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * Loads values from {@code _source}. This whole process is very slow and cast-tastic,
@@ -96,22 +94,10 @@ public interface LeafIteratorLookup {
     private abstract static class SourceBlockLoader implements BlockLoader {
         protected final ValueFetcher fetcher;
         private final LeafIteratorLookup lookup;
-        private final Set<String> sourcePaths;
-        private final IgnoredSourceFormat ignoredSourceFormat;
 
-        private SourceBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
+        private SourceBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
             this.fetcher = fetcher;
             this.lookup = lookup;
-            if (fetcher instanceof SourceValueFetcher sourceValueFetcher) {
-                this.sourcePaths = sourceValueFetcher.getSourcePaths();
-                this.ignoredSourceFormat = sourceValueFetcher.getIgnoredSourceFormat();
-            } else if (fetcher instanceof ArraySourceValueFetcher arraySourceValueFetcher) {
-                this.sourcePaths = arraySourceValueFetcher.getSourcePaths();
-                this.ignoredSourceFormat = arraySourceValueFetcher.getIgnoredSourceFormat();
-            } else {
-                // TODO: maybe introduce a common interface for SourceValueFetcher and ArraySourceValueFetcher?
-                throw new IllegalStateException("unexpected fetcher type " + fetcher);
-            }
         }
 
         @Override
@@ -121,7 +107,7 @@ public final ColumnAtATimeReader columnAtATimeReader(LeafReaderContext context)
 
         @Override
         public final StoredFieldsSpec rowStrideStoredFieldSpec() {
-            return StoredFieldsSpec.withSourcePaths(ignoredSourceFormat, sourcePaths);
+            return fetcher.storedFieldsSpec();
         }
 
         @Override
@@ -157,7 +143,7 @@ public final String toString() {
      * Load {@code boolean}s from {@code _source}.
      */
     public static class BooleansBlockLoader extends SourceBlockLoader {
-        public BooleansBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public BooleansBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -197,7 +183,7 @@ public String toString() {
      * Load {@link BytesRef}s from {@code _source}.
      */
     public static class BytesRefsBlockLoader extends SourceBlockLoader {
-        public BytesRefsBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public BytesRefsBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -218,7 +204,7 @@ protected String name() {
     }
 
     public static class GeometriesBlockLoader extends SourceBlockLoader {
-        public GeometriesBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public GeometriesBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -281,7 +267,7 @@ public String toString() {
      * Load {@code double}s from {@code _source}.
      */
     public static class DoublesBlockLoader extends SourceBlockLoader {
-        public DoublesBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public DoublesBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -323,7 +309,7 @@ public String toString() {
     public static class DenseVectorBlockLoader extends SourceBlockLoader {
         private final int dimensions;
 
-        public DenseVectorBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup, int dimensions) {
+        public DenseVectorBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup, int dimensions) {
             super(fetcher, lookup);
             this.dimensions = dimensions;
         }
@@ -364,7 +350,7 @@ public String toString() {
      * Load {@code int}s from {@code _source}.
      */
     public static class IntsBlockLoader extends SourceBlockLoader {
-        public IntsBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public IntsBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -404,7 +390,7 @@ public String toString() {
      * Load {@code long}s from {@code _source}.
      */
     public static class LongsBlockLoader extends SourceBlockLoader {
-        public LongsBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public LongsBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 
@@ -444,7 +430,7 @@ public String toString() {
      * Load {@code ip}s from {@code _source}.
      */
     public static class IpsBlockLoader extends SourceBlockLoader {
-        public IpsBlockLoader(ValueFetcher fetcher, LeafIteratorLookup lookup) {
+        public IpsBlockLoader(SourceBasedValueFetcher fetcher, LeafIteratorLookup lookup) {
             super(fetcher, lookup);
         }
 

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

@@ -368,7 +368,7 @@ public Builder builder(BlockFactory factory, int expectedCount) {
                 };
             }
 
-            ValueFetcher fetcher = sourceValueFetcher(blContext.sourcePaths(name()), blContext.indexSettings());
+            var fetcher = sourceValueFetcher(blContext.sourcePaths(name()), blContext.indexSettings());
             BlockSourceReader.LeafIteratorLookup lookup = indexType.hasTerms() || isStored()
                 ? BlockSourceReader.lookupFromFieldNames(blContext.fieldNames(), name())
                 : BlockSourceReader.lookupMatchingAll();

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

@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.index.mapper;
+
+/**
+ * Marker interface for {@link ValueFetcher} implementations that fetch values from the source.
+ */
+public interface SourceBasedValueFetcher extends ValueFetcher {}

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

@@ -30,7 +30,7 @@
  *
  * Field types that handle arrays directly should instead use {@link ArraySourceValueFetcher}.
  */
-public abstract class SourceValueFetcher implements ValueFetcher {
+public abstract class SourceValueFetcher implements SourceBasedValueFetcher {
     private final Set<String> sourcePaths;
     private final @Nullable Object nullValue;
     private final IgnoredSourceFormat ignoredSourceFormat;
@@ -107,15 +107,7 @@ public List<Object> fetchValues(Source source, int doc, List<Object> ignoredValu
 
     @Override
     public StoredFieldsSpec storedFieldsSpec() {
-        return StoredFieldsSpec.NEEDS_SOURCE;
-    }
-
-    public Set<String> getSourcePaths() {
-        return sourcePaths;
-    }
-
-    public IgnoredSourceFormat getIgnoredSourceFormat() {
-        return ignoredSourceFormat;
+        return StoredFieldsSpec.withSourcePaths(ignoredSourceFormat, sourcePaths);
     }
 
     /**

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

@@ -67,7 +67,7 @@ private void loadBlock(LeafReaderContext ctx, Consumer<TestBlock> test) throws I
             )
             .build();
         IndexSettings indexSettings = new IndexSettings(indexMetadata, Settings.EMPTY);
-        ValueFetcher valueFetcher = SourceValueFetcher.toString(Set.of("field"), indexSettings);
+        var valueFetcher = SourceValueFetcher.toString(Set.of("field"), indexSettings);
         BlockSourceReader.LeafIteratorLookup lookup = BlockSourceReader.lookupFromNorms("field");
         BlockLoader loader = new BlockSourceReader.BytesRefsBlockLoader(valueFetcher, lookup);
         assertThat(loader.columnAtATimeReader(ctx), nullValue());

x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java

@@ -400,7 +400,7 @@ public Builder builder(BlockFactory factory, int expectedCount) {
             }
 
             var ignoredSourceFormat = blContext.indexSettings().getIgnoredSourceFormat();
-            ValueFetcher valueFetcher = new SourceValueFetcher(blContext.sourcePaths(name()), nullValueFormatted, ignoredSourceFormat) {
+            var valueFetcher = new SourceValueFetcher(blContext.sourcePaths(name()), nullValueFormatted, ignoredSourceFormat) {
                 @Override
                 protected Object parseSourceValue(Object value) {
                     if (value.equals("")) {