Don't treat counter fields in outside of tsdb as counters. (#93800)

Fields that have the time_series_metric attribute set to counter in non tsdb indices should use number value source type instead of counter value source type. Essentially not handling these fields as counters at search time.

Relates to #93539

Author: martijnvg

benchmarks/src/main/java/org/elasticsearch/benchmark/script/ScriptScoreBenchmark.java

@@ -82,7 +82,7 @@ public class ScriptScoreBenchmark {
     private final ScriptModule scriptModule = new ScriptModule(Settings.EMPTY, pluginsService.filterPlugins(ScriptPlugin.class));
 
     private final Map<String, MappedFieldType> fieldTypes = Map.ofEntries(
-        Map.entry("n", new NumberFieldType("n", NumberType.LONG, false, false, true, true, null, Map.of(), null, false, null))
+        Map.entry("n", new NumberFieldType("n", NumberType.LONG, false, false, true, true, null, Map.of(), null, false, null, null))
     );
     private final IndexFieldDataCache fieldDataCache = new IndexFieldDataCache.None();
     private final Map<String, Set<String>> sourcePaths = Map.of("n", Set.of("n"));

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

@@ -192,7 +192,8 @@ public ScaledFloatFieldMapper build(MapperBuilderContext context) {
                 meta.getValue(),
                 scalingFactor.getValue(),
                 nullValue.getValue(),
-                metric.getValue()
+                metric.getValue(),
+                indexMode
             );
             return new ScaledFloatFieldMapper(name, type, multiFieldsBuilder.build(this, context), copyTo.build(), this);
         }
@@ -205,6 +206,7 @@ public static final class ScaledFloatFieldType extends SimpleMappedFieldType {
         private final double scalingFactor;
         private final Double nullValue;
         private final TimeSeriesParams.MetricType metricType;
+        private final IndexMode indexMode;
 
         public ScaledFloatFieldType(
             String name,
@@ -214,20 +216,22 @@ public ScaledFloatFieldType(
             Map<String, String> meta,
             double scalingFactor,
             Double nullValue,
-            TimeSeriesParams.MetricType metricType
+            TimeSeriesParams.MetricType metricType,
+            IndexMode indexMode
         ) {
             super(name, indexed, stored, hasDocValues, TextSearchInfo.SIMPLE_MATCH_WITHOUT_TERMS, meta);
             this.scalingFactor = scalingFactor;
             this.nullValue = nullValue;
             this.metricType = metricType;
+            this.indexMode = indexMode;
         }
 
         public ScaledFloatFieldType(String name, double scalingFactor) {
             this(name, scalingFactor, true);
         }
 
         public ScaledFloatFieldType(String name, double scalingFactor, boolean indexed) {
-            this(name, indexed, false, true, Collections.emptyMap(), scalingFactor, null, null);
+            this(name, indexed, false, true, Collections.emptyMap(), scalingFactor, null, null, null);
         }
 
         public double getScalingFactor() {
@@ -302,7 +306,7 @@ public IndexFieldData.Builder fielddataBuilder(FieldDataContext fieldDataContext
                 failIfNoDocValues();
             }
 
-            ValuesSourceType valuesSourceType = metricType == TimeSeriesParams.MetricType.COUNTER
+            ValuesSourceType valuesSourceType = indexMode == IndexMode.TIME_SERIES && metricType == TimeSeriesParams.MetricType.COUNTER
                 ? TimeSeriesValuesSourceType.COUNTER
                 : IndexNumericFieldData.NumericType.LONG.getValuesSourceType();
             if ((operation == FielddataOperation.SEARCH || operation == FielddataOperation.SCRIPT) && hasDocValues()) {

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

@@ -113,6 +113,7 @@ static class TokenCountFieldType extends NumberFieldMapper.NumberFieldType {
                 meta,
                 null,
                 false,
+                null,
                 null
             );
         }

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldTypeTests.java

@@ -91,6 +91,7 @@ public void testRangeQuery() throws IOException {
             Collections.emptyMap(),
             0.1 + randomDouble() * 100,
             null,
+            null,
             null
         );
         Directory dir = newDirectory();

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/120_counter_fields.yml

@@ -0,0 +1,53 @@
+---
+"avg aggregation on counter field":
+  - skip:
+      version: " - 8.7.99"
+      reason: "counter field support added in 8.7"
+
+  - do:
+      indices.create:
+        index: myindex1
+        body:
+          mappings:
+            properties:
+              counter_field:
+                type : long
+                time_series_metric: counter
+  - do:
+      indices.create:
+        index: myindex2
+        body:
+          settings:
+            index:
+              mode: time_series
+              routing_path: [ keyword_field ]
+              time_series:
+                start_time: 2023-01-01T00:00:00Z
+                end_time: 2024-01-01T00:00:00Z
+          mappings:
+            properties:
+              keyword_field:
+                type: keyword
+                time_series_dimension: true
+              counter_field:
+                type : long
+                time_series_metric: counter
+  - do:
+      search:
+        index: myindex1
+        body:
+          aggs:
+            the_counter_avg:
+              avg:
+                field: counter_field
+  - match: { aggregations.the_counter_avg.value: null }
+
+  - do:
+      catch: /Field \[counter_field\] of type \[long\] is not supported for aggregation \[avg\]/
+      search:
+        index: myindex2
+        body:
+          aggs:
+            the_counter_avg:
+              avg:
+                field: counter_field

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

@@ -1465,6 +1465,7 @@ public static class NumberFieldType extends SimpleMappedFieldType {
         private final FieldValues<Number> scriptValues;
         private final boolean isDimension;
         private final MetricType metricType;
+        private final IndexMode indexMode;
 
         public NumberFieldType(
             String name,
@@ -1477,7 +1478,8 @@ public NumberFieldType(
             Map<String, String> meta,
             FieldValues<Number> script,
             boolean isDimension,
-            MetricType metricType
+            MetricType metricType,
+            IndexMode indexMode
         ) {
             super(name, isIndexed, isStored, hasDocValues, TextSearchInfo.SIMPLE_MATCH_WITHOUT_TERMS, meta);
             this.type = Objects.requireNonNull(type);
@@ -1486,6 +1488,7 @@ public NumberFieldType(
             this.scriptValues = script;
             this.isDimension = isDimension;
             this.metricType = metricType;
+            this.indexMode = indexMode;
         }
 
         NumberFieldType(String name, Builder builder) {
@@ -1500,7 +1503,8 @@ public NumberFieldType(
                 builder.meta.getValue(),
                 builder.scriptValues(),
                 builder.dimension.getValue(),
-                builder.metric.getValue()
+                builder.metric.getValue(),
+                builder.indexMode
             );
         }
 
@@ -1509,7 +1513,7 @@ public NumberFieldType(String name, NumberType type) {
         }
 
         public NumberFieldType(String name, NumberType type, boolean isIndexed) {
-            this(name, type, isIndexed, false, true, true, null, Collections.emptyMap(), null, false, null);
+            this(name, type, isIndexed, false, true, true, null, Collections.emptyMap(), null, false, null, null);
         }
 
         @Override
@@ -1589,7 +1593,7 @@ public IndexFieldData.Builder fielddataBuilder(FieldDataContext fieldDataContext
                 failIfNoDocValues();
             }
 
-            ValuesSourceType valuesSourceType = metricType == TimeSeriesParams.MetricType.COUNTER
+            ValuesSourceType valuesSourceType = indexMode == IndexMode.TIME_SERIES && metricType == TimeSeriesParams.MetricType.COUNTER
                 ? TimeSeriesValuesSourceType.COUNTER
                 : type.numericType.getValuesSourceType();
 

server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java

@@ -332,7 +332,20 @@ private void doTestRequireDocValues(MappedFieldType ft) {
     public void testRequireDocValuesOnLongs() {
         doTestRequireDocValues(new NumberFieldMapper.NumberFieldType("field", LONG));
         doTestRequireDocValues(
-            new NumberFieldMapper.NumberFieldType("field", LONG, true, false, false, false, null, Collections.emptyMap(), null, false, null)
+            new NumberFieldMapper.NumberFieldType(
+                "field",
+                LONG,
+                true,
+                false,
+                false,
+                false,
+                null,
+                Collections.emptyMap(),
+                null,
+                false,
+                null,
+                null
+            )
         );
     }
 
@@ -350,6 +363,7 @@ public void testRequireDocValuesOnDoubles() {
                 Collections.emptyMap(),
                 null,
                 false,
+                null,
                 null
             )
         );

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

@@ -127,7 +127,20 @@ public void testLongTermQueryWithDecimalPart() {
     }
 
     private static MappedFieldType unsearchable() {
-        return new NumberFieldType("field", NumberType.LONG, false, false, false, true, null, Collections.emptyMap(), null, false, null);
+        return new NumberFieldType(
+            "field",
+            NumberType.LONG,
+            false,
+            false,
+            false,
+            true,
+            null,
+            Collections.emptyMap(),
+            null,
+            false,
+            null,
+            null
+        );
     }
 
     public void testTermQuery() {

server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java

@@ -89,6 +89,7 @@ private ValuesSourceConfig getVSConfig(
             Collections.emptyMap(),
             null,
             false,
+            null,
             null
         );
         return ValuesSourceConfig.resolveFieldOnly(ft, context);

server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java

@@ -1512,6 +1512,7 @@ public void testDocValuesFieldExistsForNumber() throws IOException {
             Map.of(),
             null,
             false,
+            null,
             null
         );
         docValuesFieldExistsTestCase(new ExistsQueryBuilder("f"), ft, true, i -> {
@@ -1534,6 +1535,7 @@ public void testDocValuesFieldExistsForNumberWithoutData() throws IOException {
                 Map.of(),
                 null,
                 false,
+                null,
                 null
             )
         );