Skip to content

Commit 7f2a769

Browse files
ivanceaivancea
authored
Merge branch 'main' into fix-esql-driver-status-concurrency
2 parents 0110c99 + dd3e3c9 commit 7f2a769

File tree

48 files changed

+1209
-766
lines changed

Some content is hidden

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

48 files changed

+1209
-766
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.1", "9.2.0"]
68+
BWC_VERSION: ["8.17.9", "8.18.5", "8.19.1", "9.0.5", "9.1.1", "9.2.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ steps:
302302
env:
303303
BWC_VERSION: 8.16.6
304304

305-
- label: "{{matrix.image}} / 8.17.10 / packaging-tests-upgrade"
306-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.10
305+
- label: "{{matrix.image}} / 8.17.9 / packaging-tests-upgrade"
306+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.9
307307
timeout_in_minutes: 300
308308
matrix:
309309
setup:
@@ -316,7 +316,7 @@ steps:
316316
machineType: custom-16-32768
317317
buildDirectory: /dev/shm/bk
318318
env:
319-
BWC_VERSION: 8.17.10
319+
BWC_VERSION: 8.17.9
320320

321321
- label: "{{matrix.image}} / 8.18.5 / packaging-tests-upgrade"
322322
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.5
@@ -334,8 +334,8 @@ steps:
334334
env:
335335
BWC_VERSION: 8.18.5
336336

337-
- label: "{{matrix.image}} / 8.19.0 / packaging-tests-upgrade"
338-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.0
337+
- label: "{{matrix.image}} / 8.19.1 / packaging-tests-upgrade"
338+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.1
339339
timeout_in_minutes: 300
340340
matrix:
341341
setup:
@@ -348,7 +348,7 @@ steps:
348348
machineType: custom-16-32768
349349
buildDirectory: /dev/shm/bk
350350
env:
351-
BWC_VERSION: 8.19.0
351+
BWC_VERSION: 8.19.1
352352

353353
- label: "{{matrix.image}} / 9.0.5 / packaging-tests-upgrade"
354354
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.5

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ steps:
325325
- signal_reason: agent_stop
326326
limit: 3
327327

328-
- label: 8.17.10 / bwc
329-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.10#bwcTest
328+
- label: 8.17.9 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.9#bwcTest
330330
timeout_in_minutes: 300
331331
agents:
332332
provider: gcp
@@ -335,7 +335,7 @@ steps:
335335
buildDirectory: /dev/shm/bk
336336
preemptible: true
337337
env:
338-
BWC_VERSION: 8.17.10
338+
BWC_VERSION: 8.17.9
339339
retry:
340340
automatic:
341341
- exit_status: "-1"
@@ -363,8 +363,8 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366-
- label: 8.19.0 / bwc
367-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.0#bwcTest
366+
- label: 8.19.1 / bwc
367+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.1#bwcTest
368368
timeout_in_minutes: 300
369369
agents:
370370
provider: gcp
@@ -373,7 +373,7 @@ steps:
373373
buildDirectory: /dev/shm/bk
374374
preemptible: true
375375
env:
376-
BWC_VERSION: 8.19.0
376+
BWC_VERSION: 8.19.1
377377
retry:
378378
automatic:
379379
- exit_status: "-1"
@@ -506,7 +506,7 @@ steps:
506506
setup:
507507
ES_RUNTIME_JAVA:
508508
- openjdk21
509-
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.1", "9.2.0"]
509+
BWC_VERSION: ["8.17.9", "8.18.5", "8.19.1", "9.0.5", "9.1.1", "9.2.0"]
510510
agents:
511511
provider: gcp
512512
image: family/elasticsearch-ubuntu-2404
@@ -550,7 +550,7 @@ steps:
550550
ES_RUNTIME_JAVA:
551551
- openjdk21
552552
- openjdk23
553-
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.1", "9.2.0"]
553+
BWC_VERSION: ["8.17.9", "8.18.5", "8.19.1", "9.0.5", "9.1.1", "9.2.0"]
554554
agents:
555555
provider: gcp
556556
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ BWC_VERSION:
1616
- "8.14.3"
1717
- "8.15.5"
1818
- "8.16.6"
19-
- "8.17.10"
19+
- "8.17.9"
2020
- "8.18.5"
21-
- "8.19.0"
21+
- "8.19.1"
2222
- "9.0.5"
2323
- "9.1.1"
2424
- "9.2.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BWC_VERSION:
2-
- "8.17.10"
2+
- "8.17.9"
33
- "8.18.5"
4-
- "8.19.0"
4+
- "8.19.1"
55
- "9.0.5"
66
- "9.1.1"
77
- "9.2.0"

‎docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,37 @@ The `linear` retriever supports the following normalizers:
9191
score = (score - min) / (max - min)
9292
```
9393
* `l2_norm`: Normalizes scores using the L2 norm of the score values {applies_to}`stack: ga 9.1`
94+
95+
## Example
96+
97+
This example of a hybrid search weights KNN results five times more heavily than BM25 results in the final ranking.
98+
99+
```console
100+
GET my_index/_search
101+
{
102+
"retriever": {
103+
"linear": {
104+
"retrievers": [
105+
{
106+
"retriever": {
107+
"knn": {
108+
...
109+
}
110+
},
111+
"weight": 5 # KNN query weighted 5x
112+
},
113+
{
114+
"retriever": {
115+
"standard": {
116+
...
117+
}
118+
},
119+
"weight": 1.5 # BM25 query weighted 1.5x
120+
}
121+
]
122+
}
123+
}
124+
}
125+
```
126+
127+
See also [this hybrid search example](retrievers-examples.md#retrievers-examples-linear-retriever).

‎muted-tests.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ tests:
290290
method: testOneRemoteClusterPartial
291291
issue: https://github.com/elastic/elasticsearch/issues/124055
292292
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
293-
method: test {lookup-join.MvJoinKeyOnTheLookupIndex ASYNC}
293+
method: test {csv-spec:lookup-join.MvJoinKeyOnTheLookupIndex}
294294
issue: https://github.com/elastic/elasticsearch/issues/128030
295295
- class: org.elasticsearch.packaging.test.EnrollmentProcessTests
296296
method: test20DockerAutoFormCluster
@@ -314,11 +314,8 @@ tests:
314314
method: testEarlyTermination
315315
issue: https://github.com/elastic/elasticsearch/issues/128721
316316
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
317-
method: test {lookup-join.EnrichLookupStatsBug ASYNC}
317+
method: test {csv-spec:lookup-join.EnrichLookupStatsBug}
318318
issue: https://github.com/elastic/elasticsearch/issues/129228
319-
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
320-
method: test {lookup-join.EnrichLookupStatsBug SYNC}
321-
issue: https://github.com/elastic/elasticsearch/issues/129229
322319
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
323320
method: test {lookup-join.MultipleBatches*
324321
issue: https://github.com/elastic/elasticsearch/issues/129210
@@ -363,7 +360,7 @@ tests:
363360
method: testWriteCanRejectOnPrimaryBasedOnMaxOperationSize
364361
issue: https://github.com/elastic/elasticsearch/issues/130281
365362
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
366-
method: test {lookup-join.MvJoinKeyOnFrom SYNC}
363+
method: test {csv-spec:lookup-join.MvJoinKeyOnFrom}
367364
issue: https://github.com/elastic/elasticsearch/issues/130296
368365
- class: org.elasticsearch.xpack.esql.inference.bulk.BulkInferenceExecutorTests
369366
method: testSuccessfulExecution
@@ -378,7 +375,7 @@ tests:
378375
method: failed tasks output logged to console when spooling true
379376
issue: https://github.com/elastic/elasticsearch/issues/119509
380377
- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT
381-
method: test {lookup-join.MvJoinKeyFromRow ASYNC}
378+
method: test {csv-spec:lookup-join.MvJoinKeyFromRow}
382379
issue: https://github.com/elastic/elasticsearch/issues/130642
383380
- class: org.elasticsearch.indices.stats.IndexStatsIT
384381
method: testFilterCacheStats
@@ -390,7 +387,7 @@ tests:
390387
method: testOpenContextsAfterRejections
391388
issue: https://github.com/elastic/elasticsearch/issues/130821
392389
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
393-
method: test {lookup-join.MvJoinKeyOnFromAfterStats ASYNC}
390+
method: test {csv-spec:lookup-join.MvJoinKeyOnFromAfterStats}
394391
issue: https://github.com/elastic/elasticsearch/issues/131148
395392
- class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT
396393
method: testLookupJoinAliases
@@ -533,6 +530,9 @@ tests:
533530
- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
534531
method: test
535532
issue: https://github.com/elastic/elasticsearch/issues/132273
533+
- class: org.elasticsearch.common.logging.JULBridgeTests
534+
method: testThrowable
535+
issue: https://github.com/elastic/elasticsearch/issues/132280
536536

537537
# Examples:
538538
#
@@ -564,7 +564,6 @@ tests:
564564
# issue: "https://github.com/elastic/elasticsearch/..."
565565
# Note that this mutes for the unit-test-like CsvTests only.
566566
# Muting all the integration tests can be done using the class "org.elasticsearch.xpack.esql.**".
567-
# Consider however, that some tests are named as "test {file.test SYNC}" and "ASYNC" in the integration tests.
568567
# To mute all 3 tests safely everywhere use:
569568
# - class: "org.elasticsearch.xpack.esql.**"
570569
# method: "test {union_types.MultiIndexIpStringStatsInline}"

‎server/src/main/java/org/elasticsearch/TransportVersions.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ static TransportVersion def(int id) {
213213
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN_8_19 = def(8_841_0_62);
214214
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_8_19 = def(8_841_0_63);
215215
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_8_19 = def(8_841_0_64);
216+
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_1 = def(8_841_0_65);
216217
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
217218
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
218219
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);

‎server/src/main/java/org/elasticsearch/Version.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,14 @@ public class Version implements VersionId<Version>, ToXContentFragment {
205205
public static final Version V_8_17_7 = new Version(8_17_07_99);
206206
public static final Version V_8_17_8 = new Version(8_17_08_99);
207207
public static final Version V_8_17_9 = new Version(8_17_09_99);
208-
public static final Version V_8_17_10 = new Version(8_17_10_99);
209208
public static final Version V_8_18_0 = new Version(8_18_00_99);
210209
public static final Version V_8_18_1 = new Version(8_18_01_99);
211210
public static final Version V_8_18_2 = new Version(8_18_02_99);
212211
public static final Version V_8_18_3 = new Version(8_18_03_99);
213212
public static final Version V_8_18_4 = new Version(8_18_04_99);
214213
public static final Version V_8_18_5 = new Version(8_18_05_99);
215214
public static final Version V_8_19_0 = new Version(8_19_00_99);
215+
public static final Version V_8_19_1 = new Version(8_19_01_99);
216216
public static final Version V_9_0_0 = new Version(9_00_00_99);
217217
public static final Version V_9_0_1 = new Version(9_00_01_99);
218218
public static final Version V_9_0_2 = new Version(9_00_02_99);

0 commit comments

Comments
 (0)