Skip to content

Commit 44a1190

Browse files
authored
Adjust bwc for block serialization (#125276)
Adjust wire version after backporting to 8.x. Relates #124394
1 parent e186b15 commit 44a1190

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ static TransportVersion def(int id) {
148148
public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_8_19 = def(8_841_0_07);
149149
public static final TransportVersion INFERENCE_CONTEXT_8_X = def(8_841_0_08);
150150
public static final TransportVersion ML_INFERENCE_DEEPSEEK_8_19 = def(8_841_0_09);
151+
public static final TransportVersion ESQL_SERIALIZE_BLOCK_TYPE_CODE_8_19 = def(8_841_0_10);
151152
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
152153
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
153154
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/ElementType.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ public String pascalCaseName() {
122122
* Read element type from an input stream
123123
*/
124124
static ElementType readFrom(StreamInput in) throws IOException {
125-
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_SERIALIZE_BLOCK_TYPE_CODE)) {
125+
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_SERIALIZE_BLOCK_TYPE_CODE)
126+
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_SERIALIZE_BLOCK_TYPE_CODE_8_19)) {
126127
byte b = in.readByte();
127128
return values()[b];
128129
} else {
@@ -136,7 +137,8 @@ static ElementType readFrom(StreamInput in) throws IOException {
136137
}
137138

138139
void writeTo(StreamOutput out) throws IOException {
139-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_SERIALIZE_BLOCK_TYPE_CODE)) {
140+
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_SERIALIZE_BLOCK_TYPE_CODE)
141+
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_SERIALIZE_BLOCK_TYPE_CODE_8_19)) {
140142
out.writeByte(writableCode);
141143
} else {
142144
out.writeString(legacyWritableName);

0 commit comments

Comments
 (0)