Skip to content

Commit 6c3230e

Browse files
Merge remote-tracking branch 'upstream/main' into knn_query_nested_filter
2 parents 5a818bc + 14debad commit 6c3230e

File tree

51 files changed

+769
-79
lines changed

Some content is hidden

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

51 files changed

+769
-79
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

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.

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,7 @@ private ModuleEntitlements getModuleScopeEntitlements(
367367
* @return true if permission is granted regardless of the entitlement
368368
*/
369369
boolean isTriviallyAllowed(Class<?> requestingClass) {
370-
if (generalLogger.isTraceEnabled()) {
371-
generalLogger.trace("Stack trace for upcoming trivially-allowed check", new Exception());
372-
}
370+
// note: do not log exceptions in here, this could interfere with loading of additionally necessary classes such as ThrowableProxy
373371
if (requestingClass == null) {
374372
generalLogger.debug("Entitlement trivially allowed: no caller frames outside the entitlement library");
375373
return true;

modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsActionTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,8 @@ private static ProjectMetadata getProjectWithDataStreamWithSettings(
644644
Template.builder().settings(componentTemplateSettings).build(),
645645
null,
646646
null,
647+
null,
648+
null,
647649
null
648650
);
649651
builder.componentTemplates(Map.of("component_template_1", componentTemplate));

modules/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.elasticsearch.telemetry.Measurement;
4242
import org.elasticsearch.telemetry.TestTelemetryPlugin;
4343
import org.elasticsearch.test.BackgroundIndexer;
44+
import org.elasticsearch.test.ESTestCase;
4445
import org.elasticsearch.threadpool.ThreadPool;
4546

4647
import java.io.ByteArrayInputStream;
@@ -73,6 +74,7 @@
7374
import static org.hamcrest.Matchers.is;
7475

7576
@SuppressForbidden(reason = "this test uses a HttpServer to emulate an Azure endpoint")
77+
@ESTestCase.WithoutEntitlements // due to dependency issue ES-12435
7678
public class AzureBlobStoreRepositoryTests extends ESMockAPIBasedRepositoryIntegTestCase {
7779

7880
protected static final String DEFAULT_ACCOUNT_NAME = "account";

modules/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureRepositoryMissingCredentialsIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
import org.elasticsearch.plugins.Plugin;
1919
import org.elasticsearch.repositories.RepositoryVerificationException;
2020
import org.elasticsearch.test.ESIntegTestCase;
21+
import org.elasticsearch.test.ESTestCase;
2122

2223
import java.util.Collection;
2324

2425
import static org.hamcrest.Matchers.allOf;
2526
import static org.hamcrest.Matchers.containsString;
2627

28+
@ESTestCase.WithoutEntitlements // due to dependency issue ES-12435
2729
public class AzureRepositoryMissingCredentialsIT extends ESIntegTestCase {
2830

2931
@Override

0 commit comments

Comments
 (0)