Use docvalue skippers on dimension fields

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

@@ -167,7 +167,7 @@ private static KeywordFieldMapper toType(FieldMapper in) {
 
     public static final class Builder extends FieldMapper.DimensionBuilder {
 
-        private final Parameter<Boolean> indexed = Parameter.indexParam(m -> toType(m).indexed, true);
+        private final Parameter<Boolean> indexed;
         private final Parameter<Boolean> hasDocValues = Parameter.docValuesParam(m -> toType(m).hasDocValues, true);
         private final Parameter<Boolean> stored = Parameter.storeParam(m -> toType(m).fieldType.stored(), false);
 
@@ -279,21 +279,20 @@ private Builder(
                 null
             ).acceptsNull();
             this.script.precludesParameters(nullValue);
-            addScriptValidation(script, indexed, hasDocValues);
 
             this.dimension = TimeSeriesParams.dimensionParam(m -> toType(m).fieldType().isDimension()).addValidator(v -> {
-                if (v && (indexed.getValue() == false || hasDocValues.getValue() == false)) {
+                if (v && (hasDocValues.getValue() == false)) {
                     throw new IllegalArgumentException(
                         "Field ["
                             + TimeSeriesParams.TIME_SERIES_DIMENSION_PARAM
                             + "] requires that ["
-                            + indexed.name
-                            + "] and ["
                             + hasDocValues.name
-                            + "] are true"
+                            + "] is true"
                     );
                 }
             }).precludesParameters(normalizer);
+            this.indexed = Parameter.indexParam(m -> toType(m).indexed, () -> this.dimension.get() == false);
+            addScriptValidation(script, indexed, hasDocValues);
             this.ignoreAboveDefault = ignoreAboveDefault;
             this.ignoreAbove = Parameter.ignoreAboveParam(m -> toType(m).fieldType().ignoreAbove().get(), ignoreAboveDefault);
             this.indexSortConfig = indexSortConfig;
@@ -457,7 +456,7 @@ private KeywordFieldType buildFieldType(MapperBuilderContext context, FieldType
         public KeywordFieldMapper build(MapperBuilderContext context) {
             FieldType fieldtype = resolveFieldType(
                 enableDocValuesSkipper,
-                forceDocValuesSkipper,
+                forceDocValuesSkipper || (this.dimension.get() && this.indexed.get() == false),
                 hasDocValues,
                 indexCreatedVersion,
                 indexSortConfig,

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

@@ -457,7 +457,7 @@ public void testDimensionIndexedAndDocvalues() {
             })));
             assertThat(
                 e.getCause().getMessage(),
-                containsString("Field [time_series_dimension] requires that [index] and [doc_values] are true")
+                containsString("Field [time_series_dimension] requires that [doc_values] is true")
             );
         }
         {
@@ -467,17 +467,7 @@ public void testDimensionIndexedAndDocvalues() {
             })));
             assertThat(
                 e.getCause().getMessage(),
-                containsString("Field [time_series_dimension] requires that [index] and [doc_values] are true")
-            );
-        }
-        {
-            Exception e = expectThrows(MapperParsingException.class, () -> createDocumentMapper(fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("time_series_dimension", true).field("index", false).field("doc_values", true);
-            })));
-            assertThat(
-                e.getCause().getMessage(),
-                containsString("Field [time_series_dimension] requires that [index] and [doc_values] are true")
+                containsString("Field [time_series_dimension] requires that [doc_values] is true")
             );
         }
     }