Merge remote-tracking branch 'origin/master' into feature/extensible-values-source

Note: mutes AggregatorTestCase#testSupportedFieldTypes() temporarily,
as the fix will require a bit more work than I'm comfortable
doing in a merge commit.

Author: polyfractal

client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java

@@ -1106,21 +1106,25 @@ public void testGetAliasesNonExistentIndexOrAlias() throws IOException {
                     highLevelClient().indices()::getAliasAsync);
             assertThat(getAliasesResponse.status(), equalTo(RestStatus.NOT_FOUND));
             assertThat(getAliasesResponse.getError(), equalTo("alias [" + alias + "] missing"));
+            assertThat(getAliasesResponse.getException(), nullValue());
         }
         createIndex(index, Settings.EMPTY);
         client().performRequest(new Request(HttpPut.METHOD_NAME, index + "/_alias/" + alias));
         {
             GetAliasesRequest getAliasesRequest = new GetAliasesRequest().indices(index, "non_existent_index");
             GetAliasesResponse getAliasesResponse = execute(getAliasesRequest, highLevelClient().indices()::getAlias,
                     highLevelClient().indices()::getAliasAsync);
+            assertThat(getAliasesResponse.getAliases().size(), equalTo(0));
             assertThat(getAliasesResponse.status(), equalTo(RestStatus.NOT_FOUND));
+            assertThat(getAliasesResponse.getError(), nullValue());
             assertThat(getAliasesResponse.getException().getMessage(),
                     equalTo("Elasticsearch exception [type=index_not_found_exception, reason=no such index [non_existent_index]]"));
         }
         {
             GetAliasesRequest getAliasesRequest = new GetAliasesRequest().indices(index, "non_existent_index").aliases(alias);
             GetAliasesResponse getAliasesResponse = execute(getAliasesRequest, highLevelClient().indices()::getAlias,
                     highLevelClient().indices()::getAliasAsync);
+            assertThat(getAliasesResponse.getAliases().size(), equalTo(0));
             assertThat(getAliasesResponse.status(), equalTo(RestStatus.NOT_FOUND));
             assertThat(getAliasesResponse.getException().getMessage(),
                     equalTo("Elasticsearch exception [type=index_not_found_exception, reason=no such index [non_existent_index]]"));
@@ -1129,13 +1133,17 @@ public void testGetAliasesNonExistentIndexOrAlias() throws IOException {
             GetAliasesRequest getAliasesRequest = new GetAliasesRequest().indices("non_existent_index*");
             GetAliasesResponse getAliasesResponse = execute(getAliasesRequest, highLevelClient().indices()::getAlias,
                     highLevelClient().indices()::getAliasAsync);
+            assertThat(getAliasesResponse.status(), equalTo(RestStatus.OK));
             assertThat(getAliasesResponse.getAliases().size(), equalTo(0));
+            assertThat(getAliasesResponse.getException(), nullValue());
+            assertThat(getAliasesResponse.getError(), nullValue());
         }
         {
             GetAliasesRequest getAliasesRequest = new GetAliasesRequest().indices(index).aliases(alias, "non_existent_alias");
             GetAliasesResponse getAliasesResponse = execute(getAliasesRequest, highLevelClient().indices()::getAlias,
                     highLevelClient().indices()::getAliasAsync);
             assertThat(getAliasesResponse.status(), equalTo(RestStatus.NOT_FOUND));
+            assertThat(getAliasesResponse.getError(), equalTo("alias [non_existent_alias] missing"));
 
             assertThat(getAliasesResponse.getAliases().size(), equalTo(1));
             assertThat(getAliasesResponse.getAliases().get(index).size(), equalTo(1));
@@ -1155,6 +1163,13 @@ public void testGetAliasesNonExistentIndexOrAlias() throws IOException {
             }
             */
         }
+        {
+            GetAliasesRequest getAliasesRequest = new GetAliasesRequest().aliases("non_existent_alias*");
+            GetAliasesResponse getAliasesResponse = execute(getAliasesRequest, highLevelClient().indices()::getAlias,
+                highLevelClient().indices()::getAliasAsync);
+            assertThat(getAliasesResponse.status(), equalTo(RestStatus.OK));
+            assertThat(getAliasesResponse.getAliases().size(), equalTo(0));
+        }
     }
 
     public void testIndexPutSettings() throws IOException {

client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java

@@ -109,6 +109,7 @@
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.nullValue;
 
 /**
  * This class is used to generate the Java Indices API documentation.
@@ -1909,8 +1910,17 @@ public void testGetAlias() throws Exception {
             Map<String, Set<AliasMetaData>> aliases = response.getAliases(); // <1>
             // end::get-alias-response
 
+            // tag::get-alias-response-error
+            RestStatus status = response.status(); // <1>
+            ElasticsearchException exception = response.getException(); // <2>
+            String error = response.getError(); // <3>
+            // end::get-alias-response-error
+
             assertThat(response.getAliases().get("index").size(), equalTo(1));
             assertThat(response.getAliases().get("index").iterator().next().alias(), equalTo("alias"));
+            assertThat(status, equalTo(RestStatus.OK));
+            assertThat(error, nullValue());
+            assertThat(exception, nullValue());
 
             // tag::get-alias-execute-listener
             ActionListener<GetAliasesResponse> listener =

docs/java-rest/high-level/indices/get_alias.asciidoc

@@ -62,4 +62,24 @@ executed operation as follows:
 --------------------------------------------------
 include-tagged::{doc-tests-file}[{api}-response]
 --------------------------------------------------
-<1> Retrieves a map of indices and their aliases
+<1> Retrieves a map of indices and their aliases
+
++{response}+ class contains information about errors if they occurred.
+This info could be in fields `error` or `exception` depends on a case.
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests-file}[{api}-response-error]
+--------------------------------------------------
+<1> Client sets status to `NOT_FOUND` if at least one item of specified
+indices or aliases is not found. Otherwise it is `OK`.
+
+<2> If at least one item of specified indices isn't exist client sets
+`ElasticsearchException` and returns empty result.
+
+<3> If at least one item of specified aliases ins't exist client puts
+error description in `error` field and returns partial result if any
+of other patterns match.
+
+If user specified indices or aliases as regular expressions
+and nothing was found client returns `OK` status and no errors.

docs/reference/ml/anomaly-detection/apis/put-job.asciidoc

@@ -78,7 +78,7 @@ A detector has the following properties:
 (string)
 include::{docdir}/ml/ml-shared.asciidoc[tag=by-field-name]
 
-`analysis_config`.`detectors`.`custom_rules`::::
+[[put-customrules]]`analysis_config`.`detectors`.`custom_rules`::::
 +
 --
 (array)

docs/reference/modules/cross-cluster-search.asciidoc

@@ -8,6 +8,17 @@ filter and analyze log data stored on clusters in different data centers.
 
 IMPORTANT: {ccs-cap} requires <<modules-remote-clusters, remote clusters>>.
 
+[float]
+[[ccs-supported-apis]]
+== Supported APIs
+
+The following APIs support {ccs}:
+
+* <<search-search,Search>>
+* <<search-multi-search,Multi search>>
+* <<search-template,Search template>>
+* <<multi-search-template,Multi search template>>
+
 [float]
 [[ccs-example]]
 == {ccs-cap} examples
@@ -55,7 +66,7 @@ PUT _cluster/settings
 [[ccs-search-remote-cluster]]
 === Search a single remote cluster
 
-The following <<search,search>> API request searches the
+The following <<search-search,search>> API request searches the
 `twitter` index on a single remote cluster, `cluster_one`.
 
 [source,console]
@@ -280,13 +291,12 @@ including a <<request-body-search-scroll, scroll>> or
 +
 See <<ccs-min-roundtrips>> to learn how this option works.
 
-<<ccs-unmin-roundtrips, Don't minimize network roundtrips>>::
-For search requests that include a scroll or inner hits, {es} sends multiple
-outgoing and ingoing requests to each remote cluster. You can also choose this
-option by setting the <<search,search>> API's
-<<ccs-minimize-roundtrips,`ccs_minimize_roundtrips`>> parameter to `false`.
-While typically slower, this approach may work well for networks with low
-latency.
+<<ccs-unmin-roundtrips, Don't minimize network roundtrips>>:: For search
+requests that include a scroll or inner hits, {es} sends multiple outgoing and
+ingoing requests to each remote cluster. You can also choose this option by
+setting the <<ccs-minimize-roundtrips,`ccs_minimize_roundtrips`>> parameter to
+`false`. While typically slower, this approach may work well for networks with
+low latency.
 +
 See <<ccs-unmin-roundtrips>> to learn how this option works.
 

docs/reference/query-dsl/script-score-query.asciidoc

@@ -48,9 +48,12 @@ scores be positive or `0`.
 --
 
 `min_score`::
-(Optional, float) Documents with a <<relevance-scores,relevance score>> lower
+(Optional, float) Documents with a score lower
 than this floating point number are excluded from the search results.
 
+`boost`::
+(Optional, float) Documents' scores produced by `script` are
+multiplied by `boost` to produce final documents' scores. Defaults to `1.0`.
 
 [[script-score-query-notes]]
 ==== Notes

docs/reference/sql/functions/grouping.asciidoc

@@ -87,8 +87,8 @@ actually used will be `INTERVAL '2' DAY`. If the interval specified is less than
 
 [IMPORTANT]
 All intervals specified for a date/time HISTOGRAM will use a <<search-aggregations-bucket-datehistogram-aggregation,fixed interval>>
-in their `date_histogram` aggregation definition, with the notable exception of `INTERVAL '1' YEAR` where a calendar interval is used.
-The choice for a calendar interval was made for having a more intuitive result for YEAR groupings. Calendar intervals consider a one year
+in their `date_histogram` aggregation definition, with the notable exceptions of `INTERVAL '1' YEAR` AND `INTERVAL '1' MONTH`  where a calendar interval is used.
+The choice for a calendar interval was made for having a more intuitive result for YEAR and MONTH groupings. In the case of YEAR, for example, the calendar intervals consider a one year
 bucket as the one starting on January 1st that specific year, whereas a fixed interval one-year-bucket considers one year as a number
 of milliseconds (for example, `31536000000ms` corresponding to 365 days, 24 hours per day, 60 minutes per hour etc.). With fixed intervals,
 the day of February 5th, 2019 for example, belongs to a bucket that starts on December 20th, 2018 and {es} (and implicitly {es-sql}) would

modules/lang-painless/src/test/resources/rest-api-spec/test/painless/110_script_score_boost.yml

@@ -0,0 +1,86 @@
+# Integration tests for ScriptScoreQuery using Painless
+setup:
+  - skip:
+      version: " - 7.9.99"
+      reason: "boost was corrected in script_score query from 8.0"
+  - do:
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            index:
+              number_of_shards: 1
+              number_of_replicas: 0
+          mappings:
+            properties:
+              k:
+                type: keyword
+              i:
+                type: integer
+
+  - do:
+      bulk:
+        index: test_index
+        refresh: true
+        body:
+          - '{"index": {"_id": "1"}}'
+          - '{"k": "k", "i" : 1}'
+          - '{"index": {"_id": "2"}}'
+          - '{"k": "kk", "i" : 2}'
+          - '{"index": {"_id": "3"}}'
+          - '{"k": "kkk", "i" : 3}'
+---
+"Boost script_score":
+    - do:
+        search:
+          index: test_index
+          body:
+            query:
+              script_score:
+                query: {match_all: {}}
+                script:
+                  source: "doc['i'].value * _score"
+                boost: 10
+
+    - match: { hits.total.value: 3 }
+    - match: { hits.hits.0._score: 30 }
+    - match: { hits.hits.1._score: 20 }
+    - match: { hits.hits.2._score: 10 }
+
+---
+"Boost script_score and boost internal query":
+  - do:
+      search:
+        index: test_index
+        body:
+          query:
+            script_score:
+              query: {match_all: {boost: 5}}
+              script:
+                source: "doc['i'].value * _score"
+              boost: 10
+
+  - match: { hits.total.value: 3 }
+  - match: { hits.hits.0._score: 150 }
+  - match: { hits.hits.1._score: 100 }
+  - match: { hits.hits.2._score: 50 }
+
+---
+"Boost script_score with explain":
+  - do:
+      search:
+        index: test_index
+        body:
+          explain: true
+          query:
+            script_score:
+              query: {term: {"k": "kkk"}}
+              script:
+                source: "doc['i'].value"
+              boost: 10
+
+  - match: { hits.total.value: 1 }
+  - match: { hits.hits.0._score: 30 }
+  - match: { hits.hits.0._explanation.value: 30 }
+  - match: { hits.hits.0._explanation.details.0.description: "boost" }
+  - match: { hits.hits.0._explanation.details.0.value: 10}

qa/os/src/test/java/org/elasticsearch/packaging/test/DebMetadataTests.java

@@ -24,7 +24,6 @@
 import org.elasticsearch.packaging.util.FileUtils;
 import org.elasticsearch.packaging.util.Shell;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 
 import java.util.regex.Pattern;
 
@@ -38,7 +37,6 @@ public static void filterDistros() {
         assumeTrue("only deb", distribution.packaging == Distribution.Packaging.DEB);
     }
 
-    @Ignore // awaits fix: https://github.com/elastic/elasticsearch/issues/52554
     public void test05CheckLintian() {
         String extraArgs = "";
         if (sh.run("lintian --help").stdout.contains("fail-on-warnings")) {