Skip to content

Commit 56b3d20

Browse files
Merge remote-tracking branch 'upstream/main' into ES-10037-data-stream-autosharding-extra-logging
2 parents 7a8a20c + eaac8ee commit 56b3d20

File tree

197 files changed

+5812
-2753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+5812
-2753
lines changed

docs/changelog/123074.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 123074
2+
summary: Adding ES|QL Reranker command in snapshot builds
3+
area: Ranking
4+
type: feature
5+
issues: []

docs/changelog/125060.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

docs/changelog/126286.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 126286
2+
summary: Revert "Allow partial results by default in ES|QL"
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 126275

docs/reference/query-languages/esql/esql-lookup-join.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mapped_pages:
66

77
# LOOKUP JOIN [esql-lookup-join-reference]
88

9-
The {{esql}} [`LOOKUP JOIN`](/reference/query-languages/esql/esql-commands.md#esql-lookup-join) processing command combines data from your {esql} query results table with matching records from a specified lookup index. It adds fields from the lookup index as new columns to your results table based on matching values in the join field.
9+
The {{esql}} [`LOOKUP JOIN`](/reference/query-languages/esql/esql-commands.md#esql-lookup-join) processing command combines data from your {{esql}} query results table with matching records from a specified lookup index. It adds fields from the lookup index as new columns to your results table based on matching values in the join field.
1010

1111
Teams often have data scattered across multiple indices – like logs, IPs, user IDs, hosts, employees etc. Without a direct way to enrich or correlate each event with reference data, root-cause analysis, security checks, and operational insights become time-consuming.
1212

@@ -108,7 +108,7 @@ FROM employees
108108
To use `LOOKUP JOIN`, the following requirements must be met:
109109

110110
* **Compatible data types**: The join key and join field in the lookup index must have compatible data types. This means:
111-
* The data types must either be identical or be internally represented as the same type in {esql}
111+
* The data types must either be identical or be internally represented as the same type in {{esql}}
112112
* Numeric types follow these compatibility rules:
113113
* `short` and `byte` are compatible with `integer` (all represented as `int`)
114114
* `float`, `half_float`, and `scaled_float` are compatible with `double` (all represented as `double`)

docs/release-notes/breaking-changes.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ To learn how to upgrade, check out <uprade docs>.
1414

1515
% ## Next version [elasticsearch-nextversion-breaking-changes]
1616

17-
## 9.1.0 [elasticsearch-910-breaking-changes]
18-
19-
ES|QL
20-
: * Allow partial results by default in ES|QL [#125060](https://github.com/elastic/elasticsearch/pull/125060)
21-
2217
## 9.0.0 [elasticsearch-900-breaking-changes]
2318

2419
Allocation
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
grant {
2+
permission java.lang.RuntimePermission "accessDeclaredMembers";
3+
};
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
grant {
2+
permission java.lang.RuntimePermission "accessDeclaredMembers";
3+
};

modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3BasicCredentialsRestIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.junit.rules.RuleChain;
2121
import org.junit.rules.TestRule;
2222

23+
import static fixture.aws.AwsCredentialsUtils.ANY_REGION;
2324
import static fixture.aws.AwsCredentialsUtils.fixedAccessKey;
2425

2526
@ThreadLeakFilters(filters = { TestContainersThreadFilter.class })
@@ -33,7 +34,7 @@ public class RepositoryS3BasicCredentialsRestIT extends AbstractRepositoryS3Rest
3334
private static final String SECRET_KEY = PREFIX + "secret-key";
3435
private static final String CLIENT = "basic_credentials_client";
3536

36-
private static final S3HttpFixture s3Fixture = new S3HttpFixture(true, BUCKET, BASE_PATH, fixedAccessKey(ACCESS_KEY, "*", "s3"));
37+
private static final S3HttpFixture s3Fixture = new S3HttpFixture(true, BUCKET, BASE_PATH, fixedAccessKey(ACCESS_KEY, ANY_REGION, "s3"));
3738

3839
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
3940
.module("repository-s3")

modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3RestReloadCredentialsIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import java.io.IOException;
2727

28+
import static fixture.aws.AwsCredentialsUtils.ANY_REGION;
2829
import static fixture.aws.AwsCredentialsUtils.mutableAccessKey;
2930
import static org.hamcrest.CoreMatchers.containsString;
3031
import static org.hamcrest.Matchers.allOf;
@@ -42,7 +43,7 @@ public class RepositoryS3RestReloadCredentialsIT extends ESRestTestCase {
4243
true,
4344
BUCKET,
4445
BASE_PATH,
45-
mutableAccessKey(() -> repositoryAccessKey, "*", "s3")
46+
mutableAccessKey(() -> repositoryAccessKey, ANY_REGION, "s3")
4647
);
4748

4849
private static final MutableSettingsProvider keystoreSettings = new MutableSettingsProvider();

modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3SessionCredentialsRestIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.junit.rules.RuleChain;
2121
import org.junit.rules.TestRule;
2222

23+
import static fixture.aws.AwsCredentialsUtils.ANY_REGION;
2324
import static fixture.aws.AwsCredentialsUtils.fixedAccessKeyAndToken;
2425

2526
@ThreadLeakFilters(filters = { TestContainersThreadFilter.class })
@@ -38,7 +39,7 @@ public class RepositoryS3SessionCredentialsRestIT extends AbstractRepositoryS3Re
3839
true,
3940
BUCKET,
4041
BASE_PATH,
41-
fixedAccessKeyAndToken(ACCESS_KEY, SESSION_TOKEN, "*", "s3")
42+
fixedAccessKeyAndToken(ACCESS_KEY, SESSION_TOKEN, ANY_REGION, "s3")
4243
);
4344

4445
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()

0 commit comments

Comments
 (0)