Skip to content

Commit a451628

Browse files
authored
Merge branch 'main' into fix/esql-fix-bucket-csv-tests
2 parents 0bbc290 + f8d97f3 commit a451628

File tree

40 files changed

+2563
-2486
lines changed

40 files changed

+2563
-2486
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/changelog/132088.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 132088
2+
summary: Fix combine result for `ingest_took`
3+
area: ES|QL
4+
type: bug
5+
issues: []

muted-tests.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,9 @@ tests:
530530
- class: org.elasticsearch.xpack.sql.qa.mixed_node.SqlCompatIT
531531
method: testNullsOrderWithMissingOrderSupportQueryingNewNode
532532
issue: https://github.com/elastic/elasticsearch/issues/132249
533+
- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
534+
method: test
535+
issue: https://github.com/elastic/elasticsearch/issues/132273
533536

534537
# Examples:
535538
#
@@ -568,4 +571,4 @@ tests:
568571
# issue: "https://github.com/elastic/elasticsearch/..."
569572
# - class: "org.elasticsearch.xpack.esql.**"
570573
# method: "test {union_types.MultiIndexIpStringStatsInline *}"
571-
# issue: "https://github.com/elastic/elasticsearch/..."
574+
# issue: "https://github.com/elastic/elasticsearch/..."

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);

server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import java.io.IOException;
2222
import java.util.Iterator;
23+
import java.util.List;
2324

2425
/**
2526
* A response of a bulk execution. Holding a response for each item responding (in order) of the
@@ -166,4 +167,32 @@ public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params params
166167
return builder.startArray(ITEMS);
167168
}), Iterators.forArray(responses), Iterators.<ToXContent>single((builder, p) -> builder.endArray().endObject()));
168169
}
170+
171+
/**
172+
* Combine many bulk responses into one.
173+
*/
174+
public static BulkResponse combine(List<BulkResponse> responses) {
175+
long tookInMillis = 0;
176+
long ingestTookInMillis = NO_INGEST_TOOK;
177+
int itemResponseCount = 0;
178+
for (BulkResponse response : responses) {
179+
tookInMillis += response.getTookInMillis();
180+
if (response.getIngestTookInMillis() != NO_INGEST_TOOK) {
181+
if (ingestTookInMillis == NO_INGEST_TOOK) {
182+
ingestTookInMillis = 0;
183+
}
184+
ingestTookInMillis += response.getIngestTookInMillis();
185+
}
186+
itemResponseCount += response.getItems().length;
187+
}
188+
BulkItemResponse[] bulkItemResponses = new BulkItemResponse[itemResponseCount];
189+
int i = 0;
190+
for (BulkResponse response : responses) {
191+
for (BulkItemResponse itemResponse : response.getItems()) {
192+
bulkItemResponses[i++] = itemResponse;
193+
}
194+
}
195+
196+
return new BulkResponse(bulkItemResponses, tookInMillis, ingestTookInMillis);
197+
}
169198
}

0 commit comments

Comments
 (0)