From c62d872cb35b4f3b15f60242c2db7b0c07e9f871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Cea=20Fontenla?= Date: Mon, 10 Mar 2025 15:31:43 +0100 Subject: [PATCH] Backport BlockMultiValuedTests fix --- .../elasticsearch/compute/data/BlockMultiValuedTests.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockMultiValuedTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockMultiValuedTests.java index 6d52dde9ad57f..a45560a31207e 100644 --- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockMultiValuedTests.java +++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockMultiValuedTests.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.function.IntUnaryOperator; import java.util.stream.IntStream; @@ -133,10 +134,12 @@ public void testToMask() { if (elementType != ElementType.BOOLEAN) { return; } - int positionCount = randomIntBetween(1, 16 * 1024); + int positionCount = randomIntBetween(0, 16 * 1024); var b = RandomBlock.randomBlock(blockFactory(), elementType, positionCount, nullAllowed, 2, 10, 0, 0); try (ToMask mask = ((BooleanBlock) b.block()).toMask()) { - assertThat(mask.hadMultivaluedFields(), equalTo(true)); + var anyNonNullValue = b.values().stream().anyMatch(Objects::nonNull); + assertThat(mask.hadMultivaluedFields(), equalTo(anyNonNullValue)); + for (int p = 0; p < b.values().size(); p++) { List v = b.values().get(p); if (v == null) {