Skip to content

Commit 9de75e6

Browse files
authored
ESQL: Claim transport version to backport #121783 (#127997)
1 parent acc8ae7 commit 9de75e6

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ static TransportVersion def(int id) {
174174
public static final TransportVersion RESCORE_VECTOR_ALLOW_ZERO_BACKPORT_8_19 = def(8_841_0_27);
175175
public static final TransportVersion INFERENCE_ADD_TIMEOUT_PUT_ENDPOINT_8_19 = def(8_841_0_28);
176176
public static final TransportVersion ESQL_REPORT_SHARD_PARTITIONING_8_19 = def(8_841_0_29);
177+
public static final TransportVersion ESQL_DRIVER_TASK_DESCRIPTION_8_19 = def(8_841_0_30);
177178
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
178179
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
179180
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/DriverProfile.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public record DriverProfile(
5252
public static DriverProfile readFrom(StreamInput in) throws IOException {
5353
return new DriverProfile(
5454
in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION)
55-
|| in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) ? in.readString() : "",
55+
|| in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
56+
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION_8_19) ? in.readString() : "",
5657
in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_NODE_DESCRIPTION) ? in.readString() : "",
5758
in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_NODE_DESCRIPTION) ? in.readString() : "",
5859
in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0) ? in.readVLong() : 0,
@@ -68,7 +69,8 @@ public static DriverProfile readFrom(StreamInput in) throws IOException {
6869
@Override
6970
public void writeTo(StreamOutput out) throws IOException {
7071
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION)
71-
|| out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)) {
72+
|| out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
73+
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION_8_19)) {
7274
out.writeString(description);
7375
}
7476
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_NODE_DESCRIPTION)) {

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/DriverStatus.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public static DriverStatus readFrom(StreamInput in) throws IOException {
6363
return new DriverStatus(
6464
in.readString(),
6565
in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION)
66-
|| in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) ? in.readString() : "",
66+
|| in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
67+
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION_8_19) ? in.readString() : "",
6768
in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_NODE_DESCRIPTION) ? in.readString() : "",
6869
in.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_NODE_DESCRIPTION) ? in.readString() : "",
6970
in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0) ? in.readLong() : 0,
@@ -83,7 +84,8 @@ public static DriverStatus readFrom(StreamInput in) throws IOException {
8384
public void writeTo(StreamOutput out) throws IOException {
8485
out.writeString(sessionId);
8586
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION)
86-
|| out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)) {
87+
|| out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
88+
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_DRIVER_TASK_DESCRIPTION_8_19)) {
8789
out.writeString(description);
8890
}
8991
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_DRIVER_NODE_DESCRIPTION)) {

0 commit comments

Comments
 (0)