scaled_float field type

Author: martijnvg

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

@@ -134,21 +134,24 @@ public static class Builder extends FieldMapper.Builder {
         private final IndexMode indexMode;
         private final IndexVersion indexCreatedVersion;
         private final SourceKeepMode indexSourceKeepMode;
+        private final boolean indexDisabledByDefault;
 
         public Builder(
             String name,
             Settings settings,
             IndexMode indexMode,
             IndexVersion indexCreatedVersion,
-            SourceKeepMode indexSourceKeepMode
+            SourceKeepMode indexSourceKeepMode,
+            boolean indexDisabledByDefault
         ) {
             this(
                 name,
                 IGNORE_MALFORMED_SETTING.get(settings),
                 COERCE_SETTING.get(settings),
                 indexMode,
                 indexCreatedVersion,
-                indexSourceKeepMode
+                indexSourceKeepMode,
+                indexDisabledByDefault
             );
         }
 
@@ -158,7 +161,8 @@ public Builder(
             boolean coerceByDefault,
             IndexMode indexMode,
             IndexVersion indexCreatedVersion,
-            SourceKeepMode indexSourceKeepMode
+            SourceKeepMode indexSourceKeepMode,
+            boolean indexDisabledByDefault
         ) {
             super(name);
             this.ignoreMalformed = Parameter.explicitBoolParam(
@@ -170,6 +174,10 @@ public Builder(
             this.coerce = Parameter.explicitBoolParam("coerce", true, m -> toType(m).coerce, coerceByDefault);
             this.indexMode = indexMode;
             this.indexed = Parameter.indexParam(m -> toType(m).indexed, () -> {
+                if (indexDisabledByDefault) {
+                    return false;
+                }
+
                 if (indexMode == IndexMode.TIME_SERIES) {
                     var metricType = getMetric().getValue();
                     return metricType != TimeSeriesParams.MetricType.COUNTER && metricType != TimeSeriesParams.MetricType.GAUGE;
@@ -190,6 +198,7 @@ public Builder(
             });
             this.indexCreatedVersion = indexCreatedVersion;
             this.indexSourceKeepMode = indexSourceKeepMode;
+            this.indexDisabledByDefault = indexDisabledByDefault;
         }
 
         Builder scalingFactor(double scalingFactor) {
@@ -257,7 +266,8 @@ public ScaledFloatFieldMapper build(MapperBuilderContext context) {
             c.getSettings(),
             c.getIndexSettings().getMode(),
             c.indexVersionCreated(),
-            c.getIndexSettings().sourceKeepMode()
+            c.getIndexSettings().sourceKeepMode(),
+            c.getIndexSettings().isIndexDisabledByDefault()
         )
     );
 
@@ -592,6 +602,7 @@ public String toString() {
     private final IndexVersion indexCreatedVersion;
     private final String offsetsFieldName;
     private final SourceKeepMode indexSourceKeepMode;
+    private final boolean indexDisabledByDefault;
 
     private ScaledFloatFieldMapper(
         String simpleName,
@@ -617,6 +628,7 @@ private ScaledFloatFieldMapper(
         this.indexCreatedVersion = builder.indexCreatedVersion;
         this.offsetsFieldName = offsetsFieldName;
         this.indexSourceKeepMode = builder.indexSourceKeepMode;
+        this.indexDisabledByDefault = builder.indexDisabledByDefault;
     }
 
     boolean coerce() {
@@ -645,9 +657,15 @@ protected String contentType() {
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(leafName(), ignoreMalformedByDefault, coerceByDefault, indexMode, indexCreatedVersion, indexSourceKeepMode)
-            .metric(metricType)
-            .init(this);
+        return new Builder(
+            leafName(),
+            ignoreMalformedByDefault,
+            coerceByDefault,
+            indexMode,
+            indexCreatedVersion,
+            indexSourceKeepMode,
+            indexDisabledByDefault
+        ).metric(metricType).init(this);
     }
 
     @Override

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

@@ -222,17 +222,16 @@ public void testFieldData() throws IOException {
     }
 
     public void testFetchSourceValue() throws IOException {
-        MappedFieldType mapper = new ScaledFloatFieldMapper.Builder("field", false, false, null, null, null).scalingFactor(100)
+        MappedFieldType mapper = new ScaledFloatFieldMapper.Builder("field", false, false, null, null, null, false).scalingFactor(100)
             .build(MapperBuilderContext.root(false, false))
             .fieldType();
         assertEquals(List.of(3.14), fetchSourceValue(mapper, 3.1415926));
         assertEquals(List.of(3.14), fetchSourceValue(mapper, "3.1415"));
         assertEquals(List.of(), fetchSourceValue(mapper, ""));
 
-        MappedFieldType nullValueMapper = new ScaledFloatFieldMapper.Builder("field", false, false, null, null, null).scalingFactor(100)
-            .nullValue(2.71)
-            .build(MapperBuilderContext.root(false, false))
-            .fieldType();
+        MappedFieldType nullValueMapper = new ScaledFloatFieldMapper.Builder("field", false, false, null, null, null, false).scalingFactor(
+            100
+        ).nullValue(2.71).build(MapperBuilderContext.root(false, false)).fieldType();
         assertEquals(List.of(2.71), fetchSourceValue(nullValueMapper, ""));
     }
 }