Skip to content

Commit d0d46f6

Browse files
Merge branch 'main' into date-nanos-implicit-casting
2 parents e0b903d + 3277ff8 commit d0d46f6

File tree

98 files changed

+1936
-1410
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

+1936
-1410
lines changed

build-conventions/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies {
7777
api buildLibs.apache.rat
7878
compileOnly buildLibs.checkstyle
7979
constraints {
80-
api("org.eclipse.platform:org.eclipse.osgi:3.18.500") {
80+
api("org.eclipse.platform:org.eclipse.osgi:3.18.300") {
8181
because("Use the same version as we do in spotless gradle plugin at runtime")
8282
}
8383
}

docs/changelog/125764.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
pr: 125764
2+
summary: Fix `ReplaceMissingFieldsWithNull`
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 126036
7+
- 121754
8+
- 126030

docs/changelog/126038.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 126038
2+
summary: Mark `rescore_vector` as generally available
3+
area: Vector Search
4+
type: enhancement
5+
issues: []

docs/changelog/126191.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 126191
2+
summary: Fix NPE for missing Content Type header in OIDC Authenticator
3+
area: Authentication
4+
type: bug
5+
issues: []

docs/reference/elasticsearch/mapping-reference/dense-vector.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ $$$dense-vector-index-options$$$
288288
: (Optional, float) Only applicable to `int8_hnsw`, `int4_hnsw`, `int8_flat`, and `int4_flat` index types. The confidence interval to use when quantizing the vectors. Can be any value between and including `0.90` and `1.0` or exactly `0`. When the value is `0`, this indicates that dynamic quantiles should be calculated for optimized quantization. When between `0.90` and `1.0`, this value restricts the values used when calculating the quantization thresholds. For example, a value of `0.95` will only use the middle 95% of the values when calculating the quantization thresholds (e.g. the highest and lowest 2.5% of values will be ignored). Defaults to `1/(dims + 1)` for `int8` quantized vectors and `0` for `int4` for dynamic quantile calculation.
289289

290290
`rescore_vector`
291-
: (Optional, object) Functionality in [preview]. An optional section that configures automatic vector rescoring on knn queries for the given field. Only applicable to quantized index types.
291+
: (Optional, object) An optional section that configures automatic vector rescoring on knn queries for the given field. Only applicable to quantized index types.
292292
:::::{dropdown} Properties of `rescore_vector`
293293
`oversample`
294294
: (required, float) The amount to oversample the search results by. This value should be greater than `1.0` and less than `10.0` or exactly `0` to indicate no oversampling & rescoring should occur. The higher the value, the more vectors will be gathered and rescored with the raw values per shard.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ A kNN retriever returns top documents from a [k-nearest neighbor search (kNN)](d
198198

199199

200200
`rescore_vector`
201-
: (Optional, object) Functionality in [preview]. Apply oversampling and rescoring to quantized vectors.
201+
: (Optional, object) Apply oversampling and rescoring to quantized vectors.
202202

203203
::::{note}
204204
Rescoring only makes sense for quantized vectors; when [quantization](/reference/elasticsearch/mapping-reference/dense-vector.md#dense-vector-quantization) is not used, the original vectors are used for scoring. Rescore option will be ignored for non-quantized `dense_vector` fields.

docs/reference/query-languages/query-dsl/query-dsl-knn-query.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ The filter is a pre-filter, meaning that it is applied **during** the approximat
9898

9999

100100
`rescore_vector`
101-
: (Optional, object) Functionality in [preview]. Apply oversampling and rescoring to quantized vectors.
101+
: (Optional, object) Apply oversampling and rescoring to quantized vectors.
102102

103103
::::{note}
104104
Rescoring only makes sense for quantized vectors; when [quantization](/reference/elasticsearch/mapping-reference/dense-vector.md#dense-vector-quantization) is not used, the original vectors are used for scoring. Rescore option will be ignored for non-quantized `dense_vector` fields.

gradle/build.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2.
4343
spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
4444
spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }
4545
spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" }
46-
spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.2"
46+
spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
4747
wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2"
4848
xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2"
4949

gradle/verification-metadata.xml

Lines changed: 278 additions & 68 deletions
Large diffs are not rendered by default.

modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/TransportDeleteDataStreamOptionsAction.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,13 @@ protected void masterOperation(
8181
for (String name : dataStreamNames) {
8282
systemIndices.validateDataStreamAccess(name, threadPool.getThreadContext());
8383
}
84-
metadataDataStreamsService.removeDataStreamOptions(dataStreamNames, request.ackTimeout(), request.masterNodeTimeout(), listener);
84+
metadataDataStreamsService.removeDataStreamOptions(
85+
state.projectId(),
86+
dataStreamNames,
87+
request.ackTimeout(),
88+
request.masterNodeTimeout(),
89+
listener
90+
);
8591
}
8692

8793
@Override

0 commit comments

Comments
 (0)