Skip to content

Commit fd02122

Browse files
jdconradjdconrad
committed
more migrations
1 parent 4f83383 commit fd02122

File tree

9 files changed

+39
-17
lines changed

9 files changed

+39
-17
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ static TransportVersion def(int id) {
207207
public static final TransportVersion ML_INFERENCE_SAGEMAKER_ELASTIC_8_19 = def(8_841_0_57);
208208
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19 = def(8_841_0_58);
209209
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
210-
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_8_19 = def(8_841_0_64);
211210
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
212211
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
213212
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);
@@ -319,11 +318,6 @@ static TransportVersion def(int id) {
319318
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE = def(9_105_0_00);
320319
public static final TransportVersion ML_INFERENCE_SAGEMAKER_ELASTIC = def(9_106_0_00);
321320
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = def(9_107_0_00);
322-
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02);
323-
// Below is the first version in 9.2 and NOT in 9.1.
324-
public static final TransportVersion ESQL_FIXED_INDEX_LIKE = def(9_119_0_00);
325-
public static final TransportVersion LOOKUP_JOIN_CCS = def(9_120_0_00);
326-
public static final TransportVersion NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO = def(9_121_0_00);
327321

328322
public static final TransportVersionSet TEST = TransportVersionSet.get("test-potato");
329323

‎server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.cluster;
1111

1212
import org.elasticsearch.TransportVersion;
13+
import org.elasticsearch.TransportVersionSet;
1314
import org.elasticsearch.TransportVersions;
1415
import org.elasticsearch.cluster.routing.RecoverySource;
1516
import org.elasticsearch.cluster.routing.ShardRouting;
@@ -49,6 +50,10 @@ public class ClusterInfo implements ChunkedToXContent, Writeable {
4950

5051
public static final ClusterInfo EMPTY = new ClusterInfo();
5152

53+
public static final TransportVersionSet NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO = TransportVersionSet.get(
54+
"node-usage-stats-for-thread-pools-in-cluster-info"
55+
);
56+
5257
public static final TransportVersion DATA_PATH_NEW_KEY_VERSION = TransportVersions.V_8_6_0;
5358

5459
private final Map<String, DiskUsage> leastAvailableSpaceUsage;
@@ -111,7 +116,7 @@ public ClusterInfo(StreamInput in) throws IOException {
111116
} else {
112117
this.estimatedHeapUsages = Map.of();
113118
}
114-
if (in.getTransportVersion().onOrAfter(TransportVersions.NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO)) {
119+
if (NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO.isCompatible(in.getTransportVersion())) {
115120
this.nodeUsageStatsForThreadPools = in.readImmutableMap(NodeUsageStatsForThreadPools::new);
116121
} else {
117122
this.nodeUsageStatsForThreadPools = Map.of();
@@ -133,7 +138,7 @@ public void writeTo(StreamOutput out) throws IOException {
133138
if (out.getTransportVersion().onOrAfter(TransportVersions.HEAP_USAGE_IN_CLUSTER_INFO)) {
134139
out.writeMap(this.estimatedHeapUsages, StreamOutput::writeWriteable);
135140
}
136-
if (out.getTransportVersion().onOrAfter(TransportVersions.NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO)) {
141+
if (NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO.isCompatible(out.getTransportVersion())) {
137142
out.writeMap(this.nodeUsageStatsForThreadPools, StreamOutput::writeWriteable);
138143
}
139144
}

‎server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.apache.lucene.search.MultiTermQuery;
1515
import org.apache.lucene.search.Query;
1616
import org.elasticsearch.TransportVersion;
17+
import org.elasticsearch.TransportVersionSet;
1718
import org.elasticsearch.TransportVersions;
1819
import org.elasticsearch.common.ParsingException;
1920
import org.elasticsearch.common.Strings;
@@ -46,6 +47,8 @@ public class WildcardQueryBuilder extends AbstractQueryBuilder<WildcardQueryBuil
4647
private static final ParseField VALUE_FIELD = new ParseField("value");
4748
private static final ParseField REWRITE_FIELD = new ParseField("rewrite");
4849

50+
public static final TransportVersionSet ESQL_FIXED_INDEX_LIKE = TransportVersionSet.get("esql-fixed-index-like");
51+
4952
private final String fieldName;
5053

5154
private final String value;
@@ -126,9 +129,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
126129
* Returns true if the Transport version is compatible with ESQL_FIXED_INDEX_LIKE
127130
*/
128131
public static boolean expressionTransportSupported(TransportVersion version) {
129-
return version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
130-
|| version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19)
131-
|| version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1);
132+
return ESQL_FIXED_INDEX_LIKE.isCompatible(version);
132133
}
133134

134135
@Override

‎server/src/main/resources/org/elasticsearch/transport/9.2-LATEST.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "ml-inference-custom-service-embedding-type",
2+
"name": "node-usage-stats-for-thread-pools-in-cluster-info",
33
"ids": [
4-
9118000
4+
9121000
55
]
66
}

‎server/src/main/resources/org/elasticsearch/transport/esql-fixed-index-like.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "esql-fixed-index-like",
3+
"ids": [
4+
9190000,
5+
9112002,
6+
8841064
7+
]
8+
}

‎server/src/main/resources/org/elasticsearch/transport/lookup-join-css.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "lookup-join-css",
3+
"ids": [
4+
9120000
5+
]
6+
}

‎server/src/main/resources/org/elasticsearch/transport/node-usage-stats-for-thread-pools-in-cluster-info.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "node-usage-stats-for-thread-pools-in-cluster-info",
3+
"ids": [
4+
9121000
5+
]
6+
}

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanStreamWrapperQueryBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.apache.lucene.search.Query;
1111
import org.elasticsearch.TransportVersion;
12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1413
import org.elasticsearch.common.io.stream.StreamInput;
1514
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -20,6 +19,7 @@
2019

2120
import java.io.IOException;
2221

22+
import static org.elasticsearch.index.query.WildcardQueryBuilder.ESQL_FIXED_INDEX_LIKE;
2323
import static org.elasticsearch.index.query.WildcardQueryBuilder.expressionTransportSupported;
2424

2525
/**
@@ -55,7 +55,7 @@ public void writeTo(StreamOutput out) throws IOException {
5555

5656
@Override
5757
public TransportVersion getMinimalSupportedVersion() {
58-
return TransportVersions.ESQL_FIXED_INDEX_LIKE;
58+
return ESQL_FIXED_INDEX_LIKE.local();
5959
}
6060

6161
@Override

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
package org.elasticsearch.xpack.esql.session;
99

10-
import org.elasticsearch.TransportVersions;
10+
import org.elasticsearch.TransportVersionSet;
1111
import org.elasticsearch.action.ActionListener;
1212
import org.elasticsearch.action.OriginalIndices;
1313
import org.elasticsearch.action.support.IndicesOptions;
@@ -124,6 +124,8 @@ public class EsqlSession {
124124

125125
private static final Logger LOGGER = LogManager.getLogger(EsqlSession.class);
126126

127+
public static final TransportVersionSet LOOKUP_JOIN_CCS = TransportVersionSet.get("lookup-join-ccs");
128+
127129
/**
128130
* Interface for running the underlying plan.
129131
* Abstracts away the underlying execution engine.
@@ -591,7 +593,7 @@ private void validateRemoteVersions(EsqlExecutionInfo executionInfo) {
591593
if (clusterAlias.equals(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY) == false) {
592594
// No need to check local, obviously
593595
var connection = remoteClusterService.getConnection(clusterAlias);
594-
if (connection != null && connection.getTransportVersion().before(TransportVersions.LOOKUP_JOIN_CCS)) {
596+
if (connection != null && connection.getTransportVersion().before(LOOKUP_JOIN_CCS.local())) {
595597
skipClusterOrError(
596598
clusterAlias,
597599
executionInfo,

0 commit comments

Comments
 (0)