Merge remote-tracking branch 'elastic/master' into 61034-fix

Author: original-brownbear

buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java

@@ -225,6 +225,7 @@ public Extracted getExtracted() {
         switch (getType()) {
             case DEB:
             case DOCKER:
+            case DOCKER_UBI:
             case RPM:
                 throw new UnsupportedOperationException(
                     "distribution type [" + getType() + "] for " + "elasticsearch distribution [" + name + "] cannot be extracted"

docs/reference/index.asciidoc

@@ -20,30 +20,30 @@ include::setup.asciidoc[]
 
 include::upgrade.asciidoc[]
 
+include::index-modules.asciidoc[]
+
+include::mapping.asciidoc[]
+
+include::analysis.asciidoc[]
+
 include::indices/index-templates.asciidoc[]
 
 include::data-streams/data-streams.asciidoc[]
 
+include::ingest.asciidoc[]
+
 include::search/search-your-data.asciidoc[]
 
 include::query-dsl.asciidoc[]
 
+include::aggregations.asciidoc[]
+
 include::eql/eql.asciidoc[]
 
 include::sql/index.asciidoc[]
 
-include::aggregations.asciidoc[]
-
 include::scripting.asciidoc[]
 
-include::mapping.asciidoc[]
-
-include::analysis.asciidoc[]
-
-include::index-modules.asciidoc[]
-
-include::ingest.asciidoc[]
-
 include::ilm/index.asciidoc[]
 
 ifdef::permanently-unreleased-branch[]

docs/reference/mapping/types/boolean.asciidoc

@@ -10,7 +10,7 @@ strings which are interpreted as either true or false:
 [horizontal]
 False values::
 
-    `false`, `"false"`
+    `false`, `"false"`, `""` (empty string)
 
 True values::
 

docs/reference/modules/indices/circuit_breaker.asciidoc

@@ -15,15 +15,15 @@ live cluster with the <<cluster-update-settings,cluster-update-settings>> API.
 The parent-level breaker can be configured with the following settings:
 
 `indices.breaker.total.use_real_memory`::
-
-    _Static_ setting determining whether the parent breaker should take real
+    (<<static-cluster-setting,Static>>)
+    Determines whether the parent breaker should take real
     memory usage into account (`true`) or only consider the amount that is
     reserved by child circuit breakers (`false`). Defaults to `true`.
 
 [[indices-breaker-total-limit]]
 // tag::indices-breaker-total-limit-tag[]
 `indices.breaker.total.limit` {ess-icon}::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     Starting limit for overall parent breaker. Defaults to 70% of JVM heap if
     `indices.breaker.total.use_real_memory` is `false`. If `indices.breaker.total.use_real_memory`
     is `true`, defaults to 95% of the JVM heap.
@@ -41,14 +41,14 @@ parameters:
 [[fielddata-circuit-breaker-limit]]
 // tag::fielddata-circuit-breaker-limit-tag[]
 `indices.breaker.fielddata.limit` {ess-icon}::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     Limit for fielddata breaker. Defaults to 40% of JVM heap.
 // end::fielddata-circuit-breaker-limit-tag[]
 
 [[fielddata-circuit-breaker-overhead]]
 // tag::fielddata-circuit-breaker-overhead-tag[]
 `indices.breaker.fielddata.overhead` {ess-icon}::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     A constant that all field data estimations are multiplied with to determine a
     final estimation. Defaults to `1.03`.
 // end::fielddata-circuit-breaker-overhead-tag[]
@@ -64,14 +64,14 @@ request) from exceeding a certain amount of memory.
 [[request-breaker-limit]]
 // tag::request-breaker-limit-tag[]
 `indices.breaker.request.limit` {ess-icon}::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     Limit for request breaker, defaults to 60% of JVM heap.
 // end::request-breaker-limit-tag[]
 
 [[request-breaker-overhead]]
 // tag::request-breaker-overhead-tag[]
 `indices.breaker.request.overhead` {ess-icon}::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     A constant that all request estimations are multiplied with to determine a
     final estimation. Defaults to `1`.
 // end::request-breaker-overhead-tag[]
@@ -87,12 +87,12 @@ circuit breaker also considers that memory is not only needed for representing t
 also as a structured object which is reflected by default overhead.
 
 `network.breaker.inflight_requests.limit`::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     Limit for in flight requests breaker, defaults to 100% of JVM heap. This means that it is bound
     by the limit configured for the parent circuit breaker.
 
 `network.breaker.inflight_requests.overhead`::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     A constant that all in flight requests estimations are multiplied with to determine a
     final estimation. Defaults to 2.
 
@@ -105,12 +105,12 @@ usage of things held in memory that are not released when a request is
 completed. This includes things like the Lucene segment memory.
 
 `indices.breaker.accounting.limit`::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     Limit for accounting breaker, defaults to 100% of JVM heap. This means that it is bound
     by the limit configured for the parent circuit breaker.
 
 `indices.breaker.accounting.overhead`::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     A constant that all accounting estimations are multiplied with to determine a
     final estimation. Defaults to 1
 
@@ -126,7 +126,7 @@ See the "prefer-parameters" section of the <<modules-scripting-using,scripting>>
 documentation for more information.
 
 `script.context.$CONTEXT.max_compilations_rate`::
-
+    (<<dynamic-cluster-setting,Dynamic>>)
     Limit for the number of unique dynamic scripts within a certain interval
     that are allowed to be compiled for a given context. Defaults to `75/5m`,
     meaning 75 every 5 minutes.

docs/reference/query-dsl/multi-match-query.asciidoc

@@ -500,9 +500,11 @@ per-term `blended` queries. It accepts:
 
 [horizontal]
 `0.0`::             Take the single best score out of (eg) `first_name:will`
-                    and `last_name:will` (*default*)
+                    and `last_name:will` (*default* for all `multi_match`
+                    query types except `bool_prefix` and `most_fields`)
 `1.0`::             Add together the scores for (eg) `first_name:will` and
-                    `last_name:will`
+                    `last_name:will` (*default* for the `bool_prefix` and
+                    `most_fields` `multi_match` query types)
 `0.0 < n < 1.0`::   Take the single best score plus +tie_breaker+ multiplied
                     by each of the scores from other matching fields.
 

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

@@ -181,11 +181,16 @@ private Float objectToFloat(Object value) {
     }
 
     @Override
-    protected Float parseSourceValue(Object value, String format) {
+    public ValueFetcher valueFetcher(MapperService mapperService, String format) {
         if (format != null) {
             throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
         }
-        return objectToFloat(value);
+        return new SourceValueFetcher(name(), mapperService, parsesArrayValue()) {
+            @Override
+            protected Float parseSourceValue(Object value) {
+                return objectToFloat(value);
+            }
+        };
     }
 
     @Override

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

@@ -160,11 +160,16 @@ protected void parseCreateField(ParseContext context) throws IOException {
     }
 
     @Override
-    protected Object parseSourceValue(Object value, String format) {
+    public ValueFetcher valueFetcher(MapperService mapperService, String format) {
         if (format != null) {
             throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
         }
-        return value;
+        return new SourceValueFetcher(name(), mapperService, parsesArrayValue()) {
+            @Override
+            protected Object parseSourceValue(Object value) {
+                return value;
+            }
+        };
     }
 
     @Override

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

@@ -356,11 +356,6 @@ protected ScaledFloatFieldMapper clone() {
         return (ScaledFloatFieldMapper) super.clone();
     }
 
-    @Override
-    protected Double nullValue() {
-        return nullValue;
-    }
-
     @Override
     protected void parseCreateField(ParseContext context) throws IOException {
 
@@ -480,25 +475,30 @@ private static double objectToDouble(Object value) {
     }
 
     @Override
-    protected Double parseSourceValue(Object value, String format) {
+    public ValueFetcher valueFetcher(MapperService mapperService, String format) {
         if (format != null) {
             throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
         }
+        return new SourceValueFetcher(name(), mapperService, parsesArrayValue()) {
+            @Override
+            protected Double parseSourceValue(Object value) {
+                double doubleValue;
+                if (value.equals("")) {
+                    if (nullValue == null) {
+                        return null;
+                    }
+                    doubleValue = nullValue;
+                } else {
+                    doubleValue = objectToDouble(value);
+                }
 
-        double doubleValue;
-        if (value.equals("")) {
-            if (nullValue == null) {
-                return null;
+                double scalingFactor = fieldType().getScalingFactor();
+                return Math.round(doubleValue * scalingFactor) / scalingFactor;
             }
-            doubleValue = nullValue;
-        } else {
-            doubleValue = objectToDouble(value);
-        }
-
-        double scalingFactor = fieldType().getScalingFactor();
-        return Math.round(doubleValue * scalingFactor) / scalingFactor;
+        };
     }
 
+
     private static class ScaledFloatIndexFieldData extends IndexNumericFieldData {
 
         private final IndexNumericFieldData scaledFieldData;

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

@@ -419,7 +419,7 @@ protected void parseCreateField(ParseContext context) {
         }
 
         @Override
-        protected Object parseSourceValue(Object value, String format) {
+        public ValueFetcher valueFetcher(MapperService mapperService, String format) {
             throw new UnsupportedOperationException();
         }
 
@@ -465,7 +465,7 @@ protected void mergeOptions(FieldMapper other, List<String> conflicts) {
         }
 
         @Override
-        protected Object parseSourceValue(Object value, String format) {
+        public ValueFetcher valueFetcher(MapperService mapperService, String format) {
             throw new UnsupportedOperationException();
         }
 
@@ -588,11 +588,8 @@ protected void parseCreateField(ParseContext context) throws IOException {
     }
 
     @Override
-    protected String parseSourceValue(Object value, String format) {
-        if (format != null) {
-            throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
-        }
-        return value.toString();
+    public ValueFetcher valueFetcher(MapperService mapperService, String format) {
+        throw new UnsupportedOperationException();
     }
 
     @Override

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

@@ -159,12 +159,17 @@ protected void parseCreateField(ParseContext context) throws IOException {
     }
 
     @Override
-    protected String parseSourceValue(Object value, String format) {
+    public ValueFetcher valueFetcher(MapperService mapperService, String format) {
         if (format != null) {
             throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
         }
 
-        return value.toString();
+        return new SourceValueFetcher(name(), mapperService, parsesArrayValue(), nullValue) {
+            @Override
+            protected String parseSourceValue(Object value) {
+                return value.toString();
+            }
+        };
     }
 
     /**