Skip to content

Commit d5f7054

Browse files
committed
Migrate transport versions 8841_005 through 8841_000
1 parent 2832beb commit d5f7054

File tree

18 files changed

+53
-56
lines changed

18 files changed

+53
-56
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,23 +139,10 @@ static TransportVersion def(int id) {
139139
public static final TransportVersion TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER = def(8_838_0_00);
140140
public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00);
141141
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
142-
// TODO: add to remove_all_applicable_selector.csv
143-
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_18 = def(8_840_0_01);
144-
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00);
145-
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_841_0_01);
146-
// TODO: add to remove_all_applicable_selector.csv
147-
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_19 = def(8_841_0_02);
148-
public static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE_BACKPORT_8_19 = def(8_841_0_03);
149-
public static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS_BACKPORT_8_19 = def(8_841_0_04);
150-
public static final TransportVersion VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X = def(8_841_0_05);
151-
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);
152-
public static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE = def(9_006_0_00);
153142
public static final TransportVersion ESQL_PROFILE_ASYNC_NANOS = def(9_007_00_0);
154143
public static final TransportVersion ESQL_LOOKUP_JOIN_SOURCE_TEXT = def(9_008_0_00);
155144
public static final TransportVersion SLM_UNHEALTHY_IF_NO_SNAPSHOT_WITHIN = def(9_010_0_00);
156-
public static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS = def(9_011_0_00);
157145
public static final TransportVersion REMOVE_REPOSITORY_CONFLICT_MESSAGE = def(9_012_0_00);
158-
public static final TransportVersion VOYAGE_AI_INTEGRATION_ADDED = def(9_014_0_00);
159146
public static final TransportVersion ESQL_SERIALIZE_SOURCE_FUNCTIONS_WARNINGS = def(9_016_0_00);
160147
public static final TransportVersion ESQL_DRIVER_NODE_DESCRIPTION = def(9_017_0_00);
161148
public static final TransportVersion MULTI_PROJECT = def(9_018_0_00);

server/src/main/java/org/elasticsearch/action/support/IndexComponentSelector.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.action.support;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.common.io.stream.StreamInput;
1514
import org.elasticsearch.common.io.stream.StreamOutput;
1615
import org.elasticsearch.common.io.stream.Writeable;
@@ -95,9 +94,7 @@ public static IndexComponentSelector getByKeyOrThrow(@Nullable String key) {
9594

9695
public static IndexComponentSelector read(StreamInput in) throws IOException {
9796
byte id = in.readByte();
98-
if (in.getTransportVersion().supports(REMOVE_ALL_APPLICABLE_SELECTOR)
99-
|| in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_18)
100-
|| in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_19)) {
97+
if (in.getTransportVersion().supports(REMOVE_ALL_APPLICABLE_SELECTOR)) {
10198
return getById(id);
10299
} else {
103100
// Legacy value ::*, converted to ::data
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9001000,8841001
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9006000,8841003
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9011000,8841004
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9009000,9000005
1+
9009000,9000005,8841002,8840001
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9014000,8841005
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8841000

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.esql.plugin;
99

1010
import org.elasticsearch.TransportVersion;
11-
import org.elasticsearch.TransportVersions;
1211
import org.elasticsearch.action.ActionListener;
1312
import org.elasticsearch.action.ActionListenerResponseHandler;
1413
import org.elasticsearch.action.ActionRunnable;
@@ -66,6 +65,11 @@
6665
* and executing these computes on the data nodes.
6766
*/
6867
final class DataNodeComputeHandler implements TransportRequestHandler<DataNodeRequest> {
68+
69+
private static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE = TransportVersion.fromName(
70+
"esql_retry_on_shard_level_failure"
71+
);
72+
6973
private final ComputeService computeService;
7074
private final SearchService searchService;
7175
private final ClusterService clusterService;
@@ -534,7 +538,6 @@ public void messageReceived(DataNodeRequest request, TransportChannel channel, T
534538
}
535539

536540
static boolean supportShardLevelRetryFailure(TransportVersion transportVersion) {
537-
return transportVersion.onOrAfter(TransportVersions.ESQL_RETRY_ON_SHARD_LEVEL_FAILURE)
538-
|| transportVersion.isPatchFrom(TransportVersions.ESQL_RETRY_ON_SHARD_LEVEL_FAILURE_BACKPORT_8_19);
541+
return transportVersion.supports(ESQL_RETRY_ON_SHARD_LEVEL_FAILURE);
539542
}
540543
}

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/Configuration.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.esql.session;
99

1010
import org.elasticsearch.TransportVersion;
11-
import org.elasticsearch.TransportVersions;
1211
import org.elasticsearch.common.bytes.BytesArray;
1312
import org.elasticsearch.common.compress.CompressorFactory;
1413
import org.elasticsearch.common.io.stream.StreamInput;
@@ -40,6 +39,8 @@ public class Configuration implements Writeable {
4039

4140
private static final TransportVersion TIMESERIES_DEFAULT_LIMIT = TransportVersion.fromName("timeseries_default_limit");
4241

42+
private static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS = TransportVersion.fromName("esql_support_partial_results");
43+
4344
private final String clusterName;
4445
private final String username;
4546
private final ZonedDateTime now;
@@ -109,8 +110,7 @@ public Configuration(BlockStreamInput in) throws IOException {
109110
this.profile = in.readBoolean();
110111
this.tables = in.readImmutableMap(i1 -> i1.readImmutableMap(i2 -> new Column((BlockStreamInput) i2)));
111112
this.queryStartTimeNanos = in.readLong();
112-
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_SUPPORT_PARTIAL_RESULTS)
113-
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_SUPPORT_PARTIAL_RESULTS_BACKPORT_8_19)) {
113+
if (in.getTransportVersion().supports(ESQL_SUPPORT_PARTIAL_RESULTS)) {
114114
this.allowPartialResults = in.readBoolean();
115115
} else {
116116
this.allowPartialResults = false;
@@ -140,8 +140,7 @@ public void writeTo(StreamOutput out) throws IOException {
140140
out.writeBoolean(profile);
141141
out.writeMap(tables, (o1, columns) -> o1.writeMap(columns, StreamOutput::writeWriteable));
142142
out.writeLong(queryStartTimeNanos);
143-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_SUPPORT_PARTIAL_RESULTS)
144-
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_SUPPORT_PARTIAL_RESULTS_BACKPORT_8_19)) {
143+
if (out.getTransportVersion().supports(ESQL_SUPPORT_PARTIAL_RESULTS)) {
145144
out.writeBoolean(allowPartialResults);
146145
}
147146
if (out.getTransportVersion().supports(TIMESERIES_DEFAULT_LIMIT)) {

0 commit comments

Comments
 (0)