Skip to content

Commit ad66b1a

Browse files
benwtrentbenwtrent
authored
Merge branch 'main' into bugfix/correct-mixed-scalar-numeric-sort-queries
2 parents d47b734 + c14e602 commit ad66b1a

File tree

145 files changed

+8346
-1070
lines changed

Some content is hidden

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

145 files changed

+8346
-1070
lines changed

‎benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
import org.elasticsearch.xpack.esql.expression.function.scalar.math.RoundTo;
4949
import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMin;
5050
import org.elasticsearch.xpack.esql.expression.function.scalar.nulls.Coalesce;
51-
import org.elasticsearch.xpack.esql.expression.function.scalar.string.RLike;
5251
import org.elasticsearch.xpack.esql.expression.function.scalar.string.ToLower;
5352
import org.elasticsearch.xpack.esql.expression.function.scalar.string.ToUpper;
53+
import org.elasticsearch.xpack.esql.expression.function.scalar.string.regex.RLike;
5454
import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Add;
5555
import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals;
5656
import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.LessThan;

‎build-tools-internal/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
3+
distributionSha256Sum=d7042b3c11565c192041fc8c4703f541b888286404b4f267138c1d094d8ecdca
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎build-tools-internal/src/main/resources/minimumGradleVersion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.14
1+
8.14.1

‎docs/changelog/127939.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 127939
2+
summary: Add Custom inference service
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/128273.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128273
2+
summary: Improve get-snapshots message for unreadable repository
3+
area: Snapshot/Restore
4+
type: enhancement
5+
issues: []

‎docs/changelog/128323.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128323
2+
summary: "Fix: Allow non-score secondary sorts in pinned retriever sub-retrievers"
3+
area: Relevance
4+
type: bug
5+
issues: []

‎docs/changelog/128393.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 128393
2+
summary: Pushdown constructs doing case-insensitive regexes
3+
area: ES|QL
4+
type: enhancement
5+
issues:
6+
- 127479

‎docs/changelog/128531.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128531
2+
summary: Combine small pages in Limit
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
3+
distributionSha256Sum=d7042b3c11565c192041fc8c4703f541b888286404b4f267138c1d094d8ecdca
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎modules/repository-s3/qa/insecure-credentials/src/test/java/org/elasticsearch/repositories/s3/RepositoryCredentialsTests.java‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import org.apache.logging.log4j.LogManager;
1818
import org.apache.logging.log4j.Logger;
1919
import org.elasticsearch.client.internal.node.NodeClient;
20+
import org.elasticsearch.cluster.project.ProjectResolver;
21+
import org.elasticsearch.cluster.service.ClusterService;
2022
import org.elasticsearch.common.settings.MockSecureSettings;
2123
import org.elasticsearch.common.settings.Settings;
2224
import org.elasticsearch.common.settings.SettingsFilter;
@@ -256,8 +258,13 @@ public ProxyS3RepositoryPlugin(Settings settings) {
256258
}
257259

258260
@Override
259-
S3Service s3Service(Environment environment, Settings nodeSettings, ResourceWatcherService resourceWatcherService) {
260-
return new ProxyS3Service(environment, nodeSettings, resourceWatcherService);
261+
S3Service s3Service(
262+
Environment environment,
263+
ClusterService clusterService,
264+
ProjectResolver projectResolver,
265+
ResourceWatcherService resourceWatcherService
266+
) {
267+
return new ProxyS3Service(environment, clusterService, projectResolver, resourceWatcherService);
261268
}
262269

263270
/**
@@ -293,8 +300,13 @@ public static final class ProxyS3Service extends S3Service {
293300

294301
private static final Logger logger = LogManager.getLogger(ProxyS3Service.class);
295302

296-
ProxyS3Service(Environment environment, Settings nodeSettings, ResourceWatcherService resourceWatcherService) {
297-
super(environment, nodeSettings, resourceWatcherService, () -> null);
303+
ProxyS3Service(
304+
Environment environment,
305+
ClusterService clusterService,
306+
ProjectResolver projectResolver,
307+
ResourceWatcherService resourceWatcherService
308+
) {
309+
super(environment, clusterService, projectResolver, resourceWatcherService, () -> null);
298310
}
299311

300312
@Override

0 commit comments

Comments
 (0)