Skip to content

Commit 3346de8

Browse files
committed
Merge branch 'main' into ktlo/fix_testDeprecatedSettingsReturnWarnings
2 parents d897cc3 + afc53a3 commit 3346de8

File tree

129 files changed

+5949
-1202
lines changed

Some content is hidden

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

129 files changed

+5949
-1202
lines changed

docs/changelog/126843.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ breaking:
4242
`com.amazonaws.sdk.ec2MetadataServiceEndpointOverride` system property.
4343
4444
* AWS SDK v2 does not permit specifying a choice between HTTP and HTTPS so
45-
the `s3.client.${CLIENT_NAME}.protocol` setting is deprecated and no longer
46-
has any effect.
45+
the `s3.client.${CLIENT_NAME}.protocol` setting is deprecated.
4746
4847
* AWS SDK v2 does not permit control over throttling for retries, so the
4948
the `s3.client.${CLIENT_NAME}.use_throttle_retries` setting is deprecated
@@ -81,9 +80,9 @@ breaking:
8180
* If applicable, discontinue use of the
8281
`com.amazonaws.sdk.ec2MetadataServiceEndpointOverride` system property.
8382
84-
* If applicable, specify that you wish to use the insecure HTTP protocol to
85-
access the S3 API by setting `s3.client.${CLIENT_NAME}.endpoint` to a URL
86-
which starts with `http://`.
83+
* If applicable, specify the protocol to use to access the S3 API by
84+
setting `s3.client.${CLIENT_NAME}.endpoint` to a URL which starts with
85+
`http://` or `https://`.
8786
8887
* If applicable, discontinue use of the `log-delivery-write` canned ACL.
8988

docs/changelog/127582.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 127582
2+
summary: Specialize ags `AddInput` for each block type
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/reference/elasticsearch/configuration-reference/security-settings.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,6 +1486,15 @@ $$$jwt-claim-pattern-principal$$$
14861486
`client_authentication.rotation_grace_period`
14871487
: ([Static](docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md#static-cluster-setting)) Sets the grace period for how long after rotating the `client_authentication.shared_secret` is valid. `client_authentication.shared_secret` can be rotated by updating the keystore then calling the [reload API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-reload-secure-settings). Defaults to `1m`.
14881488

1489+
`http.proxy.host`
1490+
: ([Static](docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md#static-cluster-setting)) Specifies the address of the proxy server for the HTTP client that is used for fetching the JSON Web Key Set from a remote URL.
1491+
1492+
`http.proxy.scheme`
1493+
: ([Static](docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md#static-cluster-setting)) Specifies the protocol to use to connect to the proxy server for the HTTP client that is used for fetching the JSON Web Key Set from a remote URL. Must be `http`.
1494+
1495+
`http.proxy.port`
1496+
: ([Static](docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md#static-cluster-setting)) Specifies the port of the proxy server for the HTTP client that is used for fetching the JSON Web Key Set from a remote URL. Defaults to `80`.
1497+
14891498
`http.connect_timeout` ![logo cloud](https://doc-icons.s3.us-east-2.amazonaws.com/logo_cloud.svg "Supported on Elastic Cloud Hosted")
14901499
: ([Static](docs-content://deploy-manage/deploy/self-managed/configure-elasticsearch.md#static-cluster-setting)) Sets the timeout for the HTTP client that is used for fetching the JSON Web Key Set from a remote URL. A value of zero means the timeout is not used. Defaults to `5s`.
14911500

docs/reference/query-languages/esql/_snippets/commands/layout/lookup-join.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If multiple documents in the lookup index match a single row in your
4242
results, the output will contain one row for each matching combination.
4343

4444
::::{tip}
45-
In case of name collisions, the newly created columns will override existing columns.
45+
For important information about using `LOOKUP JOIN`, refer to [Usage notes](../../../../esql/esql-lookup-join.md#usage-notes).
4646
::::
4747

4848
**Examples**

docs/reference/query-languages/esql/_snippets/commands/layout/mv_expand.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ MV_EXPAND column
2222
`column`
2323
: The multivalued column to expand.
2424

25+
::::{warning}
26+
The output rows produced by `MV_EXPAND` can be in any order and may not respect
27+
preceding `SORT`s. To guarantee a certain ordering, place a `SORT` after any
28+
`MV_EXPAND`s.
29+
::::
30+
2531
**Example**
2632

2733
:::{include} ../examples/mv_expand.csv-spec/simple.md

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,27 @@ To obtain a join key with a compatible type, use a [conversion function](/refere
156156

157157
For a complete list of supported data types and their internal representations, see the [Supported Field Types documentation](/reference/query-languages/esql/limitations.md#_supported_types).
158158

159+
## Usage notes
160+
161+
This section covers important details about `LOOKUP JOIN` that impact query behavior and results. Review these details to ensure your queries work as expected and to troubleshoot unexpected results.
162+
163+
### Handling name collisions
164+
165+
When fields from the lookup index match existing column names, the new columns override the existing ones.
166+
Before the `LOOKUP JOIN` command, preserve columns by either:
167+
168+
* Using `RENAME` to assign non-conflicting names
169+
* Using `EVAL` to create new columns with different names
170+
171+
### Sorting behavior
172+
173+
The output rows produced by `LOOKUP JOIN` can be in any order and may not
174+
respect preceding `SORT`s. To guarantee a certain ordering, place a `SORT` after
175+
any `LOOKUP JOIN`s.
176+
159177
## Limitations
160178

161-
The following are the current limitations with `LOOKUP JOIN`
179+
The following are the current limitations with `LOOKUP JOIN`:
162180

163181
* Indices in [`lookup` mode](/reference/elasticsearch/index-settings/index-modules.md#index-mode-setting) are always single-sharded.
164182
* Cross cluster search is unsupported initially. Both source and lookup indices must be local.

docs/reference/query-languages/esql/kibana/definition/functions/categorize.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/definition/functions/st_extent_agg.json

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+
10+
package org.elasticsearch.entitlement.initialization;
11+
12+
class EntitlementCheckerUtils {
13+
14+
/**
15+
* Returns the "most recent" checker class compatible with the provided runtime Java version.
16+
* For checkers, we have (optionally) version specific classes, each with a prefix (e.g. Java23).
17+
* The mapping cannot be automatic, as it depends on the actual presence of these classes in the final Jar (see
18+
* the various mainXX source sets).
19+
*/
20+
static Class<?> getVersionSpecificCheckerClass(Class<?> baseClass, int javaVersion) {
21+
String packageName = baseClass.getPackageName();
22+
String baseClassName = baseClass.getSimpleName();
23+
24+
final String classNamePrefix;
25+
if (javaVersion >= 23) {
26+
// All Java version from 23 onwards will be able to use che checks in the Java23EntitlementChecker interface and implementation
27+
classNamePrefix = "Java23";
28+
} else {
29+
// For any other Java version, the basic EntitlementChecker interface and implementation contains all the supported checks
30+
classNamePrefix = "";
31+
}
32+
final String className = packageName + "." + classNamePrefix + baseClassName;
33+
Class<?> clazz;
34+
try {
35+
clazz = Class.forName(className);
36+
} catch (ClassNotFoundException e) {
37+
throw new AssertionError("entitlement lib cannot find entitlement class " + className, e);
38+
}
39+
return clazz;
40+
}
41+
}

libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ public static void initialize(Instrumentation inst) throws Exception {
6868
ensureClassesSensitiveToVerificationAreInitialized();
6969
}
7070

71-
DynamicInstrumentation.initialize(inst, getVersionSpecificCheckerClass(EntitlementChecker.class), verifyBytecode);
71+
DynamicInstrumentation.initialize(
72+
inst,
73+
EntitlementCheckerUtils.getVersionSpecificCheckerClass(EntitlementChecker.class, Runtime.version().feature()),
74+
verifyBytecode
75+
);
7276
}
7377

7478
private static PolicyManager createPolicyManager() {
@@ -108,39 +112,13 @@ private static void ensureClassesSensitiveToVerificationAreInitialized() {
108112
}
109113
}
110114

111-
/**
112-
* Returns the "most recent" checker class compatible with the current runtime Java version.
113-
* For checkers, we have (optionally) version specific classes, each with a prefix (e.g. Java23).
114-
* The mapping cannot be automatic, as it depends on the actual presence of these classes in the final Jar (see
115-
* the various mainXX source sets).
116-
*/
117-
private static Class<?> getVersionSpecificCheckerClass(Class<?> baseClass) {
118-
String packageName = baseClass.getPackageName();
119-
String baseClassName = baseClass.getSimpleName();
120-
int javaVersion = Runtime.version().feature();
121-
122-
final String classNamePrefix;
123-
if (javaVersion >= 23) {
124-
// All Java version from 23 onwards will be able to use che checks in the Java23EntitlementChecker interface and implementation
125-
classNamePrefix = "Java23";
126-
} else {
127-
// For any other Java version, the basic EntitlementChecker interface and implementation contains all the supported checks
128-
classNamePrefix = "";
129-
}
130-
final String className = packageName + "." + classNamePrefix + baseClassName;
131-
Class<?> clazz;
132-
try {
133-
clazz = Class.forName(className);
134-
} catch (ClassNotFoundException e) {
135-
throw new AssertionError("entitlement lib cannot find entitlement class " + className, e);
136-
}
137-
return clazz;
138-
}
139-
140115
private static ElasticsearchEntitlementChecker initChecker() {
141116
final PolicyManager policyManager = createPolicyManager();
142117

143-
final Class<?> clazz = getVersionSpecificCheckerClass(ElasticsearchEntitlementChecker.class);
118+
final Class<?> clazz = EntitlementCheckerUtils.getVersionSpecificCheckerClass(
119+
ElasticsearchEntitlementChecker.class,
120+
Runtime.version().feature()
121+
);
144122

145123
Constructor<?> constructor;
146124
try {

0 commit comments

Comments
 (0)