Added fromStats() for spatial block values from doc-values

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/ValuesSourceReaderBenchmark.java

@@ -167,6 +167,11 @@ public String indexName() {
                     return "benchmark";
                 }
 
+                @Override
+                public boolean forStats() {
+                    return false;
+                }
+
                 @Override
                 public SearchLookup lookup() {
                     throw new UnsupportedOperationException();

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

@@ -143,9 +143,9 @@ protected Object parseSourceValue(Object value) {
         @Override
         public BlockLoader blockLoader(BlockLoaderContext blContext) {
             // TODO: If we have doc-values we have to use them, due to BlockSourceReader.columnAtATimeReader() returning null
-            // if (hasDocValues()) {
-            // return new BlockDocValuesReader.LongsBlockLoader(name());
-            // }
+            if (blContext.forStats() && hasDocValues()) {
+                return new BlockDocValuesReader.LongsBlockLoader(name());
+            }
             // TODO: Enhance BlockLoaderContext with knowledge about preferring to load from source (see EsPhysicalOperationProviders)
             return new BlockSourceReader.PointsBlockLoader(
                 valueFetcher(blContext.sourcePaths(name()), nullValue, GeometryFormatterFactory.WKT)

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

@@ -649,6 +649,14 @@ public interface BlockLoaderContext {
          */
         String indexName();
 
+        /**
+         * Whether the data will be used in stats.
+         * This is relevant to some types, where the choice between doc-values or reading from source is dependent on the usage.
+         * For example, spatial types use doc-values for stats, but read from source for search because doc-values are modified
+         * from the original.
+         */
+        boolean forStats();
+
         /**
          * {@link SearchLookup} used for building scripts.
          */

test/framework/src/main/java/org/elasticsearch/index/mapper/AbstractScriptFieldTypeTestCase.java

@@ -422,6 +422,11 @@ public String indexName() {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
+            public boolean forStats() {
+                return false;
+            }
+
             @Override
             public SearchLookup lookup() {
                 return mockContext().lookup();

test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java

@@ -1282,6 +1282,11 @@ public String indexName() {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
+            public boolean forStats() {
+                return false;
+            }
+
             @Override
             public SearchLookup lookup() {
                 return searchLookup;

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/BlockReaderFactories.java

@@ -32,7 +32,12 @@ private BlockReaderFactories() {}
      * @param asUnsupportedSource should the field be loaded as "unsupported"?
      *                            These will always have {@code null} values
      */
-    public static List<BlockLoader> loaders(List<SearchContext> searchContexts, String fieldName, boolean asUnsupportedSource) {
+    public static List<BlockLoader> loaders(
+        List<SearchContext> searchContexts,
+        String fieldName,
+        boolean asUnsupportedSource,
+        final boolean forStats
+    ) {
         List<BlockLoader> loaders = new ArrayList<>(searchContexts.size());
 
         for (SearchContext searchContext : searchContexts) {
@@ -53,6 +58,11 @@ public String indexName() {
                     return ctx.getFullyQualifiedIndex().getName();
                 }
 
+                @Override
+                public boolean forStats() {
+                    return forStats;
+                }
+
                 @Override
                 public SearchLookup lookup() {
                     return ctx.lookup();

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/ValuesSourceReaderOperatorTests.java

@@ -363,6 +363,11 @@ public String indexName() {
                 return "test_index";
             }
 
+            @Override
+            public boolean forStats() {
+                return false;
+            }
+
             @Override
             public SearchLookup lookup() {
                 throw new UnsupportedOperationException();

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichLookupService.java

@@ -276,7 +276,8 @@ private void doLookup(
                 var loaders = BlockReaderFactories.loaders(
                     List.of(searchContext),
                     extractField instanceof Alias a ? ((NamedExpression) a.child()).name() : extractField.name(),
-                    EsqlDataTypes.isUnsupported(extractField.dataType())
+                    EsqlDataTypes.isUnsupported(extractField.dataType()),
+                    false
                 );
                 fields.add(new ValuesSourceReaderOperator.FieldInfo(extractField.name(), loaders));
             }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/EsPhysicalOperationProviders.java

@@ -78,7 +78,12 @@ public final PhysicalOperation fieldExtractPhysicalOperation(FieldExtractExec fi
             layout.append(attr);
             DataType dataType = attr.dataType();
             String fieldName = attr.name();
-            List<BlockLoader> loaders = BlockReaderFactories.loaders(searchContexts, fieldName, EsqlDataTypes.isUnsupported(dataType));
+            List<BlockLoader> loaders = BlockReaderFactories.loaders(
+                searchContexts,
+                fieldName,
+                EsqlDataTypes.isUnsupported(dataType),
+                false
+            );
             fields.add(new ValuesSourceReaderOperator.FieldInfo(fieldName, loaders));
         }
         return source.with(new ValuesSourceReaderOperator.Factory(fields, readers, docChannel), layout.build());
@@ -169,7 +174,7 @@ public final Operator.OperatorFactory ordinalGroupingOperatorFactory(
         // The grouping-by values are ready, let's group on them directly.
         // Costin: why are they ready and not already exposed in the layout?
         return new OrdinalsGroupingOperator.OrdinalsGroupingOperatorFactory(
-            BlockReaderFactories.loaders(searchContexts, attrSource.name(), EsqlDataTypes.isUnsupported(attrSource.dataType())),
+            BlockReaderFactories.loaders(searchContexts, attrSource.name(), EsqlDataTypes.isUnsupported(attrSource.dataType()), true),
             shardContexts,
             groupElementType,
             docChannel,

x-pack/plugin/mapper-constant-keyword/src/test/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapperTests.java

@@ -239,6 +239,11 @@ public String indexName() {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
+            public boolean forStats() {
+                return false;
+            }
+
             @Override
             public SearchLookup lookup() {
                 throw new UnsupportedOperationException();