From 5909f9f42f814e8b915a9f91b40861cf00b9373b Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Tue, 22 Jun 2021 18:34:18 +0300
Subject: [PATCH 01/17] Added dimension mapping parameter (WIP)

Added parameter to field types:
- Keyword
- IP
- Number
---
 .../index/mapper/IpFieldMapper.java           | 18 +++++++--
 .../index/mapper/KeywordFieldMapper.java      | 40 +++++++++++++------
 .../index/mapper/NumberFieldMapper.java       | 29 +++++++++++---
 .../index/mapper/TimeseriesParams.java        | 22 ++++++++++
 .../fielddata/IndexFieldDataServiceTests.java |  4 +-
 .../index/mapper/IpFieldMapperTests.java      | 35 ++++++++++++++++
 .../index/mapper/IpFieldTypeTests.java        |  6 ++-
 .../index/mapper/KeywordFieldMapperTests.java | 39 +++++++++++++++++-
 .../index/mapper/NumberFieldMapperTests.java  | 15 +++++++
 .../index/mapper/NumberFieldTypeTests.java    |  2 +-
 .../mapper/WholeNumberFieldMapperTests.java   | 14 +++++++
 .../aggregations/AggregatorBaseTests.java     |  3 +-
 .../bucket/filter/FiltersAggregatorTests.java |  6 ++-
 .../bucket/range/RangeAggregatorTests.java    |  9 +++--
 .../bucket/terms/TermsAggregatorTests.java    |  2 +-
 .../search/collapse/CollapseBuilderTests.java |  4 +-
 16 files changed, 211 insertions(+), 37 deletions(-)
 create mode 100644 server/src/main/java/org/elasticsearch/index/mapper/TimeseriesParams.java

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
index 677a0f9f7fb74..9230efa123c8a 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
@@ -72,6 +72,7 @@ public static class Builder extends FieldMapper.Builder {
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
+        private final Parameter<Boolean> dimension = TimeseriesParams.dimension(false, m -> toType(m).fieldType().isDimension());
 
         private final boolean ignoreMalformedByDefault;
         private final Version indexCreatedVersion;
@@ -124,14 +125,14 @@ private FieldValues<InetAddress> scriptValues() {
 
         @Override
         protected List<Parameter<?>> getParameters() {
-            return List.of(indexed, hasDocValues, stored, ignoreMalformed, nullValue, script, onScriptError, meta);
+            return List.of(indexed, hasDocValues, stored, ignoreMalformed, nullValue, script, onScriptError, meta, dimension);
         }
 
         @Override
         public IpFieldMapper build(ContentPath contentPath) {
             return new IpFieldMapper(name,
                 new IpFieldType(buildFullName(contentPath), indexed.getValue(), stored.getValue(),
-                    hasDocValues.getValue(), parseNullValue(), scriptValues(), meta.getValue()),
+                    hasDocValues.getValue(), parseNullValue(), scriptValues(), meta.getValue(), dimension.getValue()),
                 multiFieldsBuilder.build(this, contentPath), copyTo.build(), this);
         }
 
@@ -146,16 +147,18 @@ public static final class IpFieldType extends SimpleMappedFieldType {
 
         private final InetAddress nullValue;
         private final FieldValues<InetAddress> scriptValues;
+        private final boolean isDimension;
 
         public IpFieldType(String name, boolean indexed, boolean stored, boolean hasDocValues,
-                           InetAddress nullValue, FieldValues<InetAddress> scriptValues, Map<String, String> meta) {
+                           InetAddress nullValue, FieldValues<InetAddress> scriptValues, Map<String, String> meta, boolean isDimension) {
             super(name, indexed, stored, hasDocValues, TextSearchInfo.SIMPLE_MATCH_WITHOUT_TERMS, meta);
             this.nullValue = nullValue;
             this.scriptValues = scriptValues;
+            this.isDimension = isDimension;
         }
 
         public IpFieldType(String name) {
-            this(name, true, false, true, null, null, Collections.emptyMap());
+            this(name, true, false, true, null, null, Collections.emptyMap(), false);
         }
 
         @Override
@@ -364,6 +367,13 @@ public DocValueFormat docValueFormat(@Nullable String format, ZoneId timeZone) {
             }
             return DocValueFormat.IP;
         }
+
+        /**
+         * @return true if field has been marked as a dimension field
+         */
+        public boolean isDimension() {
+            return isDimension;
+        }
     }
 
     private final boolean indexed;
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
index 16a7d19f49174..75a19cde59b94 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -112,6 +112,7 @@ public static class Builder extends FieldMapper.Builder {
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
+        private final Parameter<Boolean> dimension = TimeseriesParams.dimension(false, m -> toType(m).fieldType().isDimension());
 
         private final IndexAnalyzers indexAnalyzers;
         private final ScriptCompiler scriptCompiler;
@@ -148,6 +149,11 @@ public Builder docValues(boolean hasDocValues) {
             return this;
         }
 
+        public Builder dimension(boolean dimension) {
+            this.dimension.setValue(dimension);
+            return this;
+        }
+
         private FieldValues<String> scriptValues() {
             if (script.get() == null) {
                 return null;
@@ -163,7 +169,7 @@ private FieldValues<String> scriptValues() {
         protected List<Parameter<?>> getParameters() {
             return List.of(indexed, hasDocValues, stored, nullValue, eagerGlobalOrdinals, ignoreAbove,
                 indexOptions, hasNorms, similarity, normalizer, splitQueriesOnWhitespace,
-                script, onScriptError, meta);
+                script, onScriptError, meta, dimension);
         }
 
         private KeywordFieldType buildFieldType(ContentPath contentPath, FieldType fieldType) {
@@ -209,6 +215,7 @@ public static final class KeywordFieldType extends StringFieldType {
         private final NamedAnalyzer normalizer;
         private final boolean eagerGlobalOrdinals;
         private final FieldValues<String> scriptValues;
+        private final boolean isDimension;
 
         public KeywordFieldType(String name, FieldType fieldType,
                                 NamedAnalyzer normalizer, NamedAnalyzer searchAnalyzer, NamedAnalyzer quoteAnalyzer,
@@ -224,6 +231,7 @@ public KeywordFieldType(String name, FieldType fieldType,
             this.ignoreAbove = builder.ignoreAbove.getValue();
             this.nullValue = builder.nullValue.getValue();
             this.scriptValues = builder.scriptValues();
+            this.isDimension = builder.dimension.getValue();
         }
 
         public KeywordFieldType(String name, boolean isSearchable, boolean hasDocValues, Map<String, String> meta) {
@@ -233,6 +241,7 @@ public KeywordFieldType(String name, boolean isSearchable, boolean hasDocValues,
             this.nullValue = null;
             this.eagerGlobalOrdinals = false;
             this.scriptValues = null;
+            this.isDimension = false;
         }
 
         public KeywordFieldType(String name) {
@@ -249,6 +258,7 @@ public KeywordFieldType(String name, FieldType fieldType) {
             this.nullValue = null;
             this.eagerGlobalOrdinals = false;
             this.scriptValues = null;
+            this.isDimension = false;
         }
 
         public KeywordFieldType(String name, NamedAnalyzer analyzer) {
@@ -258,6 +268,7 @@ public KeywordFieldType(String name, NamedAnalyzer analyzer) {
             this.nullValue = null;
             this.eagerGlobalOrdinals = false;
             this.scriptValues = null;
+            this.isDimension = false;
         }
 
         @Override
@@ -277,9 +288,9 @@ public TermsEnum getTerms(boolean caseInsensitive, String string, SearchExecutio
             a = MinimizationOperations.minimize(a, Integer.MAX_VALUE);
 
             CompiledAutomaton automaton = new CompiledAutomaton(a);
-            
+
             BytesRef searchBytes = searchAfter == null? null: new BytesRef(searchAfter);
-            
+
             if (automaton.type == AUTOMATON_TYPE.ALL) {
                 TermsEnum result = terms.iterator();
                 if (searchAfter != null) {
@@ -289,12 +300,12 @@ public TermsEnum getTerms(boolean caseInsensitive, String string, SearchExecutio
             }
             return terms.intersect(automaton, searchBytes);
         }
-        
+
         // Initialises with a seek to a given term but excludes that term
         // from any results. The problem it addresses is that termsEnum.seekCeil()
-        // would work but either leaves us positioned on the seek term (if it exists) or the 
-        // term after (if the seek term doesn't exist). That complicates any subsequent 
-        // iteration logic so this class simplifies the pagination use case. 
+        // would work but either leaves us positioned on the seek term (if it exists) or the
+        // term after (if the seek term doesn't exist). That complicates any subsequent
+        // iteration logic so this class simplifies the pagination use case.
         final class SearchAfterTermsEnum extends FilteredTermsEnum {
             private final BytesRef afterRef;
 
@@ -308,7 +319,7 @@ final class SearchAfterTermsEnum extends FilteredTermsEnum {
             protected AcceptStatus accept(BytesRef term) {
                 return term.equals(afterRef) ? AcceptStatus.NO : AcceptStatus.YES;
             }
-        }          
+        }
 
         @Override
         public String typeName() {
@@ -410,6 +421,12 @@ public int ignoreAbove() {
             return ignoreAbove;
         }
 
+        /**
+         * @return true if field has been marked as a dimension field
+         */
+        public boolean isDimension() {
+            return isDimension;
+        }
     }
 
     private final boolean indexed;
@@ -425,7 +442,7 @@ public int ignoreAbove() {
     private final Script script;
     private final FieldValues<String> scriptValues;
     private final ScriptCompiler scriptCompiler;
-
+    private final boolean dimension;
 
     private final IndexAnalyzers indexAnalyzers;
 
@@ -448,6 +465,7 @@ protected KeywordFieldMapper(String simpleName, FieldType fieldType, KeywordFiel
         this.scriptValues = builder.scriptValues();
         this.indexAnalyzers = builder.indexAnalyzers;
         this.scriptCompiler = builder.scriptCompiler;
+        this.dimension = builder.dimension.getValue();
     }
 
     @Override
@@ -530,8 +548,6 @@ protected String contentType() {
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(simpleName(), indexAnalyzers, scriptCompiler).init(this);
+        return new Builder(simpleName(), indexAnalyzers, scriptCompiler).dimension(dimension).init(this);
     }
-    
-    
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
index 99ac9d3ca446b..19730c818e185 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
@@ -81,6 +81,7 @@ public static class Builder extends FieldMapper.Builder {
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).builder.script.get());
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
+        private final Parameter<Boolean> dimension = TimeseriesParams.dimension(false, m -> toType(m).fieldType().isDimension());
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
 
@@ -94,6 +95,7 @@ public Builder(String name, NumberType type, ScriptCompiler compiler, Settings s
         public static Builder docValuesOnly(String name, NumberType type) {
             Builder builder = new Builder(name, type, ScriptCompiler.NONE, false, false);
             builder.indexed.setValue(false);
+            builder.dimension.setValue(false);
             return builder;
         }
 
@@ -130,9 +132,14 @@ private FieldValues<Number> scriptValues() {
             return type.compile(name, script.get(), scriptCompiler);
         }
 
+        public Builder dimension(boolean dimension) {
+            this.dimension.setValue(dimension);
+            return this;
+        }
+
         @Override
         protected List<Parameter<?>> getParameters() {
-            return List.of(indexed, hasDocValues, stored, ignoreMalformed, coerce, nullValue, script, onScriptError, meta);
+            return List.of(indexed, hasDocValues, stored, ignoreMalformed, coerce, nullValue, script, onScriptError, meta, dimension);
         }
 
         @Override
@@ -944,25 +951,27 @@ public static class NumberFieldType extends SimpleMappedFieldType {
         private final boolean coerce;
         private final Number nullValue;
         private final FieldValues<Number> scriptValues;
+        private final boolean isDimension;
 
         public NumberFieldType(String name, NumberType type, boolean isSearchable, boolean isStored,
                                boolean hasDocValues, boolean coerce, Number nullValue, Map<String, String> meta,
-                               FieldValues<Number> script) {
+                               FieldValues<Number> script, boolean isDimension) {
             super(name, isSearchable, isStored, hasDocValues, TextSearchInfo.SIMPLE_MATCH_WITHOUT_TERMS, meta);
             this.type = Objects.requireNonNull(type);
             this.coerce = coerce;
             this.nullValue = nullValue;
             this.scriptValues = script;
+            this.isDimension = isDimension;
         }
 
         NumberFieldType(String name, Builder builder) {
             this(name, builder.type, builder.indexed.getValue(), builder.stored.getValue(), builder.hasDocValues.getValue(),
                 builder.coerce.getValue().value(), builder.nullValue.getValue(), builder.meta.getValue(),
-                builder.scriptValues());
+                builder.scriptValues(), builder.dimension.getValue());
         }
 
         public NumberFieldType(String name, NumberType type) {
-            this(name, type, true, false, true, true, null, Collections.emptyMap(), null);
+            this(name, type, true, false, true, true, null, Collections.emptyMap(), null, false);
         }
 
         @Override
@@ -1055,6 +1064,13 @@ public Number parsePoint(byte[] value) {
         public CollapseType collapseType() {
             return CollapseType.NUMERIC;
         }
+
+        /**
+         * @return true if field has been marked as a dimension field
+         */
+        public boolean isDimension() {
+            return isDimension;
+        }
     }
 
     private final Builder builder;
@@ -1069,6 +1085,7 @@ public CollapseType collapseType() {
     private final FieldValues<Number> scriptValues;
     private final boolean ignoreMalformedByDefault;
     private final boolean coerceByDefault;
+    private final boolean dimension;
 
     private NumberFieldMapper(
             String simpleName,
@@ -1087,6 +1104,7 @@ private NumberFieldMapper(
         this.ignoreMalformedByDefault = builder.ignoreMalformed.getDefaultValue().value();
         this.coerceByDefault = builder.coerce.getDefaultValue().value();
         this.scriptValues = builder.scriptValues();
+        this.dimension = builder.dimension.getValue();
         this.builder = builder;
     }
 
@@ -1164,6 +1182,7 @@ protected void indexScriptValues(SearchLookup searchLookup, LeafReaderContext re
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(simpleName(), type, builder.scriptCompiler, ignoreMalformedByDefault, coerceByDefault).init(this);
+        return new Builder(simpleName(), type, builder.scriptCompiler, ignoreMalformedByDefault, coerceByDefault)
+            .dimension(dimension).init(this);
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TimeseriesParams.java b/server/src/main/java/org/elasticsearch/index/mapper/TimeseriesParams.java
new file mode 100644
index 0000000000000..5616985b7c77d
--- /dev/null
+++ b/server/src/main/java/org/elasticsearch/index/mapper/TimeseriesParams.java
@@ -0,0 +1,22 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.index.mapper;
+
+import java.util.function.Function;
+
+/**
+ * Utility functions for timeseries mapper parameters
+ */
+public final class TimeseriesParams {
+
+    public static FieldMapper.Parameter<Boolean> dimension(boolean defaultValue, Function<FieldMapper, Boolean> initializer) {
+        return FieldMapper.Parameter.boolParam("dimension", true, initializer, defaultValue)
+            .setMergeValidator((o, n, c) -> o == n || (o == false && n));  // dimensions can be updated from 'false' to 'true', not vv
+    }
+}
diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java
index 5e37a1b8e11c0..f855712ca240d 100644
--- a/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java
@@ -311,13 +311,13 @@ 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));
+            true, false, false, false, null, Collections.emptyMap(), null, false));
     }
 
     public void testRequireDocValuesOnDoubles() {
         doTestRequireDocValues(new NumberFieldMapper.NumberFieldType("field", NumberType.DOUBLE));
         doTestRequireDocValues(new NumberFieldMapper.NumberFieldType("field", NumberType.DOUBLE,
-            true, false, false, false, null, Collections.emptyMap(), null));
+            true, false, false, false, null, Collections.emptyMap(), null, false));
     }
 
     public void testRequireDocValuesOnBools() {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
index eab30ec17b0c9..9468e5b3bba12 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
@@ -26,6 +26,7 @@
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
 
 public class IpFieldMapperTests extends MapperTestCase {
 
@@ -47,6 +48,21 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         checker.registerConflictCheck("null_value", b -> b.field("null_value", "::1"));
         checker.registerUpdateCheck(b -> b.field("ignore_malformed", false),
             m -> assertFalse(((IpFieldMapper) m).ignoreMalformed()));
+
+        // dimension can be set from false to true, but not vice versa
+        checker.registerUpdateCheck(b -> b.field("dimension", true),
+            m -> assertEquals(true, ((IpFieldMapper)m).fieldType().isDimension()));
+        checker.registerUpdateCheck(b -> b.field("dimension", false),
+            m -> assertEquals(false, ((IpFieldMapper)m).fieldType().isDimension()));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }),
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", false);
+            }));
     }
 
     public void testExistsQueryDocValuesDisabled() throws IOException {
@@ -205,6 +221,25 @@ public void testNullValue() throws IOException {
         assertWarnings("Error parsing [:1] as IP in [null_value] on field [field]); [null_value] will be ignored");
     }
 
+    public void testEnableDimension() throws IOException {
+        MapperService mapperService = createMapperService(mapping(b -> {
+            b.startObject("field").field("type", "ip").endObject();
+            b.startObject("field_with_dimension").field("type", "ip").field("dimension", true).endObject();
+        }));
+        {
+            MappedFieldType fieldType = mapperService.fieldType("field");
+            assertThat(fieldType, instanceOf(IpFieldMapper.IpFieldType.class));
+            IpFieldMapper.IpFieldType ft = (IpFieldMapper.IpFieldType) fieldType;
+            assertFalse(ft.isDimension());
+        }
+        {
+            MappedFieldType fieldType = mapperService.fieldType("field_with_dimension");
+            assertThat(fieldType, instanceOf(IpFieldMapper.IpFieldType.class));
+            IpFieldMapper.IpFieldType ft = (IpFieldMapper.IpFieldType) fieldType;
+            assertTrue(ft.isDimension());
+        }
+    }
+
     @Override
     protected String generateRandomInputValue(MappedFieldType ft) {
         return NetworkAddress.format(randomIp(randomBoolean()));
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java
index ba659287796c9..54585af778150 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java
@@ -64,7 +64,8 @@ public void testTermQuery() {
         prefix = ip + "/16";
         assertEquals(InetAddressPoint.newPrefixQuery("field", InetAddresses.forString(ip), 16), ft.termQuery(prefix, null));
 
-        MappedFieldType unsearchable = new IpFieldMapper.IpFieldType("field", false, false, true, null, null, Collections.emptyMap());
+        MappedFieldType unsearchable = new IpFieldMapper.IpFieldType("field", false, false, true,
+            null, null, Collections.emptyMap(), false);
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
                 () -> unsearchable.termQuery("::1", null));
         assertEquals("Cannot search on field [field] since it is not indexed.", e.getMessage());
@@ -167,7 +168,8 @@ public void testRangeQuery() {
                         InetAddresses.forString("2001:db8::")),
                 ft.rangeQuery("::ffff:c0a8:107", "2001:db8::", true, true, null, null, null, null));
 
-        MappedFieldType unsearchable = new IpFieldMapper.IpFieldType("field", false, false, true, null, null, Collections.emptyMap());
+        MappedFieldType unsearchable = new IpFieldMapper.IpFieldType("field", false, false, true,
+            null, null, Collections.emptyMap(), false);
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
                 () -> unsearchable.rangeQuery("::1", "2001::", true, true, null, null, null, null));
         assertEquals("Cannot search on field [field] since it is not indexed.", e.getMessage());
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
index 3e0c733802829..b1361887f8ad5 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
@@ -101,6 +101,7 @@ public final void testExistsQueryDocValuesDisabledWithNorms() throws IOException
         assertParseMinimalWarnings();
     }
 
+
     @Override
     protected Collection<? extends Plugin> getPlugins() {
         return singletonList(new MockAnalysisPlugin());
@@ -167,15 +168,30 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         checker.registerConflictCheck("norms", b -> b.field("norms", true));
         checker.registerUpdateCheck(
             b -> {
-                b.field("type", "keyword");
+                minimalMapping(b);
                 b.field("norms", true);
             },
             b -> {
-                b.field("type", "keyword");
+                minimalMapping(b);
                 b.field("norms", false);
             },
             m -> assertFalse(m.fieldType().getTextSearchInfo().hasNorms())
         );
+
+        // dimension can be set from false to true, but not vice versa
+        checker.registerUpdateCheck(b -> b.field("dimension", true),
+            m -> assertEquals(true, ((KeywordFieldMapper)m).fieldType().isDimension()));
+        checker.registerUpdateCheck(b -> b.field("dimension", false),
+            m -> assertEquals(false, ((KeywordFieldMapper)m).fieldType().isDimension()));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                b.field("type", "keyword");
+                b.field("dimension", true);
+            }),
+            fieldMapping(b -> {
+                b.field("type", "keyword");
+                b.field("dimension", false);
+            }));
     }
 
     public void testDefaults() throws Exception {
@@ -292,6 +308,25 @@ public void testEnableNorms() throws IOException {
         assertEquals(0, fieldNamesFields.length);
     }
 
+    public void testEnableDimension() throws IOException {
+        MapperService mapperService = createMapperService(mapping(b -> {
+            b.startObject("field").field("type", "keyword").endObject();
+            b.startObject("field_with_dimension").field("type", "keyword").field("dimension", true).endObject();
+        }));
+        {
+            MappedFieldType fieldType = mapperService.fieldType("field");
+            assertThat(fieldType, instanceOf(KeywordFieldMapper.KeywordFieldType.class));
+            KeywordFieldMapper.KeywordFieldType ft = (KeywordFieldMapper.KeywordFieldType) fieldType;
+            assertFalse(ft.isDimension());
+        }
+        {
+            MappedFieldType fieldType = mapperService.fieldType("field_with_dimension");
+            assertThat(fieldType, instanceOf(KeywordFieldMapper.KeywordFieldType.class));
+            KeywordFieldMapper.KeywordFieldType ft = (KeywordFieldMapper.KeywordFieldType) fieldType;
+            assertTrue(ft.isDimension());
+        }
+    }
+
     public void testConfigureSimilarity() throws IOException {
         MapperService mapperService = createMapperService(
             fieldMapping(b -> b.field("type", "keyword").field("similarity", "boolean"))
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
index 6a4497c4945fb..95590a128a524 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
@@ -70,6 +70,21 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
                 },
                 m -> assertThat((m).onScriptError, equalTo("continue")));
         }
+
+        // dimension can be set from false to true, but not vice versa
+        checker.registerUpdateCheck(b -> b.field("dimension", true),
+            m -> assertEquals(true, ((NumberFieldMapper)m).fieldType().isDimension()));
+        checker.registerUpdateCheck(b -> b.field("dimension", false),
+            m -> assertEquals(false, ((NumberFieldMapper)m).fieldType().isDimension()));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }),
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", false);
+            }));
     }
 
     @Override
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java
index 6ada2959a1250..f4ce2f36bdfb7 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java
@@ -122,7 +122,7 @@ public void testLongTermQueryWithDecimalPart() {
     }
 
     private static MappedFieldType unsearchable() {
-        return new NumberFieldType("field", NumberType.LONG, false, false, true, true, null, Collections.emptyMap(), null);
+        return new NumberFieldType("field", NumberType.LONG, false, false, true, true, null, Collections.emptyMap(), null, false);
     }
 
     public void testTermQuery() {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
index 9db91fcef4458..e1f11b8301602 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
@@ -12,6 +12,8 @@
 
 import java.io.IOException;
 
+import static org.hamcrest.Matchers.instanceOf;
+
 public abstract class WholeNumberFieldMapperTests extends NumberFieldMapperTests {
 
     protected void testDecimalCoerce() throws IOException {
@@ -22,4 +24,16 @@ protected void testDecimalCoerce() throws IOException {
         assertEquals(7, pointField.numericValue().doubleValue(), 0d);
     }
 
+    public void testDimension() throws IOException {
+        MapperService mapperService = createMapperService(fieldMapping(b -> {
+            minimalMapping(b);
+            b.field("dimension", true);
+        }));
+
+        MappedFieldType fieldType = mapperService.fieldType("field");
+        assertThat(fieldType, instanceOf(NumberFieldMapper.NumberFieldType.class));
+        NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) fieldType;
+        assertTrue(ft.isDimension());
+    }
+
 }
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java
index 25974d55bcbf8..066195b7939ec 100644
--- a/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java
+++ b/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java
@@ -80,7 +80,8 @@ private ValuesSourceConfig getVSConfig(
         AggregationContext context
     ) {
         MappedFieldType ft
-            = new NumberFieldMapper.NumberFieldType(fieldName, numType, indexed, false, true, false, null, Collections.emptyMap(), null);
+            = new NumberFieldMapper.NumberFieldType(fieldName, numType, indexed, false, true, false,
+            null, Collections.emptyMap(), null, false);
         return ValuesSourceConfig.resolveFieldOnly(ft, context);
     }
 
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java
index fac02b595c8cf..cff81454aa9bd 100644
--- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java
+++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java
@@ -855,7 +855,8 @@ public void testDocValuesFieldExistsForNumber() throws IOException {
             true,
             null,
             Map.of(),
-            null
+            null,
+            false
         );
         docValuesFieldExistsTestCase(new ExistsQueryBuilder("f"), ft, true, i -> {
             return numberType.createFields("f", i, true, true, false);
@@ -872,7 +873,8 @@ public void testDocValuesFieldExistsForNumberWithoutData() throws IOException {
             true,
             null,
             Map.of(),
-            null
+            null,
+            false
         ));
     }
 
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java
index 3b2f35905d077..bf917ce9cd9e4 100644
--- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java
+++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java
@@ -141,7 +141,8 @@ public void testUnboundedRanges() throws IOException {
                 false,
                 null,
                 Collections.emptyMap(),
-                null
+                null,
+                false
             )
         );
     }
@@ -236,7 +237,8 @@ public void testNotFitIntoDouble() throws IOException {
             false,
             null,
             Collections.emptyMap(),
-            null
+            null,
+            false
         );
 
         long start = 2L << 54; // Double stores 53 bits of mantissa, so we aggregate a bunch of bigger values
@@ -467,7 +469,8 @@ private void testCase(Query query,
             false,
             null,
             Collections.emptyMap(),
-            null
+            null,
+            false
         );
         RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("test_range_agg");
         aggregationBuilder.field(NUMBER_FIELD_NAME);
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java
index 0b2786c02a54e..480d1478be580 100644
--- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java
+++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java
@@ -1085,7 +1085,7 @@ public void testGeoPointField() throws Exception {
 
     public void testIpField() throws Exception {
         MappedFieldType fieldType
-            = new IpFieldMapper.IpFieldType("field", randomBoolean(), false, true, null, null, Collections.emptyMap());
+            = new IpFieldMapper.IpFieldType("field", randomBoolean(), false, true, null, null, Collections.emptyMap(), false);
         testCase(new TermsAggregationBuilder("_name").field("field"), new MatchAllDocsQuery(), iw -> {
             Document document = new Document();
             InetAddress point = InetAddresses.forString("192.168.100.42");
diff --git a/server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java b/server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java
index aba60f06d7cb1..811fad16fb2d4 100644
--- a/server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java
+++ b/server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java
@@ -145,14 +145,14 @@ public void testBuild() throws IOException {
 
             numberFieldType =
                 new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.LONG, true, false,
-                    false, false, null, Collections.emptyMap(), null);
+                    false, false, null, Collections.emptyMap(), null, false);
             when(searchExecutionContext.getFieldType("field")).thenReturn(numberFieldType);
             IllegalArgumentException exc = expectThrows(IllegalArgumentException.class, () -> builder.build(searchExecutionContext));
             assertEquals(exc.getMessage(), "cannot collapse on field `field` without `doc_values`");
 
             numberFieldType =
                 new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.LONG, false, false,
-                    true, false, null, Collections.emptyMap(), null);
+                    true, false, null, Collections.emptyMap(), null, false);
             when(searchExecutionContext.getFieldType("field")).thenReturn(numberFieldType);
             builder.setInnerHits(new InnerHitBuilder());
             exc = expectThrows(IllegalArgumentException.class, () -> builder.build(searchExecutionContext));

From 6d9c0f8a663f3c120528ecaebdf67c6e1916c517 Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Tue, 22 Jun 2021 22:51:55 +0300
Subject: [PATCH 02/17] Fix compilation error

---
 .../org/elasticsearch/index/mapper/TokenCountFieldMapper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java
index 793d60ffdfb9f..f526af95a0b73 100644
--- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java
@@ -77,7 +77,7 @@ static class TokenCountFieldType extends NumberFieldMapper.NumberFieldType {
 
         TokenCountFieldType(String name, boolean isSearchable, boolean isStored,
                             boolean hasDocValues, Number nullValue, Map<String, String> meta) {
-            super(name, NumberFieldMapper.NumberType.INTEGER, isSearchable, isStored, hasDocValues, false, nullValue, meta, null);
+            super(name, NumberFieldMapper.NumberType.INTEGER, isSearchable, isStored, hasDocValues, false, nullValue, meta, null, false);
         }
 
         @Override

From 217fb7237be88684ccc6785e0d6b6003adafbb7a Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Wed, 23 Jun 2021 00:07:03 +0300
Subject: [PATCH 03/17] Changed dimension param to be non-updatable

---
 .../index/mapper/IpFieldMapper.java           | 12 ++++++++--
 .../index/mapper/KeywordFieldMapper.java      |  3 ++-
 .../index/mapper/NumberFieldMapper.java       |  3 ++-
 .../index/mapper/TimeseriesParams.java        | 22 -------------------
 .../index/mapper/IpFieldMapperTests.java      | 17 +++++++++-----
 .../index/mapper/KeywordFieldMapperTests.java | 21 ++++++++++++------
 .../index/mapper/NumberFieldMapperTests.java  | 17 +++++++++-----
 7 files changed, 52 insertions(+), 43 deletions(-)
 delete mode 100644 server/src/main/java/org/elasticsearch/index/mapper/TimeseriesParams.java

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
index 9230efa123c8a..5dc7a6cea5c78 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
@@ -72,7 +72,8 @@ public static class Builder extends FieldMapper.Builder {
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
-        private final Parameter<Boolean> dimension = TimeseriesParams.dimension(false, m -> toType(m).fieldType().isDimension());
+        private final Parameter<Boolean> dimension
+            = Parameter.boolParam("dimension", false, m -> toType(m).dimension, false);
 
         private final boolean ignoreMalformedByDefault;
         private final Version indexCreatedVersion;
@@ -94,6 +95,11 @@ Builder nullValue(String nullValue) {
             return this;
         }
 
+        public Builder dimension(boolean dimension) {
+            this.dimension.setValue(dimension);
+            return this;
+        }
+
         private InetAddress parseNullValue() {
             String nullValueAsString = nullValue.getValue();
             if (nullValueAsString == null) {
@@ -380,6 +386,7 @@ public boolean isDimension() {
     private final boolean hasDocValues;
     private final boolean stored;
     private final boolean ignoreMalformed;
+    private final boolean dimension;
 
     private final InetAddress nullValue;
     private final String nullValueAsString;
@@ -409,6 +416,7 @@ private IpFieldMapper(
         this.script = builder.script.get();
         this.scriptValues = builder.scriptValues();
         this.scriptCompiler = builder.scriptCompiler;
+        this.dimension = builder.dimension.getValue();
     }
 
     boolean ignoreMalformed() {
@@ -478,7 +486,7 @@ protected void indexScriptValues(SearchLookup searchLookup, LeafReaderContext re
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(simpleName(), scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion).init(this);
+        return new Builder(simpleName(), scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion).dimension(dimension).init(this);
     }
 
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
index 5b181348dd2ef..71bccc9fbfaf7 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -112,7 +112,8 @@ public static class Builder extends FieldMapper.Builder {
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
-        private final Parameter<Boolean> dimension = TimeseriesParams.dimension(false, m -> toType(m).fieldType().isDimension());
+        private final Parameter<Boolean> dimension
+            = Parameter.boolParam("dimension", false, m -> toType(m).dimension, false);
 
         private final IndexAnalyzers indexAnalyzers;
         private final ScriptCompiler scriptCompiler;
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
index 19730c818e185..ae312cc6778ca 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
@@ -81,7 +81,8 @@ public static class Builder extends FieldMapper.Builder {
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).builder.script.get());
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
-        private final Parameter<Boolean> dimension = TimeseriesParams.dimension(false, m -> toType(m).fieldType().isDimension());
+        private final Parameter<Boolean> dimension
+            = Parameter.boolParam("dimension", false, m -> toType(m).dimension, false);
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
 
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TimeseriesParams.java b/server/src/main/java/org/elasticsearch/index/mapper/TimeseriesParams.java
deleted file mode 100644
index 5616985b7c77d..0000000000000
--- a/server/src/main/java/org/elasticsearch/index/mapper/TimeseriesParams.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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 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 or the Server
- * Side Public License, v 1.
- */
-
-package org.elasticsearch.index.mapper;
-
-import java.util.function.Function;
-
-/**
- * Utility functions for timeseries mapper parameters
- */
-public final class TimeseriesParams {
-
-    public static FieldMapper.Parameter<Boolean> dimension(boolean defaultValue, Function<FieldMapper, Boolean> initializer) {
-        return FieldMapper.Parameter.boolParam("dimension", true, initializer, defaultValue)
-            .setMergeValidator((o, n, c) -> o == n || (o == false && n));  // dimensions can be updated from 'false' to 'true', not vv
-    }
-}
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
index 9468e5b3bba12..400957a2fc89f 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
@@ -49,11 +49,18 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         checker.registerUpdateCheck(b -> b.field("ignore_malformed", false),
             m -> assertFalse(((IpFieldMapper) m).ignoreMalformed()));
 
-        // dimension can be set from false to true, but not vice versa
-        checker.registerUpdateCheck(b -> b.field("dimension", true),
-            m -> assertEquals(true, ((IpFieldMapper)m).fieldType().isDimension()));
-        checker.registerUpdateCheck(b -> b.field("dimension", false),
-            m -> assertEquals(false, ((IpFieldMapper)m).fieldType().isDimension()));
+        // dimension cannot be updated
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", false));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", false);
+            }),
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }));
         checker.registerConflictCheck("dimension",
             fieldMapping(b -> {
                 minimalMapping(b);
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
index 909d60b933a10..b7ebfbcf0cb60 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
@@ -178,18 +178,25 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
             m -> assertFalse(m.fieldType().getTextSearchInfo().hasNorms())
         );
 
-        // dimension can be set from false to true, but not vice versa
-        checker.registerUpdateCheck(b -> b.field("dimension", true),
-            m -> assertEquals(true, ((KeywordFieldMapper)m).fieldType().isDimension()));
-        checker.registerUpdateCheck(b -> b.field("dimension", false),
-            m -> assertEquals(false, ((KeywordFieldMapper)m).fieldType().isDimension()));
+        // dimension cannot be updated
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", false));
         checker.registerConflictCheck("dimension",
             fieldMapping(b -> {
-                b.field("type", "keyword");
+                minimalMapping(b);
+                b.field("dimension", false);
+            }),
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                minimalMapping(b);
                 b.field("dimension", true);
             }),
             fieldMapping(b -> {
-                b.field("type", "keyword");
+                minimalMapping(b);
                 b.field("dimension", false);
             }));
     }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
index 95590a128a524..2f079a523deb3 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
@@ -71,11 +71,18 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
                 m -> assertThat((m).onScriptError, equalTo("continue")));
         }
 
-        // dimension can be set from false to true, but not vice versa
-        checker.registerUpdateCheck(b -> b.field("dimension", true),
-            m -> assertEquals(true, ((NumberFieldMapper)m).fieldType().isDimension()));
-        checker.registerUpdateCheck(b -> b.field("dimension", false),
-            m -> assertEquals(false, ((NumberFieldMapper)m).fieldType().isDimension()));
+        // dimension cannot be updated
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", false));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", false);
+            }),
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }));
         checker.registerConflictCheck("dimension",
             fieldMapping(b -> {
                 minimalMapping(b);

From 70e2a596912966f105e485c751d8b8f124e44e43 Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Wed, 23 Jun 2021 01:04:28 +0300
Subject: [PATCH 04/17] Dimension param is not allowed for floats/doubles

---
 .../index/mapper/NumberFieldMapper.java       | 12 ++++-
 .../index/mapper/NumberFieldMapperTests.java  | 45 ++++++++++---------
 .../mapper/WholeNumberFieldMapperTests.java   | 28 ++++++++++++
 3 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
index ae312cc6778ca..3d124ff5ab6b0 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
@@ -51,6 +51,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -81,8 +82,8 @@ public static class Builder extends FieldMapper.Builder {
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).builder.script.get());
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
-        private final Parameter<Boolean> dimension
-            = Parameter.boolParam("dimension", false, m -> toType(m).dimension, false);
+        private final Parameter<Boolean> dimension;
+
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
 
@@ -112,6 +113,13 @@ public Builder(String name, NumberType type, ScriptCompiler compiler, boolean ig
             this.nullValue = new Parameter<>("null_value", false, () -> null,
                 (n, c, o) -> o == null ? null : type.parse(o, false), m -> toType(m).nullValue).acceptsNull();
 
+            this.dimension = Parameter.boolParam("dimension", false, m -> toType(m).dimension, false)
+                .setValidator(v -> {
+                    if (v && EnumSet.of(NumberType.INTEGER, NumberType.LONG, NumberType.BYTE, NumberType.SHORT).contains(type) == false) {
+                        throw new IllegalArgumentException("Parameter [dimension] cannot be set to numeric type [" + type.name + "]");
+                    }
+                });
+
             this.script.precludesParameters(ignoreMalformed, coerce, nullValue);
             addScriptValidation(script, indexed, hasDocValues);
         }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
index 2f079a523deb3..e4154f912276f 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
@@ -24,6 +24,7 @@
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
 
 public abstract class NumberFieldMapperTests extends MapperTestCase {
 
@@ -70,28 +71,6 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
                 },
                 m -> assertThat((m).onScriptError, equalTo("continue")));
         }
-
-        // dimension cannot be updated
-        checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
-        checker.registerConflictCheck("dimension", b -> b.field("dimension", false));
-        checker.registerConflictCheck("dimension",
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", false);
-            }),
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true);
-            }));
-        checker.registerConflictCheck("dimension",
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true);
-            }),
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", false);
-            }));
     }
 
     @Override
@@ -270,6 +249,28 @@ public void testOutOfRangeValues() throws IOException {
         }
     }
 
+    public void testDimension() throws IOException {
+        MapperService mapperService = createMapperService(fieldMapping(b -> {
+            minimalMapping(b);
+            b.field("dimension", false);
+        }));
+
+        MappedFieldType fieldType = mapperService.fieldType("field");
+        assertThat(fieldType, instanceOf(NumberFieldMapper.NumberFieldType.class));
+        NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) fieldType;
+        assertFalse(ft.isDimension());
+
+        try {
+            createMapperService(fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }));
+            fail("Mapper parsing exception expected for non-integer numeric with dimension parameter set");
+        } catch (MapperParsingException e) {
+            assertThat(e.getCause().getMessage(), containsString("Parameter [dimension] cannot be set"));
+        }
+    }
+
     @Override
     protected final Object generateRandomInputValue(MappedFieldType ft) {
         Number n = randomNumber();
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
index e1f11b8301602..c0307750e2c8f 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
@@ -24,6 +24,7 @@ protected void testDecimalCoerce() throws IOException {
         assertEquals(7, pointField.numericValue().doubleValue(), 0d);
     }
 
+    @Override
     public void testDimension() throws IOException {
         MapperService mapperService = createMapperService(fieldMapping(b -> {
             minimalMapping(b);
@@ -36,4 +37,31 @@ public void testDimension() throws IOException {
         assertTrue(ft.isDimension());
     }
 
+    @Override
+    protected void registerParameters(ParameterChecker checker) throws IOException {
+        super.registerParameters(checker);
+
+        // dimension cannot be updated
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", false));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", false);
+            }),
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }),
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", false);
+            }));
+    }
+
 }

From b0a05d518b9729e88defb8f8eac5c2d78495e710 Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Wed, 23 Jun 2021 10:17:21 +0300
Subject: [PATCH 05/17] Fix build error

---
 .../elasticsearch/benchmark/script/ScriptScoreBenchmark.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/src/main/java/org/elasticsearch/benchmark/script/ScriptScoreBenchmark.java b/benchmarks/src/main/java/org/elasticsearch/benchmark/script/ScriptScoreBenchmark.java
index d0308d2166bfa..430a212c5e9b3 100644
--- a/benchmarks/src/main/java/org/elasticsearch/benchmark/script/ScriptScoreBenchmark.java
+++ b/benchmarks/src/main/java/org/elasticsearch/benchmark/script/ScriptScoreBenchmark.java
@@ -79,7 +79,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))
+        Map.entry("n", new NumberFieldType("n", NumberType.LONG, false, false, true, true, null, Map.of(), null, false))
     );
     private final IndexFieldDataCache fieldDataCache = new IndexFieldDataCache.None();
     private final CircuitBreakerService breakerService = new NoneCircuitBreakerService();

From 9625dadbbbe3e60ccd8596e67231223f45b5fdc2 Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Wed, 23 Jun 2021 11:50:03 +0300
Subject: [PATCH 06/17] Added docs

---
 docs/reference/mapping/types/ip.asciidoc      | 5 +++++
 docs/reference/mapping/types/keyword.asciidoc | 5 +++++
 docs/reference/mapping/types/numeric.asciidoc | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/docs/reference/mapping/types/ip.asciidoc b/docs/reference/mapping/types/ip.asciidoc
index 322c58fad96ff..8f82f5a7de2b1 100644
--- a/docs/reference/mapping/types/ip.asciidoc
+++ b/docs/reference/mapping/types/ip.asciidoc
@@ -45,6 +45,11 @@ The following parameters are accepted by `ip` fields:
 
 [horizontal]
 
+<<dimension,`dimension`>>::
+
+    This parameter marks the field as a time series dimension field. Accepts
+    `true` or `false` (default).
+
 <<doc-values,`doc_values`>>::
 
     Should the field be stored on disk in a column-stride fashion, so that it
diff --git a/docs/reference/mapping/types/keyword.asciidoc b/docs/reference/mapping/types/keyword.asciidoc
index b32c04d43ef79..60567b2fcb920 100644
--- a/docs/reference/mapping/types/keyword.asciidoc
+++ b/docs/reference/mapping/types/keyword.asciidoc
@@ -56,6 +56,11 @@ The following parameters are accepted by `keyword` fields:
 
 [horizontal]
 
+<<dimension,`dimension`>>::
+
+    This parameter marks the field as a time series dimension field. Accepts
+    `true` or `false` (default).
+
 <<doc-values,`doc_values`>>::
 
     Should the field be stored on disk in a column-stride fashion, so that it
diff --git a/docs/reference/mapping/types/numeric.asciidoc b/docs/reference/mapping/types/numeric.asciidoc
index 0389900ae5114..f6d76b61a089b 100644
--- a/docs/reference/mapping/types/numeric.asciidoc
+++ b/docs/reference/mapping/types/numeric.asciidoc
@@ -119,6 +119,12 @@ The following parameters are accepted by numeric types:
     Accepts `true` (default) and `false`. Not applicable for `unsigned_long`.
     Note that this cannot be set if the `script` parameter is used.
 
+<<dimension,`dimension`>>::
+
+    This parameter marks the field as a time series dimension field. Accepts
+    `true` or `false` (default). This parameter can be set only for fields
+    of type `byte`, `short`, `integer` and `long`.
+
 <<doc-values,`doc_values`>>::
 
     Should the field be stored on disk in a column-stride fashion, so that it

From 0409086da4ed20f39a0c4c6d849038941861c218 Mon Sep 17 00:00:00 2001
From: Christos Soulios <1561376+csoulios@users.noreply.github.com>
Date: Wed, 23 Jun 2021 17:16:52 +0300
Subject: [PATCH 07/17] Update docs/reference/mapping/types/keyword.asciidoc

Co-authored-by: James Rodewig <40268737+jrodewig@users.noreply.github.com>
---
 docs/reference/mapping/types/keyword.asciidoc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/reference/mapping/types/keyword.asciidoc b/docs/reference/mapping/types/keyword.asciidoc
index 60567b2fcb920..7d26552d9acd7 100644
--- a/docs/reference/mapping/types/keyword.asciidoc
+++ b/docs/reference/mapping/types/keyword.asciidoc
@@ -56,10 +56,10 @@ The following parameters are accepted by `keyword` fields:
 
 [horizontal]
 
-<<dimension,`dimension`>>::
+`dimension`::
 
-    This parameter marks the field as a time series dimension field. Accepts
-    `true` or `false` (default).
+    Marks the field as a time series dimension. Accepts `true` or `false`
+    (default).
 
 <<doc-values,`doc_values`>>::
 
@@ -157,4 +157,3 @@ The following parameters are accepted by `keyword` fields:
 include::constant-keyword.asciidoc[]
 
 include::wildcard.asciidoc[]
-

From 3bbdd815fc3e4c069a79672d4cb931e07a3b798f Mon Sep 17 00:00:00 2001
From: Christos Soulios <1561376+csoulios@users.noreply.github.com>
Date: Wed, 23 Jun 2021 17:17:11 +0300
Subject: [PATCH 08/17] Update docs/reference/mapping/types/numeric.asciidoc

Co-authored-by: James Rodewig <40268737+jrodewig@users.noreply.github.com>
---
 docs/reference/mapping/types/numeric.asciidoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/reference/mapping/types/numeric.asciidoc b/docs/reference/mapping/types/numeric.asciidoc
index f6d76b61a089b..42a0b2b9721df 100644
--- a/docs/reference/mapping/types/numeric.asciidoc
+++ b/docs/reference/mapping/types/numeric.asciidoc
@@ -119,11 +119,11 @@ The following parameters are accepted by numeric types:
     Accepts `true` (default) and `false`. Not applicable for `unsigned_long`.
     Note that this cannot be set if the `script` parameter is used.
 
-<<dimension,`dimension`>>::
+`dimension`::
 
-    This parameter marks the field as a time series dimension field. Accepts
-    `true` or `false` (default). This parameter can be set only for fields
-    of type `byte`, `short`, `integer` and `long`.
+    Marks the field as a time series dimension. Accepts `true` or `false`
+    (default). Only `byte`, `short`, `integer`, and `long` numeric fields
+    support this parameter.
 
 <<doc-values,`doc_values`>>::
 

From ba8338014170f1139515ecaad2443fc35b395f95 Mon Sep 17 00:00:00 2001
From: Christos Soulios <1561376+csoulios@users.noreply.github.com>
Date: Wed, 23 Jun 2021 17:17:19 +0300
Subject: [PATCH 09/17] Update docs/reference/mapping/types/ip.asciidoc

Co-authored-by: James Rodewig <40268737+jrodewig@users.noreply.github.com>
---
 docs/reference/mapping/types/ip.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/reference/mapping/types/ip.asciidoc b/docs/reference/mapping/types/ip.asciidoc
index 8f82f5a7de2b1..f28e1d983ab3c 100644
--- a/docs/reference/mapping/types/ip.asciidoc
+++ b/docs/reference/mapping/types/ip.asciidoc
@@ -45,10 +45,10 @@ The following parameters are accepted by `ip` fields:
 
 [horizontal]
 
-<<dimension,`dimension`>>::
+`dimension`::
 
-    This parameter marks the field as a time series dimension field. Accepts
-    `true` or `false` (default).
+    Marks the field as a time series dimension. Accepts `true` or `false`
+    (default).
 
 <<doc-values,`doc_values`>>::
 

From 6f81a2beb74d98dc53955df2dbe222f2ebc50670 Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Wed, 23 Jun 2021 17:16:13 +0300
Subject: [PATCH 10/17] For keyword fields dimension precludes ignore_above
 field

---
 .../index/mapper/KeywordFieldMapper.java            | 10 ++++++++--
 .../index/mapper/KeywordFieldMapperTests.java       | 13 +++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
index 71bccc9fbfaf7..2057107e7fe20 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -112,8 +112,7 @@ public static class Builder extends FieldMapper.Builder {
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
-        private final Parameter<Boolean> dimension
-            = Parameter.boolParam("dimension", false, m -> toType(m).dimension, false);
+        private final Parameter<Boolean> dimension;
 
         private final IndexAnalyzers indexAnalyzers;
         private final ScriptCompiler scriptCompiler;
@@ -124,6 +123,13 @@ public Builder(String name, IndexAnalyzers indexAnalyzers, ScriptCompiler script
             this.scriptCompiler = Objects.requireNonNull(scriptCompiler);
             this.script.precludesParameters(nullValue);
             addScriptValidation(script, indexed, hasDocValues);
+
+            this.dimension = Parameter.boolParam("dimension", false, m -> toType(m).dimension, false)
+                .setValidator(v -> {
+                    if (v && ignoreAbove.getValue() < ignoreAbove.getDefaultValue()) {
+                        throw new IllegalArgumentException("Field [dimension] cannot be set in conjunction with field [ignore_above]");
+                    }
+                });
         }
 
         public Builder(String name) {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
index b7ebfbcf0cb60..37cb9cb12e08f 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
@@ -340,6 +340,19 @@ public void testEnableDimension() throws IOException {
         }
     }
 
+    public void testEnableDimensionAndIgnoreAboce() throws IOException {
+        try {
+            createMapperService(fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true).field("ignore_above", 2048);
+            }));
+            fail("Mapper parsing exception expected with [dimension] and [ignore_above] parameters set");
+        } catch (MapperParsingException e) {
+            assertThat(e.getCause().getMessage(),
+                containsString("Field [dimension] cannot be set in conjunction with field [ignore_above]"));
+        }
+    }
+
     public void testConfigureSimilarity() throws IOException {
         MapperService mapperService = createMapperService(
             fieldMapping(b -> b.field("type", "keyword").field("similarity", "boolean"))

From a2861de51a7154fa03db34a52831d8ee422e2f62 Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Wed, 23 Jun 2021 19:12:30 +0300
Subject: [PATCH 11/17] Addressed reviewer comments

---
 .../index/mapper/KeywordFieldMapperTests.java | 20 ++++++-------
 .../index/mapper/NumberFieldMapperTests.java  | 25 ++++++-----------
 .../aggregations/AggregatorBaseTests.java     | 28 +++++++++++++++----
 3 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
index 37cb9cb12e08f..549cdcb16a054 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
@@ -321,7 +321,7 @@ public void testEnableNorms() throws IOException {
         assertEquals(0, fieldNamesFields.length);
     }
 
-    public void testEnableDimension() throws IOException {
+    public void testDimension() throws IOException {
         MapperService mapperService = createMapperService(mapping(b -> {
             b.startObject("field").field("type", "keyword").endObject();
             b.startObject("field_with_dimension").field("type", "keyword").field("dimension", true).endObject();
@@ -340,17 +340,13 @@ public void testEnableDimension() throws IOException {
         }
     }
 
-    public void testEnableDimensionAndIgnoreAboce() throws IOException {
-        try {
-            createMapperService(fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true).field("ignore_above", 2048);
-            }));
-            fail("Mapper parsing exception expected with [dimension] and [ignore_above] parameters set");
-        } catch (MapperParsingException e) {
-            assertThat(e.getCause().getMessage(),
-                containsString("Field [dimension] cannot be set in conjunction with field [ignore_above]"));
-        }
+    public void testDimensionAndIgnoreAbove() throws IOException {
+        Exception e = expectThrows(MapperParsingException.class, () -> createDocumentMapper(fieldMapping(b -> {
+            minimalMapping(b);
+            b.field("dimension", true).field("ignore_above", 2048);
+        })));
+        assertThat(e.getCause().getMessage(),
+            containsString("Field [dimension] cannot be set in conjunction with field [ignore_above]"));
     }
 
     public void testConfigureSimilarity() throws IOException {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
index e4154f912276f..0bf83548b9e2f 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
@@ -236,16 +236,11 @@ protected void testNullValue() throws IOException {
     }
 
     public void testOutOfRangeValues() throws IOException {
-
         for(OutOfRangeSpec item : outOfRangeSpecs()) {
             DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", item.type.typeName())));
-            try {
-                mapper.parse(source(item::write));
-                fail("Mapper parsing exception expected for [" + item.type + "] with value [" + item.value + "]");
-            } catch (MapperParsingException e) {
-                assertThat("Incorrect error message for [" + item.type + "] with value [" + item.value + "]",
-                    e.getCause().getMessage(), containsString(item.message));
-            }
+            Exception e = expectThrows(MapperParsingException.class, () -> mapper.parse(source(item::write)));
+            assertThat("Incorrect error message for [" + item.type + "] with value [" + item.value + "]",
+                e.getCause().getMessage(), containsString(item.message));
         }
     }
 
@@ -260,15 +255,11 @@ public void testDimension() throws IOException {
         NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) fieldType;
         assertFalse(ft.isDimension());
 
-        try {
-            createMapperService(fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true);
-            }));
-            fail("Mapper parsing exception expected for non-integer numeric with dimension parameter set");
-        } catch (MapperParsingException e) {
-            assertThat(e.getCause().getMessage(), containsString("Parameter [dimension] cannot be set"));
-        }
+        Exception e = expectThrows(MapperParsingException.class, () -> createDocumentMapper(fieldMapping(b -> {
+            minimalMapping(b);
+            b.field("dimension", true);
+        })));
+        assertThat(e.getCause().getMessage(), containsString("Parameter [dimension] cannot be set"));
     }
 
     @Override
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java
index 066195b7939ec..297e702cde6d2 100644
--- a/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java
+++ b/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java
@@ -79,9 +79,18 @@ private ValuesSourceConfig getVSConfig(
         boolean indexed,
         AggregationContext context
     ) {
-        MappedFieldType ft
-            = new NumberFieldMapper.NumberFieldType(fieldName, numType, indexed, false, true, false,
-            null, Collections.emptyMap(), null, false);
+        MappedFieldType ft = new NumberFieldMapper.NumberFieldType(
+            fieldName,
+            numType,
+            indexed,
+            false,
+            true,
+            false,
+            null,
+            Collections.emptyMap(),
+            null,
+            false
+        );
         return ValuesSourceConfig.resolveFieldOnly(ft, context);
     }
 
@@ -91,8 +100,17 @@ private ValuesSourceConfig getVSConfig(
         boolean indexed,
         AggregationContext context
     ) {
-        MappedFieldType ft = new DateFieldMapper.DateFieldType(fieldName, indexed, false, true,
-            DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER, resolution, null, null, Collections.emptyMap());
+        MappedFieldType ft = new DateFieldMapper.DateFieldType(
+            fieldName,
+            indexed,
+            false,
+            true,
+            DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER,
+            resolution,
+            null,
+            null,
+            Collections.emptyMap()
+        );
         return ValuesSourceConfig.resolveFieldOnly(ft, context);
     }
 

From 8cddae5cc4b12fe5fb39170042d48460a3e36dd1 Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Thu, 24 Jun 2021 15:13:40 +0300
Subject: [PATCH 12/17] Pull dimension tests up in MapperTestCase class

---
 .../index/mapper/KeywordFieldMapper.java      |  2 +-
 .../index/mapper/IpFieldMapperTests.java      | 50 ++++---------------
 .../index/mapper/KeywordFieldMapperTests.java | 49 ++++--------------
 .../index/mapper/NumberFieldMapperTests.java  | 16 +++---
 .../mapper/WholeNumberFieldMapperTests.java   | 37 +++-----------
 .../index/mapper/MapperTestCase.java          | 37 ++++++++++++++
 6 files changed, 71 insertions(+), 120 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
index 2057107e7fe20..a5c010764d0d9 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -127,7 +127,7 @@ public Builder(String name, IndexAnalyzers indexAnalyzers, ScriptCompiler script
             this.dimension = Parameter.boolParam("dimension", false, m -> toType(m).dimension, false)
                 .setValidator(v -> {
                     if (v && ignoreAbove.getValue() < ignoreAbove.getDefaultValue()) {
-                        throw new IllegalArgumentException("Field [dimension] cannot be set in conjunction with field [ignore_above]");
+                        throw new IllegalArgumentException("Field [ignore_above] cannot be set in conjunction with field [dimension]");
                     }
                 });
         }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
index 400957a2fc89f..1b3129ed057a2 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
@@ -26,7 +26,6 @@
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
 
 public class IpFieldMapperTests extends MapperTestCase {
 
@@ -49,27 +48,7 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         checker.registerUpdateCheck(b -> b.field("ignore_malformed", false),
             m -> assertFalse(((IpFieldMapper) m).ignoreMalformed()));
 
-        // dimension cannot be updated
-        checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
-        checker.registerConflictCheck("dimension", b -> b.field("dimension", false));
-        checker.registerConflictCheck("dimension",
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", false);
-            }),
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true);
-            }));
-        checker.registerConflictCheck("dimension",
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true);
-            }),
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", false);
-            }));
+        registerDimensionParameter(checker);
     }
 
     public void testExistsQueryDocValuesDisabled() throws IOException {
@@ -115,7 +94,6 @@ public void testNotIndexed() throws Exception {
     }
 
     public void testNoDocValues() throws Exception {
-
         DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> {
             b.field("type", "ip");
             b.field("doc_values", false);
@@ -139,7 +117,6 @@ public void testNoDocValues() throws Exception {
     }
 
     public void testStore() throws Exception {
-
         DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> {
             b.field("type", "ip");
             b.field("store", true);
@@ -228,23 +205,14 @@ public void testNullValue() throws IOException {
         assertWarnings("Error parsing [:1] as IP in [null_value] on field [field]); [null_value] will be ignored");
     }
 
-    public void testEnableDimension() throws IOException {
-        MapperService mapperService = createMapperService(mapping(b -> {
-            b.startObject("field").field("type", "ip").endObject();
-            b.startObject("field_with_dimension").field("type", "ip").field("dimension", true).endObject();
-        }));
-        {
-            MappedFieldType fieldType = mapperService.fieldType("field");
-            assertThat(fieldType, instanceOf(IpFieldMapper.IpFieldType.class));
-            IpFieldMapper.IpFieldType ft = (IpFieldMapper.IpFieldType) fieldType;
-            assertFalse(ft.isDimension());
-        }
-        {
-            MappedFieldType fieldType = mapperService.fieldType("field_with_dimension");
-            assertThat(fieldType, instanceOf(IpFieldMapper.IpFieldType.class));
-            IpFieldMapper.IpFieldType ft = (IpFieldMapper.IpFieldType) fieldType;
-            assertTrue(ft.isDimension());
-        }
+    public void testDimension() throws IOException {
+        // Test default setting
+        MapperService mapperService = createMapperService(fieldMapping(b -> minimalMapping(b)));
+        IpFieldMapper.IpFieldType ft = (IpFieldMapper.IpFieldType) mapperService.fieldType("field");
+        assertFalse(ft.isDimension());
+
+        assertDimension(true, t -> assertTrue(((IpFieldMapper.IpFieldType) t).isDimension()));
+        assertDimension(false, t -> assertFalse(((IpFieldMapper.IpFieldType) t).isDimension()));
     }
 
     @Override
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
index 549cdcb16a054..8099eb5ce6055 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
@@ -178,27 +178,7 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
             m -> assertFalse(m.fieldType().getTextSearchInfo().hasNorms())
         );
 
-        // dimension cannot be updated
-        checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
-        checker.registerConflictCheck("dimension", b -> b.field("dimension", false));
-        checker.registerConflictCheck("dimension",
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", false);
-            }),
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true);
-            }));
-        checker.registerConflictCheck("dimension",
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true);
-            }),
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", false);
-            }));
+        registerDimensionParameter(checker);
     }
 
     public void testDefaults() throws Exception {
@@ -322,31 +302,22 @@ public void testEnableNorms() throws IOException {
     }
 
     public void testDimension() throws IOException {
-        MapperService mapperService = createMapperService(mapping(b -> {
-            b.startObject("field").field("type", "keyword").endObject();
-            b.startObject("field_with_dimension").field("type", "keyword").field("dimension", true).endObject();
-        }));
-        {
-            MappedFieldType fieldType = mapperService.fieldType("field");
-            assertThat(fieldType, instanceOf(KeywordFieldMapper.KeywordFieldType.class));
-            KeywordFieldMapper.KeywordFieldType ft = (KeywordFieldMapper.KeywordFieldType) fieldType;
-            assertFalse(ft.isDimension());
-        }
-        {
-            MappedFieldType fieldType = mapperService.fieldType("field_with_dimension");
-            assertThat(fieldType, instanceOf(KeywordFieldMapper.KeywordFieldType.class));
-            KeywordFieldMapper.KeywordFieldType ft = (KeywordFieldMapper.KeywordFieldType) fieldType;
-            assertTrue(ft.isDimension());
-        }
+        // Test default setting
+        MapperService mapperService = createMapperService(fieldMapping(b -> minimalMapping(b)));
+        KeywordFieldMapper.KeywordFieldType ft = (KeywordFieldMapper.KeywordFieldType) mapperService.fieldType("field");
+        assertFalse(ft.isDimension());
+
+        assertDimension(true, t -> assertTrue(((KeywordFieldMapper.KeywordFieldType) t).isDimension()));
+        assertDimension(false, t -> assertFalse(((KeywordFieldMapper.KeywordFieldType) t).isDimension()));
     }
 
-    public void testDimensionAndIgnoreAbove() throws IOException {
+    public void testDimensionAndIgnoreAbove() {
         Exception e = expectThrows(MapperParsingException.class, () -> createDocumentMapper(fieldMapping(b -> {
             minimalMapping(b);
             b.field("dimension", true).field("ignore_above", 2048);
         })));
         assertThat(e.getCause().getMessage(),
-            containsString("Field [dimension] cannot be set in conjunction with field [ignore_above]"));
+            containsString("Field [ignore_above] cannot be set in conjunction with field [dimension]"));
     }
 
     public void testConfigureSimilarity() throws IOException {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
index 0bf83548b9e2f..911c9c1e65b95 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
@@ -24,7 +24,6 @@
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
 
 public abstract class NumberFieldMapperTests extends MapperTestCase {
 
@@ -245,16 +244,15 @@ public void testOutOfRangeValues() throws IOException {
     }
 
     public void testDimension() throws IOException {
-        MapperService mapperService = createMapperService(fieldMapping(b -> {
-            minimalMapping(b);
-            b.field("dimension", false);
-        }));
-
-        MappedFieldType fieldType = mapperService.fieldType("field");
-        assertThat(fieldType, instanceOf(NumberFieldMapper.NumberFieldType.class));
-        NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) fieldType;
+        // Test default setting
+        MapperService mapperService = createMapperService(fieldMapping(b -> minimalMapping(b)));
+        NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) mapperService.fieldType("field");
         assertFalse(ft.isDimension());
 
+        // dimension = false is allowed
+        assertDimension(false, t -> assertFalse(((NumberFieldMapper.NumberFieldType) t).isDimension()));
+
+        // dimension = true is not allowed
         Exception e = expectThrows(MapperParsingException.class, () -> createDocumentMapper(fieldMapping(b -> {
             minimalMapping(b);
             b.field("dimension", true);
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
index c0307750e2c8f..b92d87362bd04 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
@@ -12,8 +12,6 @@
 
 import java.io.IOException;
 
-import static org.hamcrest.Matchers.instanceOf;
-
 public abstract class WholeNumberFieldMapperTests extends NumberFieldMapperTests {
 
     protected void testDecimalCoerce() throws IOException {
@@ -26,15 +24,13 @@ protected void testDecimalCoerce() throws IOException {
 
     @Override
     public void testDimension() throws IOException {
-        MapperService mapperService = createMapperService(fieldMapping(b -> {
-            minimalMapping(b);
-            b.field("dimension", true);
-        }));
+        // Test default setting
+        MapperService mapperService = createMapperService(fieldMapping(b -> minimalMapping(b)));
+        NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) mapperService.fieldType("field");
+        assertFalse(ft.isDimension());
 
-        MappedFieldType fieldType = mapperService.fieldType("field");
-        assertThat(fieldType, instanceOf(NumberFieldMapper.NumberFieldType.class));
-        NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) fieldType;
-        assertTrue(ft.isDimension());
+        assertDimension(true, t -> assertTrue(((NumberFieldMapper.NumberFieldType) t).isDimension()));
+        assertDimension(false, t -> assertFalse(((NumberFieldMapper.NumberFieldType) t).isDimension()));
     }
 
     @Override
@@ -42,26 +38,7 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         super.registerParameters(checker);
 
         // dimension cannot be updated
-        checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
-        checker.registerConflictCheck("dimension", b -> b.field("dimension", false));
-        checker.registerConflictCheck("dimension",
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", false);
-            }),
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true);
-            }));
-        checker.registerConflictCheck("dimension",
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", true);
-            }),
-            fieldMapping(b -> {
-                minimalMapping(b);
-                b.field("dimension", false);
-            }));
+        registerDimensionParameter(checker);
     }
 
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
index 18b2e36cd8260..74a9a599de500 100644
--- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
@@ -171,6 +171,16 @@ protected static void assertNoDocValuesField(ParseContext.Document doc, String f
         }
     }
 
+    protected void assertDimension(boolean isDimension, Consumer<MappedFieldType> checker) throws IOException {
+        MapperService mapperService = createMapperService(fieldMapping(b -> {
+            minimalMapping(b);
+            b.field("dimension", isDimension);
+        }));
+
+        MappedFieldType fieldType = mapperService.fieldType("field");
+        checker.accept(fieldType);
+    }
+
     public final void testEmptyName() {
         MapperParsingException e = expectThrows(MapperParsingException.class, () -> createMapperService(mapping(b -> {
             b.startObject("");
@@ -528,6 +538,33 @@ protected String randomFetchTestFormat() {
         return null;
     }
 
+    /**
+     * Test that dimension parameter is not updateable
+     */
+    protected void registerDimensionParameter(ParameterChecker checker) throws IOException {
+        // dimension cannot be updated
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
+        checker.registerConflictCheck("dimension", b -> b.field("dimension", false));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", false);
+            }),
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }));
+        checker.registerConflictCheck("dimension",
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", true);
+            }),
+            fieldMapping(b -> {
+                minimalMapping(b);
+                b.field("dimension", false);
+            }));
+    }
+
     /**
      * Create a random {@code _source} value for this field. Must be compatible
      * with {@link XContentBuilder#value(Object)} and the field's parser.

From 4987bef34756721e270005251beb1e49e5bb46dd Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Thu, 24 Jun 2021 16:06:31 +0300
Subject: [PATCH 13/17] Tidy up assertDimension() tests

---
 .../elasticsearch/index/mapper/IpFieldMapperTests.java |  6 +++---
 .../index/mapper/KeywordFieldMapperTests.java          |  6 +++---
 .../index/mapper/NumberFieldMapperTests.java           |  2 +-
 .../index/mapper/WholeNumberFieldMapperTests.java      |  6 +++---
 .../org/elasticsearch/index/mapper/MapperTestCase.java | 10 ++++++----
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
index 1b3129ed057a2..76cb8a915bff8 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
@@ -48,7 +48,7 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         checker.registerUpdateCheck(b -> b.field("ignore_malformed", false),
             m -> assertFalse(((IpFieldMapper) m).ignoreMalformed()));
 
-        registerDimensionParameter(checker);
+        registerDimensionChecks(checker);
     }
 
     public void testExistsQueryDocValuesDisabled() throws IOException {
@@ -211,8 +211,8 @@ public void testDimension() throws IOException {
         IpFieldMapper.IpFieldType ft = (IpFieldMapper.IpFieldType) mapperService.fieldType("field");
         assertFalse(ft.isDimension());
 
-        assertDimension(true, t -> assertTrue(((IpFieldMapper.IpFieldType) t).isDimension()));
-        assertDimension(false, t -> assertFalse(((IpFieldMapper.IpFieldType) t).isDimension()));
+        assertDimension(true, IpFieldMapper.IpFieldType::isDimension);
+        assertDimension(false, IpFieldMapper.IpFieldType::isDimension);
     }
 
     @Override
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
index 8099eb5ce6055..92dcca91e47d9 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
@@ -178,7 +178,7 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
             m -> assertFalse(m.fieldType().getTextSearchInfo().hasNorms())
         );
 
-        registerDimensionParameter(checker);
+        registerDimensionChecks(checker);
     }
 
     public void testDefaults() throws Exception {
@@ -307,8 +307,8 @@ public void testDimension() throws IOException {
         KeywordFieldMapper.KeywordFieldType ft = (KeywordFieldMapper.KeywordFieldType) mapperService.fieldType("field");
         assertFalse(ft.isDimension());
 
-        assertDimension(true, t -> assertTrue(((KeywordFieldMapper.KeywordFieldType) t).isDimension()));
-        assertDimension(false, t -> assertFalse(((KeywordFieldMapper.KeywordFieldType) t).isDimension()));
+        assertDimension(true, KeywordFieldMapper.KeywordFieldType::isDimension);
+        assertDimension(false, KeywordFieldMapper.KeywordFieldType::isDimension);
     }
 
     public void testDimensionAndIgnoreAbove() {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
index 911c9c1e65b95..01ee8995e004c 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
@@ -250,7 +250,7 @@ public void testDimension() throws IOException {
         assertFalse(ft.isDimension());
 
         // dimension = false is allowed
-        assertDimension(false, t -> assertFalse(((NumberFieldMapper.NumberFieldType) t).isDimension()));
+        assertDimension(false, NumberFieldMapper.NumberFieldType::isDimension);
 
         // dimension = true is not allowed
         Exception e = expectThrows(MapperParsingException.class, () -> createDocumentMapper(fieldMapping(b -> {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
index b92d87362bd04..da8b37a662fdc 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/WholeNumberFieldMapperTests.java
@@ -29,8 +29,8 @@ public void testDimension() throws IOException {
         NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) mapperService.fieldType("field");
         assertFalse(ft.isDimension());
 
-        assertDimension(true, t -> assertTrue(((NumberFieldMapper.NumberFieldType) t).isDimension()));
-        assertDimension(false, t -> assertFalse(((NumberFieldMapper.NumberFieldType) t).isDimension()));
+        assertDimension(true, NumberFieldMapper.NumberFieldType::isDimension);
+        assertDimension(false, NumberFieldMapper.NumberFieldType::isDimension);
     }
 
     @Override
@@ -38,7 +38,7 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         super.registerParameters(checker);
 
         // dimension cannot be updated
-        registerDimensionParameter(checker);
+        registerDimensionChecks(checker);
     }
 
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
index 74a9a599de500..933b25db814f4 100644
--- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
@@ -46,6 +46,7 @@
 import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -171,14 +172,15 @@ protected static void assertNoDocValuesField(ParseContext.Document doc, String f
         }
     }
 
-    protected void assertDimension(boolean isDimension, Consumer<MappedFieldType> checker) throws IOException {
+    protected <T> void assertDimension(boolean isDimension, Function<T, Boolean> checker) throws IOException {
         MapperService mapperService = createMapperService(fieldMapping(b -> {
             minimalMapping(b);
             b.field("dimension", isDimension);
         }));
 
-        MappedFieldType fieldType = mapperService.fieldType("field");
-        checker.accept(fieldType);
+        @SuppressWarnings("unchecked") // Syntactic sugar in tests
+        T fieldType = (T) mapperService.fieldType("field");
+        assertThat(checker.apply(fieldType), equalTo(isDimension));
     }
 
     public final void testEmptyName() {
@@ -541,7 +543,7 @@ protected String randomFetchTestFormat() {
     /**
      * Test that dimension parameter is not updateable
      */
-    protected void registerDimensionParameter(ParameterChecker checker) throws IOException {
+    protected void registerDimensionChecks(ParameterChecker checker) throws IOException {
         // dimension cannot be updated
         checker.registerConflictCheck("dimension", b -> b.field("dimension", true));
         checker.registerConflictCheck("dimension", b -> b.field("dimension", false));

From a94fb108328ed40ee9e931ea304bbaa6663d1026 Mon Sep 17 00:00:00 2001
From: Christos Soulios <1561376+csoulios@users.noreply.github.com>
Date: Thu, 24 Jun 2021 16:09:03 +0300
Subject: [PATCH 14/17] Update docs/reference/mapping/types/ip.asciidoc

Co-authored-by: James Rodewig <40268737+jrodewig@users.noreply.github.com>
---
 docs/reference/mapping/types/ip.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/reference/mapping/types/ip.asciidoc b/docs/reference/mapping/types/ip.asciidoc
index f28e1d983ab3c..764ce6c514484 100644
--- a/docs/reference/mapping/types/ip.asciidoc
+++ b/docs/reference/mapping/types/ip.asciidoc
@@ -47,8 +47,8 @@ The following parameters are accepted by `ip` fields:
 
 `dimension`::
 
-    Marks the field as a time series dimension. Accepts `true` or `false`
-    (default).
+    For internal use only. Marks the field as a time series dimension in {kib}.
+    Accepts `true` or `false` (default).
 
 <<doc-values,`doc_values`>>::
 

From e1b7ae3cd63c156d72e0c63c5b19e26c32506652 Mon Sep 17 00:00:00 2001
From: Christos Soulios <1561376+csoulios@users.noreply.github.com>
Date: Thu, 24 Jun 2021 16:09:19 +0300
Subject: [PATCH 15/17] Update docs/reference/mapping/types/numeric.asciidoc

Co-authored-by: James Rodewig <40268737+jrodewig@users.noreply.github.com>
---
 docs/reference/mapping/types/numeric.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/reference/mapping/types/numeric.asciidoc b/docs/reference/mapping/types/numeric.asciidoc
index 42a0b2b9721df..ed1866b8dec76 100644
--- a/docs/reference/mapping/types/numeric.asciidoc
+++ b/docs/reference/mapping/types/numeric.asciidoc
@@ -121,9 +121,9 @@ The following parameters are accepted by numeric types:
 
 `dimension`::
 
-    Marks the field as a time series dimension. Accepts `true` or `false`
-    (default). Only `byte`, `short`, `integer`, and `long` numeric fields
-    support this parameter.
+    For internal use only. Marks the field as a time series dimension in {kib}.
+    Accepts `true` or `false` (default). Only `byte`, `short`, `integer`, and
+    `long` numeric fields support this parameter.
 
 <<doc-values,`doc_values`>>::
 

From bb9836ef83a67bfe07bf9f602d8974e665ca3ae2 Mon Sep 17 00:00:00 2001
From: Christos Soulios <1561376+csoulios@users.noreply.github.com>
Date: Thu, 24 Jun 2021 16:09:34 +0300
Subject: [PATCH 16/17] Update docs/reference/mapping/types/keyword.asciidoc

Co-authored-by: James Rodewig <40268737+jrodewig@users.noreply.github.com>
---
 docs/reference/mapping/types/keyword.asciidoc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/reference/mapping/types/keyword.asciidoc b/docs/reference/mapping/types/keyword.asciidoc
index 7d26552d9acd7..e71ec122701c5 100644
--- a/docs/reference/mapping/types/keyword.asciidoc
+++ b/docs/reference/mapping/types/keyword.asciidoc
@@ -58,8 +58,9 @@ The following parameters are accepted by `keyword` fields:
 
 `dimension`::
 
-    Marks the field as a time series dimension. Accepts `true` or `false`
-    (default).
+    For internal use only. Marks the field as a time series dimension in {kib}.
+    Accepts `true` or `false` (default). If `true`, you cannot specify
+    `ignore_above` for the field.
 
 <<doc-values,`doc_values`>>::
 

From 6aa2d0408927490599dc9c784dd45c2d1d09d6ce Mon Sep 17 00:00:00 2001
From: Christos Soulios <csoulios@gmail.com>
Date: Thu, 24 Jun 2021 19:24:37 +0300
Subject: [PATCH 17/17] Revert documentation changes

---
 docs/reference/mapping/types/ip.asciidoc      | 5 -----
 docs/reference/mapping/types/keyword.asciidoc | 6 ------
 docs/reference/mapping/types/numeric.asciidoc | 6 ------
 3 files changed, 17 deletions(-)

diff --git a/docs/reference/mapping/types/ip.asciidoc b/docs/reference/mapping/types/ip.asciidoc
index 764ce6c514484..322c58fad96ff 100644
--- a/docs/reference/mapping/types/ip.asciidoc
+++ b/docs/reference/mapping/types/ip.asciidoc
@@ -45,11 +45,6 @@ The following parameters are accepted by `ip` fields:
 
 [horizontal]
 
-`dimension`::
-
-    For internal use only. Marks the field as a time series dimension in {kib}.
-    Accepts `true` or `false` (default).
-
 <<doc-values,`doc_values`>>::
 
     Should the field be stored on disk in a column-stride fashion, so that it
diff --git a/docs/reference/mapping/types/keyword.asciidoc b/docs/reference/mapping/types/keyword.asciidoc
index e71ec122701c5..b20ccf536f944 100644
--- a/docs/reference/mapping/types/keyword.asciidoc
+++ b/docs/reference/mapping/types/keyword.asciidoc
@@ -56,12 +56,6 @@ The following parameters are accepted by `keyword` fields:
 
 [horizontal]
 
-`dimension`::
-
-    For internal use only. Marks the field as a time series dimension in {kib}.
-    Accepts `true` or `false` (default). If `true`, you cannot specify
-    `ignore_above` for the field.
-
 <<doc-values,`doc_values`>>::
 
     Should the field be stored on disk in a column-stride fashion, so that it
diff --git a/docs/reference/mapping/types/numeric.asciidoc b/docs/reference/mapping/types/numeric.asciidoc
index ed1866b8dec76..0389900ae5114 100644
--- a/docs/reference/mapping/types/numeric.asciidoc
+++ b/docs/reference/mapping/types/numeric.asciidoc
@@ -119,12 +119,6 @@ The following parameters are accepted by numeric types:
     Accepts `true` (default) and `false`. Not applicable for `unsigned_long`.
     Note that this cannot be set if the `script` parameter is used.
 
-`dimension`::
-
-    For internal use only. Marks the field as a time series dimension in {kib}.
-    Accepts `true` or `false` (default). Only `byte`, `short`, `integer`, and
-    `long` numeric fields support this parameter.
-
 <<doc-values,`doc_values`>>::
 
     Should the field be stored on disk in a column-stride fashion, so that it