Skip to content

Commit 5f216a1

Browse files
committed
another migration
1 parent c1bfa55 commit 5f216a1

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ static TransportVersion def(int id) {
206206
public static final TransportVersion RANDOM_SAMPLER_QUERY_BUILDER_8_19 = def(8_841_0_56);
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);
209-
public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19 = def(8_841_0_59);
210209
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
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);
@@ -320,7 +319,6 @@ static TransportVersion def(int id) {
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);
322321
public static final TransportVersion CLUSTER_STATE_PROJECTS_SETTINGS = def(9_108_0_00);
323-
public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED = def(9_109_00_0);
324322

325323
/*
326324
* STOP! READ THIS FIRST! No, really,
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "ml-inference-elastic-dense-text-embeddings-added",
3+
"ids": [
4+
9109000,
5+
8841059
6+
]
7+
}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package org.elasticsearch.xpack.inference.services.elastic.densetextembeddings;
99

1010
import org.elasticsearch.TransportVersion;
11-
import org.elasticsearch.TransportVersions;
11+
import org.elasticsearch.TransportVersionSet;
1212
import org.elasticsearch.common.ValidationException;
1313
import org.elasticsearch.common.io.stream.StreamInput;
1414
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -45,6 +45,10 @@ public class ElasticInferenceServiceDenseTextEmbeddingsServiceSettings extends F
4545

4646
public static final RateLimitSettings DEFAULT_RATE_LIMIT_SETTINGS = new RateLimitSettings(10_000);
4747

48+
public static final TransportVersionSet ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED = TransportVersionSet.get(
49+
"ml-inference-elastic-dense-text-embeddings-added"
50+
);
51+
4852
private final String modelId;
4953
private final SimilarityMeasure similarity;
5054
private final Integer dimensions;
@@ -206,13 +210,12 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
206210
@Override
207211
public TransportVersion getMinimalSupportedVersion() {
208212
assert false : "should never be called when supportsVersion is used";
209-
return TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED;
213+
return ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED.local();
210214
}
211215

212216
@Override
213217
public boolean supportsVersion(TransportVersion version) {
214-
return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED)
215-
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19);
218+
return ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED.isCompatible(version);
216219
}
217220

218221
@Override

0 commit comments

Comments
 (0)