Skip to content

Commit 0b7e266

Browse files
Merge branch 'main' into tasks/rcs-rm-isCrossClusterSearchEnabled
2 parents 458cbb4 + 14debad commit 0b7e266

File tree

97 files changed

+4365
-182
lines changed

Some content is hidden

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

97 files changed

+4365
-182
lines changed

.github/workflows/docs-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
1313
with:
1414
path-pattern: docs/**
15+
path-pattern-ignore: docs/changelog/**/*.yaml
1516
permissions:
1617
deployments: write
1718
id-token: write

benchmarks/src/main/java/org/elasticsearch/benchmark/vector/OSQScorerBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class OSQScorerBenchmark {
5252
LogConfigurator.configureESLogging(); // native access requires logging to be initialized
5353
}
5454

55-
@Param({ "1024" })
55+
@Param({ "384", "782", "1024" })
5656
int dims;
5757

5858
int length;

branches.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
{
1717
"branch": "8.18"
1818
},
19-
{
20-
"branch": "8.17"
21-
},
2219
{
2320
"branch": "7.17"
2421
}

docs/changelog/131429.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131429
2+
summary: Prevent auto-sharding for data streams in LOOKUP index mode
3+
area: Data streams
4+
type: bug
5+
issues: []

docs/changelog/131536.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131536
2+
summary: "Component Templates: Add `{created,modified}_date`"
3+
area: Ingest Node
4+
type: enhancement
5+
issues: []

docs/reference/elasticsearch/mapping-reference/semantic-text.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,30 @@ POST test-index/_search
267267
```
268268

269269
1. Specifies the maximum number of fragments to return.
270-
2. Sorts highlighted fragments by score when set to `score`. By default,
270+
2. Sorts the most relevant highlighted fragments by score when set to `score`. By default,
271271
fragments will be output in the order they appear in the field (order: none).
272272

273+
To use the `semantic` highlighter to view chunks in the order which they were indexed with no scoring,
274+
use the `match_all` query to retrieve them in the order they appear in the document:
275+
276+
```console
277+
POST test-index/_search
278+
{
279+
"query": {
280+
"match_all": {}
281+
},
282+
"highlight": {
283+
"fields": {
284+
"my_semantic_field": {
285+
"number_of_fragments": 5 <1>
286+
}
287+
}
288+
}
289+
}
290+
```
291+
292+
1. This will return the first 5 chunks, set this number higher to retrieve more chunks.
293+
273294
Highlighting is supported on fields other than semantic_text. However, if you
274295
want to restrict highlighting to the semantic highlighter and return no
275296
fragments when the field is not of type semantic_text, you can explicitly

docs/reference/elasticsearch/rest-apis/highlighting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ applies_to:
77

88
# Highlighting [highlighting]
99

10-
Highlighters enable you to get highlighted snippets from one or more fields in your search results so you can show users where the query matches are. When you request highlights, the response contains an additional `highlight` element for each search hit that includes the highlighted fields and the highlighted fragments.
10+
Highlighters enable you to retrieve the best-matching highlighted snippets from one or more fields in your search results so you can show users where the query matches are. When you request highlights, the response contains an additional `highlight` element for each search hit that includes the highlighted fields and the highlighted fragments.
1111

1212
::::{note}
1313
Highlighters don’t reflect the boolean logic of a query when extracting terms to highlight. Thus, for some complex boolean queries (e.g nested boolean queries, queries using `minimum_should_match` etc.), parts of documents may be highlighted that don’t correspond to query matches.

docs/reference/query-languages/esql/_snippets/functions/description/v_l2_norm.md

Lines changed: 6 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/_snippets/functions/examples/v_l2_norm.md

Lines changed: 24 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/_snippets/functions/layout/v_l2_norm.md

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

0 commit comments

Comments
 (0)