Skip to content

Commit 026651b

Browse files
committed
Merge remote-tracking branch 'es/main' into BlockSourceReader_source_filtering
2 parents 7741566 + f2386b5 commit 026651b

File tree

54 files changed

+566
-352
lines changed

Some content is hidden

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

54 files changed

+566
-352
lines changed

benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void setup() {
119119
}
120120

121121
private LogicalPlan plan(EsqlParser parser, Analyzer analyzer, LogicalPlanOptimizer optimizer, String query) {
122-
var parsed = parser.createStatement(query, new QueryParams(), telemetry, config);
122+
var parsed = parser.createStatement(query, new QueryParams(), telemetry);
123123
var analyzed = analyzer.analyze(parsed);
124124
var optimized = optimizer.optimize(analyzed);
125125
return optimized;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ To retrieve vector values explicitly, you can use:
133133
}
134134
```
135135

136+
:::{tip}
137+
For more context about the decision to exclude vectors from `_source` by default, read the [blog post](https://www.elastic.co/search-labs/blog/elasticsearch-exclude-vectors-from-source).
138+
:::
139+
136140
### Storage behavior and `_source`
137141

138142
By default, `dense_vector` fields are **not stored in `_source`** on disk. This is also controlled by the index setting `index.mapping.exclude_source_vectors`.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ POST my-index-2/_search
126126
}
127127
```
128128

129+
:::{tip}
130+
For more context about the decision to exclude vectors from `_source` by default, read the [blog post](https://www.elastic.co/search-labs/blog/elasticsearch-exclude-vectors-from-source).
131+
:::
132+
129133
### Storage behavior and `_source`
130134

131135
By default, `sparse_vector` fields are not stored in `_source` on disk. This is also controlled by the index setting `index.mapping.exclude_source_vectors`.

docs/reference/query-languages/esql/kibana/definition/settings/time_zone.json

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+
10+
package org.elasticsearch.simdvec;
11+
12+
import org.apache.lucene.util.quantization.QuantizedByteVectorValues;
13+
14+
public interface QuantizedByteVectorValuesAccess {
15+
QuantizedByteVectorValues get();
16+
}

libs/simdvec/src/main21/java/org/elasticsearch/simdvec/internal/Int7SQVectorScorerSupplier.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
1515
import org.apache.lucene.util.quantization.QuantizedByteVectorValues;
1616
import org.apache.lucene.util.quantization.ScalarQuantizedVectorSimilarity;
17+
import org.elasticsearch.simdvec.QuantizedByteVectorValuesAccess;
1718

1819
import java.io.IOException;
1920
import java.lang.foreign.MemorySegment;
@@ -23,7 +24,7 @@
2324
import static org.apache.lucene.index.VectorSimilarityFunction.MAXIMUM_INNER_PRODUCT;
2425
import static org.apache.lucene.util.quantization.ScalarQuantizedVectorSimilarity.fromVectorSimilarity;
2526

26-
public abstract sealed class Int7SQVectorScorerSupplier implements RandomVectorScorerSupplier {
27+
public abstract sealed class Int7SQVectorScorerSupplier implements RandomVectorScorerSupplier, QuantizedByteVectorValuesAccess {
2728

2829
static final byte BITS = 7;
2930

@@ -107,6 +108,11 @@ public void setScoringOrdinal(int node) throws IOException {
107108
};
108109
}
109110

111+
@Override
112+
public QuantizedByteVectorValues get() {
113+
return values;
114+
}
115+
110116
public static final class EuclideanSupplier extends Int7SQVectorScorerSupplier {
111117

112118
public EuclideanSupplier(MemorySegmentAccessInput input, QuantizedByteVectorValues values, float scoreCorrectionConstant) {

rest-api-spec/src/main/resources/rest-api-spec/api/async_search.submit.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
"default_operator": {
7979
"type": "enum",
8080
"options": [
81-
"AND",
82-
"OR"
81+
"and",
82+
"or"
8383
],
84-
"default": "OR",
84+
"default": "or",
8585
"description": "The default operator for query string query (AND or OR)"
8686
},
8787
"df": {

rest-api-spec/src/main/resources/rest-api-spec/api/count.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898
"default_operator": {
9999
"type": "enum",
100100
"options": [
101-
"AND",
102-
"OR"
101+
"and",
102+
"or"
103103
],
104-
"default": "OR",
104+
"default": "or",
105105
"description": "The default operator for query string query (AND or OR)"
106106
},
107107
"df": {

rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
"default_operator": {
4444
"type": "enum",
4545
"options": [
46-
"AND",
47-
"OR"
46+
"and",
47+
"or"
4848
],
49-
"default": "OR",
49+
"default": "or",
5050
"description": "The default operator for query string query (AND or OR)"
5151
},
5252
"df": {

rest-api-spec/src/main/resources/rest-api-spec/api/explain.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
"default_operator": {
4949
"type": "enum",
5050
"options": [
51-
"AND",
52-
"OR"
51+
"and",
52+
"or"
5353
],
54-
"default": "OR",
54+
"default": "or",
5555
"description": "The default operator for query string query (AND or OR)"
5656
},
5757
"df": {

0 commit comments

Comments
 (0)