Skip to content

Commit a413196

Browse files
committed
Merge branch 'main' into lucene_snapshot
2 parents 37e47c5 + d3fa42c commit a413196

File tree

98 files changed

+3961
-3861
lines changed

Some content is hidden

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

98 files changed

+3961
-3861
lines changed

build-tools-internal/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,15 @@ tasks.named("jar") {
384384
exclude("classpath.index")
385385
}
386386

387+
spotless {
388+
java {
389+
// IDEs can sometimes run annotation processors that leave files in
390+
// here, causing Spotless to complain. Even though this path ought not
391+
// to exist, exclude it anyway in order to avoid spurious failures.
392+
toggleOffOn()
393+
}
394+
}
395+
387396
def resolveMainWrapperVersion() {
388397
new URL("https://raw.githubusercontent.com/elastic/elasticsearch/main/build-tools-internal/src/main/resources/minimumGradleVersion").text.trim()
389398
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ public enum DockerBase {
2929
CLOUD_ESS(null, "-cloud-ess", "apt-get"),
3030

3131
// Chainguard based wolfi image with latest jdk
32-
WOLFI(
33-
"docker.elastic.co/wolfi/chainguard-base:latest@sha256:c16d3ad6cebf387e8dd2ad769f54320c4819fbbaa21e729fad087c7ae223b4d0",
32+
// This is usually updated via renovatebot
33+
// spotless:off
34+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:90888b190da54062f67f3fef1372eb0ae7d81ea55f5a1f56d748b13e4853d984",
3435
"-wolfi",
3536
"apk"
3637
),
38+
// spotless:on
3739

3840
// Based on WOLFI above, with more extras. We don't set a base image because
3941
// we programmatically extend from the Wolfi image.

build-tools-internal/src/main/resources/changelog-schema.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@
284284
"Cluster and node setting",
285285
"Command line tool",
286286
"CRUD",
287+
"ES|QL",
287288
"Index setting",
288289
"Ingest",
289290
"JVM option",

docs/changelog/113563.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 113563
2+
summary: Use ELSER By Default For Semantic Text
3+
area: Mapping
4+
type: enhancement
5+
issues: []

docs/changelog/113897.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 113897
2+
summary: "Add chunking settings configuration to `CohereService,` `AmazonBedrockService,`\
3+
\ and `AzureOpenAiService`"
4+
area: Machine Learning
5+
type: enhancement
6+
issues: []

docs/changelog/113967.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
pr: 113967
2+
summary: "ESQL: Entirely remove META FUNCTIONS"
3+
area: ES|QL
4+
type: breaking
5+
issues: []
6+
breaking:
7+
title: "ESQL: Entirely remove META FUNCTIONS"
8+
area: ES|QL
9+
details: |
10+
Removes an undocumented syntax from ESQL: META FUNCTION. This was never
11+
reliable or really useful. Consult the documentation instead.
12+
impact: "Removes an undocumented syntax from ESQL: META FUNCTION"
13+
notable: false

docs/changelog/114002.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114002
2+
summary: Add a `mustache.max_output_size_bytes` setting to limit the length of results from mustache scripts
3+
area: Infra/Scripting
4+
type: enhancement
5+
issues: []

docs/reference/esql/multivalued-fields.asciidoc

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,37 @@ POST /_query
177177
----
178178
// TESTRESPONSE[s/"took": 28/"took": "$body.took"/]
179179

180+
[discrete]
181+
[[esql-multivalued-nulls]]
182+
==== `null` in a list
183+
184+
`null` values in a list are not preserved at the storage layer:
185+
186+
[source,console,id=esql-multivalued-fields-multivalued-nulls]
187+
----
188+
POST /mv/_doc?refresh
189+
{ "a": [2, null, 1] }
190+
191+
POST /_query
192+
{
193+
"query": "FROM mv | LIMIT 1"
194+
}
195+
----
196+
197+
[source,console-result]
198+
----
199+
{
200+
"took": 28,
201+
"columns": [
202+
{ "name": "a", "type": "long"},
203+
],
204+
"values": [
205+
[[1, 2]],
206+
]
207+
}
208+
----
209+
// TESTRESPONSE[s/"took": 28/"took": "$body.took"/]
210+
180211
[discrete]
181212
[[esql-multivalued-fields-functions]]
182213
==== Functions

docs/reference/intro.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ For general content, you have the following options for adding data to {es} indi
204204
If you're building a website or app, then you can call Elasticsearch APIs using an https://www.elastic.co/guide/en/elasticsearch/client/index.html[{es} client] in the programming language of your choice. If you use the Python client, then check out the `elasticsearch-labs` repo for various https://github.com/elastic/elasticsearch-labs/tree/main/notebooks/search/python-examples[example notebooks].
205205
* {kibana-ref}/connect-to-elasticsearch.html#upload-data-kibana[File upload]: Use the {kib} file uploader to index single files for one-off testing and exploration. The GUI guides you through setting up your index and field mappings.
206206
* https://github.com/elastic/crawler[Web crawler]: Extract and index web page content into {es} documents.
207-
* {enterprise-search-ref}/connectors.html[Connectors]: Sync data from various third-party data sources to create searchable, read-only replicas in {es}.
207+
* <<es-connectors,Connectors>>: Sync data from various third-party data sources to create searchable, read-only replicas in {es}.
208208

209209
[discrete]
210210
[[es-ingestion-overview-timestamped]]
@@ -492,4 +492,4 @@ and restrictions. You can review the following guides to learn how to tune your
492492
* <<use-elasticsearch-for-time-series-data,Tune for time series data>>
493493

494494
Many {es} options come with different performance considerations and trade-offs. The best way to determine the
495-
optimal configuration for your use case is through https://www.elastic.co/elasticon/conf/2016/sf/quantitative-cluster-sizing[testing with your own data and queries].
495+
optimal configuration for your use case is through https://www.elastic.co/elasticon/conf/2016/sf/quantitative-cluster-sizing[testing with your own data and queries].

docs/reference/reranking/index.asciidoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[[re-ranking-overview]]
22
= Re-ranking
33

4-
Many search systems are built on two-stage retrieval pipelines.
4+
Many search systems are built on multi-stage retrieval pipelines.
55

6-
The first stage uses cheap, fast algorithms to find a broad set of possible matches.
6+
Earlier stages use cheap, fast algorithms to find a broad set of possible matches.
77

8-
The second stage uses a more powerful model, often machine learning-based, to reorder the documents.
9-
This second step is called re-ranking.
8+
Later stages use more powerful models, often machine learning-based, to reorder the documents.
9+
This step is called re-ranking.
1010
Because the resource-intensive model is only applied to the smaller set of pre-filtered results, this approach returns more relevant results while still optimizing for search performance and computational costs.
1111

1212
{es} supports various ranking and re-ranking techniques to optimize search relevance and performance.
@@ -18,7 +18,7 @@ Because the resource-intensive model is only applied to the smaller set of pre-f
1818

1919
[float]
2020
[[re-ranking-first-stage-pipeline]]
21-
=== First stage: initial retrieval
21+
=== Initial retrieval
2222

2323
[float]
2424
[[re-ranking-ranking-overview-bm25]]
@@ -45,7 +45,7 @@ Hybrid search techniques combine results from full-text and vector search pipeli
4545

4646
[float]
4747
[[re-ranking-overview-second-stage]]
48-
=== Second stage: Re-ranking
48+
=== Re-ranking
4949

5050
When using the following advanced re-ranking pipelines, first-stage retrieval mechanisms effectively generate a set of candidates.
5151
These candidates are funneled into the re-ranker to perform more computationally expensive re-ranking tasks.
@@ -67,4 +67,4 @@ Learning To Rank involves training a machine learning model to build a ranking f
6767
LTR is best suited for when you have ample training data and need highly customized relevance tuning.
6868

6969
include::semantic-reranking.asciidoc[]
70-
include::learning-to-rank.asciidoc[]
70+
include::learning-to-rank.asciidoc[]

0 commit comments

Comments
 (0)