Skip to content

Commit 3be7f2e

Browse files
committed
Merge branch 'main' of https://github.com/prwhelan/elasticsearch into deepseek
2 parents ea24ac1 + e11d89d commit 3be7f2e

File tree

108 files changed

+4779
-2870
lines changed

Some content is hidden

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

108 files changed

+4779
-2870
lines changed

docs/changelog/123396.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 123396
2+
summary: Add initial grammar and planning for RRF (snapshot)
3+
area: ES|QL
4+
type: feature
5+
issues: []

docs/changelog/124424.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124424
2+
summary: Lazy collection copying during node transform
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/124527.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124527
2+
summary: Avoid potentially throwing calls to Task#getDescription in model download
3+
area: Machine Learning
4+
type: bug
5+
issues: []

docs/changelog/124544.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124544
2+
summary: Bump nimbus-jose-jwt to 10.0.2
3+
area: Security
4+
type: upgrade
5+
issues: []

docs/reference/query-languages/sql-limitations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,13 @@ SELECT age, MAX(salary) - MIN(salary) AS diff FROM test GROUP BY age ORDER BY di
116116
Using sub-selects (`SELECT X FROM (SELECT Y)`) is **supported to a small degree**: any sub-select that can be "flattened" into a single
117117
`SELECT` is possible with {es-sql}. For example:
118118

119-
```sql subs=attributes,macros
119+
```sql
120120
include-tagged::{sql-specs}/docs/docs.csv-spec[limitationSubSelect]
121121
```
122122

123123
The query above is possible because it is equivalent with:
124124

125-
```sql subs="attributes,macros
125+
```sql
126126
include-tagged::{sql-specs}/docs/docs.csv-spec[limitationSubSelectRewritten]
127127
```
128128

gradle/verification-metadata.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -984,9 +984,9 @@
984984
<sha256 value="e8c1c594e2425bdbea2d860de55c69b69fc5d59454452449a0f0913c2a5b8a31" origin="Generated by Gradle"/>
985985
</artifact>
986986
</component>
987-
<component group="com.nimbusds" name="nimbus-jose-jwt" version="10.0.1">
988-
<artifact name="nimbus-jose-jwt-10.0.1.jar">
989-
<sha256 value="f28dbd9ab128324f05050d76b78469d3a9cd83e0319aabc68d1c276e3923e13a" origin="Generated by Gradle"/>
987+
<component group="com.nimbusds" name="nimbus-jose-jwt" version="10.0.2">
988+
<artifact name="nimbus-jose-jwt-10.0.2.jar">
989+
<sha256 value="960b978a6cd6cbc3319648adc73959789f6742a2bf1e8dd0c843dbc91624218a" origin="Generated by Gradle"/>
990990
</artifact>
991991
</component>
992992
<component group="com.nimbusds" name="nimbus-jose-jwt" version="4.41.1">

libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
import java.nio.file.FileVisitOption;
6565
import java.nio.file.FileVisitor;
6666
import java.nio.file.LinkOption;
67+
import java.nio.file.NoSuchFileException;
6768
import java.nio.file.OpenOption;
6869
import java.nio.file.Path;
6970
import java.nio.file.WatchEvent;
@@ -1203,7 +1204,7 @@ void checkNewByteChannel(
12031204
void checkType(Class<?> callerClass, FileStore that);
12041205

12051206
// path
1206-
void checkPathToRealPath(Class<?> callerClass, Path that, LinkOption... options);
1207+
void checkPathToRealPath(Class<?> callerClass, Path that, LinkOption... options) throws NoSuchFileException;
12071208

12081209
void checkPathRegister(Class<?> callerClass, Path that, WatchService watcher, WatchEvent.Kind<?>... events);
12091210

libs/entitlement/qa/entitled-plugin/src/main/java/org/elasticsearch/entitlement/qa/entitled/EntitledActions.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,15 @@ public static Path createTempDirectoryForWrite() throws IOException {
6363
}
6464

6565
public static Path createTempSymbolicLink() throws IOException {
66-
return Files.createSymbolicLink(readDir().resolve("entitlements-link-" + random.nextLong()), readWriteDir());
66+
return createTempSymbolicLink(readWriteDir());
67+
}
68+
69+
public static Path createTempSymbolicLink(Path target) throws IOException {
70+
return Files.createSymbolicLink(readDir().resolve("entitlements-link-" + random.nextLong()), target);
71+
}
72+
73+
public static Path pathToRealPath(Path path) throws IOException {
74+
return path.toRealPath();
6775
}
6876

6977
public static Path createK8sLikeMount() throws IOException {

libs/entitlement/qa/entitlement-test-plugin/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies {
2424
compileOnly project(':server')
2525
compileOnly project(':libs:logging')
2626
compileOnly project(":libs:entitlement:qa:entitled-plugin")
27+
implementation project(":libs:entitlement")
2728
}
2829

2930
tasks.named("javadoc").configure {

libs/entitlement/qa/entitlement-test-plugin/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
requires org.elasticsearch.server;
1212
requires org.elasticsearch.base;
1313
requires org.elasticsearch.logging;
14+
requires org.elasticsearch.entitlement;
1415
requires org.elasticsearch.entitlement.qa.entitled;
1516

1617
// Modules we'll attempt to use in order to exercise entitlements

0 commit comments

Comments
 (0)