Skip to content

Commit 55ad1cd

Browse files
authored
Merge branch 'main' into tvclean0
2 parents a2f6048 + 0174aea commit 55ad1cd

File tree

23 files changed

+557
-292
lines changed

23 files changed

+557
-292
lines changed

docs/changelog/139318.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 139318
2+
summary: Remove `gpu_vectors_indexing` feature flag
3+
area: Vector Search
4+
type: enhancement
5+
issues: []

docs/changelog/139357.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 139357
2+
summary: Prune `InlineJoin` right aggregations by delegating to the child plan
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 138283

docs/redirects.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
redirects:
2+
# Redirect for bbq.md move
3+
'reference/elasticsearch/index-settings/bbq.md': 'reference/elasticsearch/mapping-reference/bbq.md'
4+
25
# Related to https://github.com/elastic/elasticsearch/pull/130716/
36
'reference/query-languages/eql/eql-ex-threat-detection.md': 'docs-content://explore-analyze/query-filter/languages/example-detect-threats-with-eql.md'
47

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ The `dense_vector` type supports quantization to reduce the memory footprint req
192192

193193
* `int8` - Quantizes each dimension of the vector to 1-byte integers. This reduces the memory footprint by 75% (or 4x) at the cost of some accuracy.
194194
* `int4` - Quantizes each dimension of the vector to half-byte integers. This reduces the memory footprint by 87% (or 8x) at the cost of accuracy.
195-
* `bbq` - Better binary quantization which reduces each dimension to a single bit precision. This reduces the memory footprint by 96% (or 32x) at a larger cost of accuracy. Generally, oversampling during query time and reranking can help mitigate the accuracy loss.
195+
* `bbq` - [Better binary quantization](/reference/elasticsearch/mapping-reference/bbq.md) which reduces each dimension to a single bit precision. This reduces the memory footprint by 96% (or 32x) at a larger cost of accuracy. Generally, oversampling during query time and reranking can help mitigate the accuracy loss.
196196

197197
When using a quantized format, you may want to oversample and rescore the results to improve accuracy. See [oversampling and rescoring](docs-content://solutions/search/vector/knn.md#dense-vector-knn-search-rescoring) for more information.
198198

docs/reference/elasticsearch/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ toc:
3838
- file: index-settings/index.md
3939
children:
4040
- file: index-settings/serverless.md
41-
- file: index-settings/bbq.md
4241
- file: index-settings/index-modules.md
4342
- file: index-settings/shard-allocation.md
4443
children:
@@ -219,6 +218,7 @@ toc:
219218
- file: mapping-reference/mapping-store.md
220219
- file: mapping-reference/subobjects.md
221220
- file: mapping-reference/term-vector.md
221+
- file: mapping-reference/bbq.md
222222
- file: elasticsearch-audit-events.md
223223
- file: command-line-tools/index.md
224224
children:

muted-tests.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,15 @@ tests:
484484
- class: org.elasticsearch.xpack.esql.qa.mixed.FieldExtractorIT
485485
method: testIntegerDocValuesConflict {null}
486486
issue: https://github.com/elastic/elasticsearch/issues/139450
487+
- class: org.elasticsearch.xpack.aggregatemetric.mapper.AggregateMetricDoubleFieldMapperTests
488+
method: testIndexTypes
489+
issue: https://github.com/elastic/elasticsearch/issues/139455
490+
- class: org.elasticsearch.xpack.aggregatemetric.mapper.AggregateMetricDoubleFieldMapperTests
491+
method: testSortShortcuts
492+
issue: https://github.com/elastic/elasticsearch/issues/139456
493+
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
494+
method: test {csv-spec:tdigest.UngroupedPercentiles}
495+
issue: https://github.com/elastic/elasticsearch/issues/139458
487496

488497
# Examples:
489498
#

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/DenseVectorMappingUpdateIT.java

Lines changed: 0 additions & 184 deletions
This file was deleted.

0 commit comments

Comments
 (0)