Skip to content

Commit 09497b3

Browse files
committed
fix serialize composite block test
1 parent 6ce22f3 commit 09497b3

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockSerializationTests.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
package org.elasticsearch.compute.data;
99

1010
import org.apache.lucene.util.BytesRef;
11+
import org.elasticsearch.TransportVersion;
12+
import org.elasticsearch.TransportVersions;
1113
import org.elasticsearch.common.breaker.CircuitBreaker;
1214
import org.elasticsearch.common.breaker.CircuitBreakingException;
1315
import org.elasticsearch.common.unit.ByteSizeValue;
@@ -22,6 +24,7 @@
2224
import org.elasticsearch.core.Releasables;
2325
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
2426
import org.elasticsearch.test.EqualsHashCodeTestUtils;
27+
import org.elasticsearch.test.TransportVersionUtils;
2528

2629
import java.io.IOException;
2730
import java.util.Arrays;
@@ -383,7 +386,16 @@ public void testCompositeBlock() throws Exception {
383386
for (int b = 0; b < numBlocks; b++) {
384387
assertThat(origBlock.getBlock(b), equalTo(blocks[b]));
385388
}
386-
try (CompositeBlock deserBlock = serializeDeserializeBlock(origBlock)) {
389+
try (
390+
CompositeBlock deserBlock = serializeDeserializeBlockWithVersion(
391+
origBlock,
392+
TransportVersionUtils.randomVersionBetween(
393+
random(),
394+
TransportVersions.AGGREGATE_METRIC_DOUBLE_BLOCK,
395+
TransportVersion.current()
396+
)
397+
)
398+
) {
387399
assertThat(deserBlock.getBlockCount(), equalTo(numBlocks));
388400
for (int b = 0; b < numBlocks; b++) {
389401
assertThat(deserBlock.getBlock(b), equalTo(origBlock.getBlock(b)));

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/SerializationTestCase.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,14 @@ BlockStreamInput blockStreamInput(BytesStreamOutput out) {
5353
return new BlockStreamInput(ByteBufferStreamInput.wrap(BytesReference.toBytes(out.bytes())), blockFactory);
5454
}
5555

56-
@SuppressWarnings("unchecked")
5756
<T extends Block> T serializeDeserializeBlock(T origBlock) throws IOException {
57+
TransportVersion version = TransportVersionUtils.randomCompatibleVersion(random());
58+
return serializeDeserializeBlockWithVersion(origBlock, version);
59+
}
60+
61+
@SuppressWarnings("unchecked")
62+
<T extends Block> T serializeDeserializeBlockWithVersion(T origBlock, TransportVersion version) throws IOException {
5863
try (BytesStreamOutput out = new BytesStreamOutput()) {
59-
TransportVersion version = TransportVersionUtils.randomCompatibleVersion(random());
6064
out.setTransportVersion(version);
6165
Block.writeTypedBlock(origBlock, out);
6266
try (BlockStreamInput in = blockStreamInput(out)) {

0 commit comments

Comments
 (0)