Merge pull request #256 from elastic/main

🤖 ESQL: Merge upstream
elastic · Sep 28, 2022 · 8417e22 · 8417e22
2 parents f44c1b1 + 6d8332a
commit 8417e22
Show file tree

Hide file tree

Showing 143 changed files with 2,583 additions and 702 deletions.
diff --git a/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle b/build-tools-internal/src/main/groovy/elasticsearch.ide.gradle
@@ -110,7 +110,9 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {
     description = 'Builds artifacts needed as dependency for IDE modules'
     dependsOn ':client:rest-high-level:shadowJar',
       ':plugins:repository-hdfs:hadoop-client-api:shadowJar',
-      ':libs:elasticsearch-x-content:generateProviderImpl'
+      ':libs:elasticsearch-x-content:generateProviderImpl',
+      ':server:generateModulesList',
+      ':server:generatePluginsList'
   }
 
   idea {

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.6.0
-lucene            = 9.4.0-snapshot-f5d0646daa5
+lucene            = 9.4.0-snapshot-d2e22e18c6c
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 18.0.2.1+1@db379da656dc47308e138f21b33976fa

diff --git a/client/rest/src/main/java/org/elasticsearch/client/DeadHostState.java b/client/rest/src/main/java/org/elasticsearch/client/DeadHostState.java
@@ -92,7 +92,7 @@ int getFailedAttempts() {
     public int compareTo(DeadHostState other) {
         if (timeSupplier != other.timeSupplier) {
             throw new IllegalArgumentException(
-                "can't compare DeadHostStates holding different time suppliers as they may " + "be based on different clocks"
+                "can't compare DeadHostStates holding different time suppliers as they may be based on different clocks"
             );
         }
         return Long.compare(deadUntilNanos, other.deadUntilNanos);

diff --git a/client/rest/src/main/java/org/elasticsearch/client/Response.java b/client/rest/src/main/java/org/elasticsearch/client/Response.java
@@ -201,6 +201,6 @@ HttpResponse getHttpResponse() {
 
     @Override
     public String toString() {
-        return "Response{" + "requestLine=" + requestLine + ", host=" + host + ", response=" + response.getStatusLine() + '}';
+        return "Response{requestLine=" + requestLine + ", host=" + host + ", response=" + response.getStatusLine() + '}';
     }
 }
diff --git a/client/rest/src/main/java/org/elasticsearch/client/ResponseException.java b/client/rest/src/main/java/org/elasticsearch/client/ResponseException.java
@@ -50,7 +50,7 @@ static String buildMessage(Response response) throws IOException {
         );
 
         if (response.hasWarnings()) {
-            message += "\n" + "Warnings: " + response.getWarnings();
+            message += "\nWarnings: " + response.getWarnings();
         }
 
         HttpEntity entity = response.getEntity();

diff --git a/client/rest/src/main/java/org/elasticsearch/client/RestClient.java b/client/rest/src/main/java/org/elasticsearch/client/RestClient.java
@@ -513,9 +513,7 @@ static Iterable<Node> selectNodes(
                 return singletonList(Collections.min(selectedDeadNodes).node);
             }
         }
-        throw new IOException(
-            "NodeSelector [" + nodeSelector + "] rejected all nodes, " + "living " + livingNodes + " and dead " + deadNodes
-        );
+        throw new IOException("NodeSelector [" + nodeSelector + "] rejected all nodes, living " + livingNodes + " and dead " + deadNodes);
     }
 
     /**

diff --git a/client/rest/src/test/java/org/elasticsearch/client/DeadHostStateTests.java b/client/rest/src/test/java/org/elasticsearch/client/DeadHostStateTests.java
@@ -79,7 +79,7 @@ public void testCompareToDifferingTimeSupplier() {
             fail("expected failure");
         } catch (IllegalArgumentException e) {
             assertEquals(
-                "can't compare DeadHostStates holding different time suppliers as they may " + "be based on different clocks",
+                "can't compare DeadHostStates holding different time suppliers as they may be based on different clocks",
                 e.getMessage()
             );
         }

diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java
@@ -182,7 +182,7 @@ public void testBuildCloudId() throws IOException {
             RestClient.builder(badId + ":");
             fail("should have failed");
         } catch (IllegalStateException e) {
-            assertEquals("cloudId " + badId + ":" + " must begin with a human readable identifier followed by a colon", e.getMessage());
+            assertEquals("cloudId " + badId + ": must begin with a human readable identifier followed by a colon", e.getMessage());
         }
 
         RestClient client = RestClient.builder(encodedId).build();

diff --git a/client/sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java
@@ -147,7 +147,7 @@ public void run() {
                 ScheduledTask previousTask = nextScheduledTask;
                 nextScheduledTask = new ScheduledTask(task, future);
                 assert initialized.get() == false || previousTask.task.isSkipped() || previousTask.task.hasStarted()
-                    : "task that we are replacing is neither " + "cancelled nor has it ever started";
+                    : "task that we are replacing is neither cancelled nor has it ever started";
             }
         }
 

diff --git a/docs/changelog/89735.yaml b/docs/changelog/89735.yaml
@@ -0,0 +1,5 @@
+pr: 89735
+summary: Operator/ingest
+area: Infra/Core
+type: enhancement
+issues: []
diff --git a/docs/changelog/89965.yaml b/docs/changelog/89965.yaml
@@ -0,0 +1,5 @@
+pr: 89965
+summary: "EQL sequences: support join on multi-values"
+area: EQL
+type: bug
+issues: []
diff --git a/docs/changelog/90296.yaml b/docs/changelog/90296.yaml
@@ -0,0 +1,5 @@
+pr: 90296
+summary: Limit shard realocation retries
+area: Allocation
+type: enhancement
+issues: []
diff --git a/docs/changelog/90319.yaml b/docs/changelog/90319.yaml
@@ -0,0 +1,6 @@
+pr: 90319
+summary: Preventing serialization errors in the nodes stats API
+area: Ingest Node
+type: bug
+issues:
+ - 77973
diff --git a/docs/changelog/90346.yaml b/docs/changelog/90346.yaml
@@ -0,0 +1,6 @@
+pr: 90346
+summary: Update error states from inside the main state executor
+area: Infra/Core
+type: bug
+issues:
+ - 90337
diff --git a/docs/changelog/90396.yaml b/docs/changelog/90396.yaml
@@ -0,0 +1,6 @@
+pr: 90396
+summary: Don't fail a transform on a ClusterBlockException, this may be due to ILM closing an index
+area: Transform
+type: bug
+issues:
+ - 89802
diff --git a/docs/reference/mapping/params/dynamic.asciidoc b/docs/reference/mapping/params/dynamic.asciidoc
@@ -42,7 +42,7 @@ GET my-index-000001/_mapping
 [[dynamic-inner-objects]]
 ==== Setting `dynamic` on inner objects
 <<object,Inner objects>> inherit the `dynamic` setting from their parent
-object or from the mapping type. In the following example, dynamic mapping is
+object. In the following example, dynamic mapping is
 disabled at the type level, so no new top-level fields will be added
 dynamically.
 

diff --git a/docs/reference/search/search-shards.asciidoc b/docs/reference/search/search-shards.asciidoc
@@ -87,55 +87,70 @@ The API returns the following result:
       {
         "index": "my-index-000001",
         "node": "JklnKbD7Tyqi9TP3_Q_tBg",
+        "relocating_node": null,
         "primary": true,
         "shard": 0,
         "state": "STARTED",
         "allocation_id": {"id":"0TvkCyF7TAmM1wHP4a42-A"},
-        "relocating_node": null
+        "relocation_failure_info" : {
+          "failed_attempts" : 0
+        }
       }
     ],
     [
       {
         "index": "my-index-000001",
         "node": "JklnKbD7Tyqi9TP3_Q_tBg",
+        "relocating_node": null,
         "primary": true,
         "shard": 1,
         "state": "STARTED",
         "allocation_id": {"id":"fMju3hd1QHWmWrIgFnI4Ww"},
-        "relocating_node": null
+        "relocation_failure_info" : {
+          "failed_attempts" : 0
+        }
       }
     ],
     [
       {
         "index": "my-index-000001",
         "node": "JklnKbD7Tyqi9TP3_Q_tBg",
+        "relocating_node": null,
         "primary": true,
         "shard": 2,
         "state": "STARTED",
         "allocation_id": {"id":"Nwl0wbMBTHCWjEEbGYGapg"},
-        "relocating_node": null
+        "relocation_failure_info" : {
+          "failed_attempts" : 0
+        }
       }
     ],
     [
       {
         "index": "my-index-000001",
         "node": "JklnKbD7Tyqi9TP3_Q_tBg",
+        "relocating_node": null,
         "primary": true,
         "shard": 3,
         "state": "STARTED",
         "allocation_id": {"id":"bU_KLGJISbW0RejwnwDPKw"},
-        "relocating_node": null
+        "relocation_failure_info" : {
+          "failed_attempts" : 0
+        }
       }
     ],
     [
       {
         "index": "my-index-000001",
         "node": "JklnKbD7Tyqi9TP3_Q_tBg",
+        "relocating_node": null,
         "primary": true,
         "shard": 4,
         "state": "STARTED",
         "allocation_id": {"id":"DMs7_giNSwmdqVukF7UydA"},
-        "relocating_node": null
+        "relocation_failure_info" : {
+          "failed_attempts" : 0
+        }
       }
     ]
   ]
@@ -171,22 +186,28 @@ The API returns the following result:
       {
         "index": "my-index-000001",
         "node": "JklnKbD7Tyqi9TP3_Q_tBg",
+        "relocating_node": null,
         "primary": true,
         "shard": 2,
         "state": "STARTED",
         "allocation_id": {"id":"fMju3hd1QHWmWrIgFnI4Ww"},
-        "relocating_node": null
+        "relocation_failure_info" : {
+          "failed_attempts" : 0
+        }
       }
     ],
     [
       {
         "index": "my-index-000001",
         "node": "JklnKbD7Tyqi9TP3_Q_tBg",
+        "relocating_node": null,
         "primary": true,
         "shard": 3,
         "state": "STARTED",
         "allocation_id": {"id":"0TvkCyF7TAmM1wHP4a42-A"},
-        "relocating_node": null
+        "relocation_failure_info" : {
+          "failed_attempts" : 0
+        }
       }
     ]
   ]