Skip to content

Commit b0268c3

Browse files
ChrisHegartyChrisHegarty
committed
Merge branch 'main' into lucene_snapshot
2 parents 31c08d0 + 4a831d0 commit b0268c3

File tree

183 files changed

+3390
-758
lines changed

Some content is hidden

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

183 files changed

+3390
-758
lines changed

‎.buildkite/pipelines/periodic-micro-benchmarks.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
steps:
2+
- label: periodic-micro-benchmarks
3+
command: |
4+
.ci/scripts/run-gradle.sh -p benchmarks/ run --args 'org.elasticsearch.benchmark._nightly -rf json -rff build/result.json'
5+
timeout_in_minutes: 300
6+
agents:
7+
provider: gcp
8+
image: family/elasticsearch-ubuntu-2004
9+
machineType: custom-32-98304
10+
buildDirectory: /dev/shm/bk

‎benchmarks/src/main/java/org/elasticsearch/benchmark/esql/QueryPlanningBenchmark.java‎ renamed to ‎benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
package org.elasticsearch.benchmark.esql;
10+
package org.elasticsearch.benchmark._nightly.esql;
1111

1212
import org.elasticsearch.common.logging.LogConfigurator;
1313
import org.elasticsearch.common.settings.Settings;
@@ -67,9 +67,9 @@ public class QueryPlanningBenchmark {
6767
}
6868

6969
private PlanTelemetry telemetry;
70-
private EsqlParser parser;
71-
private Analyzer analyzer;
72-
private LogicalPlanOptimizer optimizer;
70+
private EsqlParser defaultParser;
71+
private Analyzer manyFieldsAnalyzer;
72+
private LogicalPlanOptimizer defaultOptimizer;
7373

7474
@Setup
7575
public void setup() {
@@ -100,8 +100,8 @@ public void setup() {
100100
var functionRegistry = new EsqlFunctionRegistry();
101101

102102
telemetry = new PlanTelemetry(functionRegistry);
103-
parser = new EsqlParser();
104-
analyzer = new Analyzer(
103+
defaultParser = new EsqlParser();
104+
manyFieldsAnalyzer = new Analyzer(
105105
new AnalyzerContext(
106106
config,
107107
functionRegistry,
@@ -112,10 +112,10 @@ public void setup() {
112112
),
113113
new Verifier(new Metrics(functionRegistry), new XPackLicenseState(() -> 0L))
114114
);
115-
optimizer = new LogicalPlanOptimizer(new LogicalOptimizerContext(config, FoldContext.small()));
115+
defaultOptimizer = new LogicalPlanOptimizer(new LogicalOptimizerContext(config, FoldContext.small()));
116116
}
117117

118-
private LogicalPlan plan(String query) {
118+
private LogicalPlan plan(EsqlParser parser, Analyzer analyzer, LogicalPlanOptimizer optimizer, String query) {
119119
var parsed = parser.createStatement(query, new QueryParams(), telemetry);
120120
var analyzed = analyzer.analyze(parsed);
121121
var optimized = optimizer.optimize(analyzed);
@@ -124,6 +124,6 @@ private LogicalPlan plan(String query) {
124124

125125
@Benchmark
126126
public void manyFields(Blackhole blackhole) {
127-
blackhole.consume(plan("FROM test | LIMIT 10"));
127+
blackhole.consume(plan(defaultParser, manyFieldsAnalyzer, defaultOptimizer, "FROM test | LIMIT 10"));
128128
}
129129
}

‎build-tools/src/integTest/groovy/org/elasticsearch/gradle/test/TestBuildInfoPluginFuncTest.groovy‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@ class TestBuildInfoPluginFuncTest extends AbstractGradleFuncTest {
3939
}
4040
"""
4141

42-
when:
43-
def result = gradleRunner('generateTestBuildInfo').build()
44-
def task = result.task(":generateTestBuildInfo")
45-
46-
47-
then:
48-
task.outcome == TaskOutcome.SUCCESS
49-
50-
def output = file("build/generated-build-info/plugin-test-build-info.json")
51-
output.exists() == true
52-
5342
def location = Map.of(
5443
"module", "com.example",
5544
"representative_class", "com/example/Example.class"
@@ -58,6 +47,15 @@ class TestBuildInfoPluginFuncTest extends AbstractGradleFuncTest {
5847
"component", "example-component",
5948
"locations", List.of(location)
6049
)
50+
51+
def output = file("build/generated-build-info/plugin-test-build-info.json")
52+
53+
when:
54+
def result = gradleRunner('generateTestBuildInfo').build()
55+
56+
then:
57+
result.task(":generateTestBuildInfo").outcome == TaskOutcome.SUCCESS
58+
output.exists() == true
6159
new ObjectMapper().readValue(output, Map.class) == expectedOutput
6260
}
6361

@@ -87,16 +85,7 @@ class TestBuildInfoPluginFuncTest extends AbstractGradleFuncTest {
8785
}
8886
"""
8987

90-
when:
91-
def result = gradleRunner('generateTestBuildInfo').build()
92-
def task = result.task(":generateTestBuildInfo")
93-
94-
95-
then:
96-
task.outcome == TaskOutcome.SUCCESS
97-
9888
def output = file("build/generated-build-info/plugin-test-build-info.json")
99-
output.exists() == true
10089

10190
def locationFromModuleInfo = Map.of(
10291
"module", "org.objectweb.asm",
@@ -115,7 +104,12 @@ class TestBuildInfoPluginFuncTest extends AbstractGradleFuncTest {
115104
"locations", List.of(locationFromModuleInfo, locationFromManifest, locationFromJarFileName)
116105
)
117106

118-
def value = new ObjectMapper().readValue(output, Map.class)
119-
value == expectedOutput
107+
when:
108+
def result = gradleRunner('generateTestBuildInfo').build()
109+
110+
then:
111+
result.task(":generateTestBuildInfo").outcome == TaskOutcome.SUCCESS
112+
output.exists() == true
113+
new ObjectMapper().readValue(output, Map.class) == expectedOutput
120114
}
121115
}

‎catalog-info.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,3 +263,41 @@ spec:
263263
Daily:
264264
branch: main
265265
cronline: "0 12 * * * America/New_York"
266+
---
267+
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/e57ee3bed7a6f73077a3f55a38e76e40ec87a7cf/rre.schema.json
268+
apiVersion: backstage.io/v1alpha1
269+
kind: Resource
270+
metadata:
271+
name: buildkite-pipeline-elasticsearch-periodic-micro-benchmarks
272+
description: Runs periodic micro benchmarks fom the main branch
273+
links:
274+
- title: Pipeline
275+
url: https://buildkite.com/elastic/elasticsearch-periodic-micro-benchmarks
276+
spec:
277+
type: buildkite-pipeline
278+
system: buildkite
279+
owner: group:elasticsearch-team
280+
implementation:
281+
apiVersion: buildkite.elastic.dev/v1
282+
kind: Pipeline
283+
metadata:
284+
description: ":elasticsearch: Runs nightly micro benchmarks fom the main branch"
285+
name: elasticsearch / periodic / micro-benchmarks
286+
spec:
287+
repository: elastic/elasticsearch
288+
pipeline_file: .buildkite/pipelines/periodic-micro-benchmarks.yml
289+
branch_configuration: main
290+
teams:
291+
elasticsearch-team: {}
292+
ml-core: {}
293+
everyone:
294+
access_level: BUILD_AND_READ
295+
provider_settings:
296+
build_branches: false
297+
build_pull_requests: false
298+
publish_commit_status: false
299+
trigger_mode: none
300+
schedules:
301+
Daily:
302+
branch: main
303+
cronline: "@daily"

‎distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:a9e07d97c55f5b854b1c203509e57b6f466eb26318540b2e1b59734355f747b6 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:68e0781cd592beda39880428985d5fecca1cf2abb18365da73bf1f7ebd994974 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -103,7 +103,7 @@ WORKDIR /usr/share/elasticsearch/config
103103
# Add entrypoint
104104
################################################################################
105105

106-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:a9e07d97c55f5b854b1c203509e57b6f466eb26318540b2e1b59734355f747b6
106+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:68e0781cd592beda39880428985d5fecca1cf2abb18365da73bf1f7ebd994974
107107

108108
RUN <%= retry.loop(package_manager,
109109
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:55ee1dca9780931b0929d6eb734f455790c06ddbb59f55008e0cddebfbfd1e2e AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:3d19648819612728a676ab4061edfb3283bd7117a22c6c4479ee1c1d51831832 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -79,7 +79,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
7979
# Add entrypoint
8080
################################################################################
8181

82-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:55ee1dca9780931b0929d6eb734f455790c06ddbb59f55008e0cddebfbfd1e2e
82+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:3d19648819612728a676ab4061edfb3283bd7117a22c6c4479ee1c1d51831832
8383

8484
RUN <%= retry.loop(package_manager,
8585
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎docs/changelog/127583.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 127583
2+
summary: Add optimization to purge join on null merge key
3+
area: ES|QL
4+
type: enhancement
5+
issues:
6+
- 125577

‎docs/changelog/127767.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 127767
2+
summary: Integrate `OpenAi` Chat Completion in `SageMaker`
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/128139.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128139
2+
summary: Skip indexing points for `seq_no` in tsdb and logsdb
3+
area: Mapping
4+
type: enhancement
5+
issues: []

‎docs/changelog/128163.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
pr: 128163
2+
summary: Make `skip_unavailable` catch all errors
3+
area: ES|QL
4+
type: breaking
5+
issues: [ ]
6+
breaking:
7+
title: Cluster setting "skip_unavailable" catches all runtime errors
8+
area: ES|QL
9+
details: "If `skip_unavailable` is set to `true`, the runtime errors from this cluster\
10+
\ do not lead to a failure of the query. Instead, the cluster is set to `skipped`\
11+
\ or `partial` status, and the query execution continues. This is a breaking change\
12+
\ from previous versions, where `skip_unavailable` only applied to errors related\
13+
\ to a cluster being unavailable."
14+
impact: "The errors on remote clusters, e.g. missing indices, will not lead to a\
15+
\ failure of the query. Instead, the cluster is set to `skipped` or `partial` status\
16+
\ in the response metadata."
17+
notable: false

0 commit comments

Comments
 (0)