Skip to content

Commit 22e0cdb

Browse files
jdconradjdconrad
committed
more migrations
1 parent d28d79d commit 22e0cdb

File tree

12 files changed

+61
-29
lines changed

12 files changed

+61
-29
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,7 @@ private static class VersionsHolder {
203203
}
204204

205205
ALL_VERSIONS_MAP = ALL_VERSIONS.stream().collect(Collectors.toUnmodifiableMap(TransportVersion::id, Function.identity()));
206-
207-
CURRENT = new TransportVersion(9118000); // TODO: fix - ALL_VERSIONS.getLast();
206+
CURRENT = ALL_VERSIONS.stream().max(TransportVersion::compareTo).get();
208207
}
209208
}
210209
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ public static TransportVersion local(String name) {
121121
return get(name).local();
122122
}
123123

124+
public static TransportVersion oldest(String name) {
125+
return get(name).oldest();
126+
}
127+
124128
public static boolean isCompatible(String name, TransportVersion version) {
125129
return get(name).isCompatible(version);
126130
}
@@ -141,6 +145,10 @@ public TransportVersion local() {
141145
return versions.get(0);
142146
}
143147

148+
public TransportVersion oldest() {
149+
return versions.get(versions.size() - 1);
150+
}
151+
144152
public boolean isCompatible(TransportVersion version) {
145153
boolean compatible = version.onOrAfter(local());
146154
for (int v = 1; v < versions.size(); ++v) {

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,7 @@ static TransportVersion def(int id) {
201201
public static final TransportVersion SETTINGS_IN_DATA_STREAMS_8_19 = def(8_841_0_51);
202202
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_REMOVE_ERROR_PARSING_8_19 = def(8_841_0_52);
203203
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_BATCH_SIZE_8_19 = def(8_841_0_53);
204-
public static final TransportVersion STREAMS_LOGS_SUPPORT_8_19 = def(8_841_0_54);
205-
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE_8_19 = def(8_841_0_55);
206204
public static final TransportVersion RANDOM_SAMPLER_QUERY_BUILDER_8_19 = def(8_841_0_56);
207-
public static final TransportVersion ML_INFERENCE_SAGEMAKER_ELASTIC_8_19 = def(8_841_0_57);
208-
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19 = def(8_841_0_58);
209205
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
210206
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
211207
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
@@ -314,10 +310,6 @@ static TransportVersion def(int id) {
314310
public static final TransportVersion PROJECT_ID_IN_SNAPSHOTS_DELETIONS_AND_REPO_CLEANUP = def(9_101_0_00);
315311
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_REMOVE_ERROR_PARSING = def(9_102_0_00);
316312
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_BATCH_SIZE = def(9_103_0_00);
317-
public static final TransportVersion STREAMS_LOGS_SUPPORT = def(9_104_0_00);
318-
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE = def(9_105_0_00);
319-
public static final TransportVersion ML_INFERENCE_SAGEMAKER_ELASTIC = def(9_106_0_00);
320-
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = def(9_107_0_00);
321313

322314
/*
323315
* STOP! READ THIS FIRST! No, really,

‎server/src/main/java/org/elasticsearch/cluster/metadata/StreamsMetadata.java‎

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

1212
import org.elasticsearch.TransportVersion;
13+
import org.elasticsearch.TransportVersionSet;
1314
import org.elasticsearch.TransportVersions;
1415
import org.elasticsearch.cluster.AbstractNamedDiffable;
1516
import org.elasticsearch.cluster.NamedDiff;
@@ -33,6 +34,8 @@ public class StreamsMetadata extends AbstractNamedDiffable<Metadata.ProjectCusto
3334
public static final String TYPE = "streams";
3435
public static final StreamsMetadata EMPTY = new StreamsMetadata(false);
3536

37+
public static TransportVersionSet STREAMS_LOGS_SUPPORT = TransportVersionSet.get("streams-logs-support");
38+
3639
public boolean logsEnabled;
3740

3841
public StreamsMetadata(StreamInput in) throws IOException {
@@ -59,13 +62,12 @@ public String getWriteableName() {
5962

6063
@Override
6164
public TransportVersion getMinimalSupportedVersion() {
62-
return TransportVersions.STREAMS_LOGS_SUPPORT_8_19;
65+
return STREAMS_LOGS_SUPPORT.oldest();
6366
}
6467

6568
@Override
6669
public boolean supportsVersion(TransportVersion version) {
67-
return version.onOrAfter(TransportVersions.STREAMS_LOGS_SUPPORT)
68-
|| version.isPatchFrom(TransportVersions.STREAMS_LOGS_SUPPORT_8_19);
70+
return STREAMS_LOGS_SUPPORT.isCompatible(version);
6971
}
7072

7173
public static NamedDiff<Metadata.ProjectCustom> readDiffFrom(StreamInput in) throws IOException {

‎server/src/main/resources/org/elasticsearch/transport/ml-inference-custom-service-input-type.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "ml-inference-custom-service-input-type",
3+
"ids": [
4+
9105000,
5+
8841055
6+
]
7+
}

‎server/src/main/resources/org/elasticsearch/transport/ml_inference_sagemaker_elastic.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "ml-inference_sagemaker_elastic",
3+
"ids": [
4+
9106000,
5+
8841057
6+
]
7+
}

‎server/src/main/resources/org/elasticsearch/transport/sparse-vector-field-pruning-options.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "sparse-vector-field-pruning-options",
3+
"ids": [
4+
9107000,
5+
8841058
6+
]
7+
}

‎server/src/main/resources/org/elasticsearch/transport/streams-logs-support.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "streams-logs-support",
3+
"ids": [
4+
9104000,
5+
8841054
6+
]
7+
}

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/search/SparseVectorQueryBuilder.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.apache.lucene.search.Query;
1212
import org.apache.lucene.util.SetOnce;
1313
import org.elasticsearch.TransportVersion;
14+
import org.elasticsearch.TransportVersionSet;
1415
import org.elasticsearch.TransportVersions;
1516
import org.elasticsearch.action.ActionListener;
1617
import org.elasticsearch.common.ParsingException;
@@ -60,8 +61,9 @@ public class SparseVectorQueryBuilder extends AbstractQueryBuilder<SparseVectorQ
6061

6162
private static final boolean DEFAULT_PRUNE = false;
6263

63-
static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19 = TransportVersions.SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19;
64-
static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = TransportVersions.SPARSE_VECTOR_FIELD_PRUNING_OPTIONS;
64+
public static final TransportVersionSet SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = TransportVersionSet.get(
65+
"sparse_vector_field_pruning_options"
66+
);
6567

6668
private final String fieldName;
6769
private final List<WeightedToken> queryVectors;
@@ -129,8 +131,7 @@ public SparseVectorQueryBuilder(StreamInput in) throws IOException {
129131
super(in);
130132
this.fieldName = in.readString();
131133

132-
if (in.getTransportVersion().isPatchFrom(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19)
133-
|| in.getTransportVersion().onOrAfter(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS)) {
134+
if (SPARSE_VECTOR_FIELD_PRUNING_OPTIONS.isCompatible(in.getTransportVersion())) {
134135
this.shouldPruneTokens = in.readOptionalBoolean();
135136
} else {
136137
this.shouldPruneTokens = in.readBoolean();
@@ -185,8 +186,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
185186

186187
out.writeString(fieldName);
187188

188-
if (out.getTransportVersion().isPatchFrom(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19)
189-
|| out.getTransportVersion().onOrAfter(SPARSE_VECTOR_FIELD_PRUNING_OPTIONS)) {
189+
if (SPARSE_VECTOR_FIELD_PRUNING_OPTIONS.isCompatible(out.getTransportVersion())) {
190190
out.writeOptionalBoolean(shouldPruneTokens);
191191
} else {
192192
out.writeBoolean(shouldPruneTokens);

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ public class CustomServiceSettings extends FilteredXContentObject implements Ser
6767
private static final String RESPONSE_SCOPE = String.join(".", ModelConfigurations.SERVICE_SETTINGS, RESPONSE);
6868
private static final int DEFAULT_EMBEDDING_BATCH_SIZE = 10;
6969

70+
public static final TransportVersionSet ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE = TransportVersionSet.get(
71+
"ml-inference-custom-service-input-type"
72+
);
7073
public static final TransportVersionSet ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE = TransportVersionSet.get(
7174
"ml-inference-custom-service-embedding-type"
7275
);
@@ -297,8 +300,7 @@ public CustomServiceSettings(StreamInput in) throws IOException {
297300
batchSize = DEFAULT_EMBEDDING_BATCH_SIZE;
298301
}
299302

300-
if (in.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE)
301-
|| in.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE_8_19)) {
303+
if (ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE.isCompatible(in.getTransportVersion())) {
302304
inputTypeTranslator = new InputTypeTranslator(in);
303305
} else {
304306
inputTypeTranslator = InputTypeTranslator.EMPTY_TRANSLATOR;
@@ -454,8 +456,7 @@ public void writeTo(StreamOutput out) throws IOException {
454456
out.writeVInt(batchSize);
455457
}
456458

457-
if (out.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE)
458-
|| out.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE_8_19)) {
459+
if (ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE.isCompatible(out.getTransportVersion())) {
459460
inputTypeTranslator.writeTo(out);
460461
}
461462
}

0 commit comments

Comments
 (0)