Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import java.util.function.IntFunction;

import static java.util.Map.entry;
import static org.elasticsearch.TransportVersions.V_8_11_X;

/**
* A stream from another node to this node. Technically, it can also be streamed from a byte array but that is mostly for testing.
Expand Down Expand Up @@ -813,13 +812,10 @@ public final void writeOptionalInstant(@Nullable Instant instant) throws IOExcep
entry(GenericNamedWriteable.class, (o, v) -> {
// Note that we do not rely on the checks in VersionCheckingStreamOutput because that only applies to CCS
final var genericNamedWriteable = (GenericNamedWriteable) v;
TransportVersion minSupportedVersion = genericNamedWriteable.getMinimalSupportedVersion();
assert minSupportedVersion.onOrAfter(V_8_11_X) : "[GenericNamedWriteable] requires [" + V_8_11_X + "]";
if (o.getTransportVersion().before(minSupportedVersion)) {
if (genericNamedWriteable.supportsVersion(o.getTransportVersion()) == false) {
final var message = Strings.format(
"[%s] requires minimal transport version [%s] and cannot be sent using transport version [%s]",
"[%s] doesn't support serialization with transport version [%s]",
genericNamedWriteable.getWriteableName(),
minSupportedVersion,
o.getTransportVersion()
);
assert false : message;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void testSerializationFailsWithOlderVersion() {
output.setTransportVersion(older);
assertThat(
expectThrows(Throwable.class, () -> output.writeGenericValue(testInstance)).getMessage(),
containsString("[GeoBoundingBox] requires minimal transport version")
containsString("[GeoBoundingBox] doesn't support serialization with transport version")
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,14 @@ public void writeTo(StreamOutput out) throws IOException {
}

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ESQL_AGGREGATE_METRIC_DOUBLE_LITERAL;
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ESQL_AGGREGATE_METRIC_DOUBLE_LITERAL);
}

@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "must not be called when overriding supportsVersion";
throw new UnsupportedOperationException("must not be called when overriding supportsVersion");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void testSerializationFailsWithOlderVersion() {
output.setTransportVersion(older);
assertThat(
expectThrows(Throwable.class, () -> output.writeGenericValue(testInstance)).getMessage(),
containsString("[" + shapeValueName() + "] requires minimal transport version")
containsString("[" + shapeValueName() + "] doesn't support serialization with transport version")
);
}
}
Expand Down