Skip to content

Commit 27a557b

Browse files
authored
Claim transport version for a profiling backport (#129030)
1 parent 5ee6dfa commit 27a557b

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
@@ -190,6 +190,7 @@ static TransportVersion def(int id) {
190190
public static final TransportVersion JOIN_ON_ALIASES_8_19 = def(8_841_0_42);
191191
public static final TransportVersion ILM_ADD_SKIP_SETTING_8_19 = def(8_841_0_43);
192192
public static final TransportVersion ESQL_REGEX_MATCH_WITH_CASE_INSENSITIVITY_8_19 = def(8_841_0_44);
193+
public static final TransportVersion ESQL_QUERY_PLANNING_DURATION_8_19 = def(8_841_0_45);
193194
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
194195
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
195196
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlExecutionInfo.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ public EsqlExecutionInfo(StreamInput in) throws IOException {
129129

130130
this.skipUnavailablePredicate = Predicates.always();
131131
this.relativeStart = null;
132-
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_QUERY_PLANNING_DURATION)) {
132+
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_QUERY_PLANNING_DURATION)
133+
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_QUERY_PLANNING_DURATION_8_19)) {
133134
this.overallTimeSpan = in.readOptional(TimeSpan::readFrom);
134135
this.planningTimeSpan = in.readOptional(TimeSpan::readFrom);
135136
}
@@ -149,7 +150,8 @@ public void writeTo(StreamOutput out) throws IOException {
149150
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_RESPONSE_PARTIAL)) {
150151
out.writeBoolean(isPartial);
151152
}
152-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_QUERY_PLANNING_DURATION)) {
153+
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_QUERY_PLANNING_DURATION)
154+
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_QUERY_PLANNING_DURATION_8_19)) {
153155
out.writeOptionalWriteable(overallTimeSpan);
154156
out.writeOptionalWriteable(planningTimeSpan);
155157
}

0 commit comments

Comments
 (0)