Skip to content

Commit 542df25

Browse files
authored
Forward port 8.19 semantic text chunking config transport version (elastic#127722)
1 parent 2f03cc7 commit 542df25

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-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
@@ -160,6 +160,7 @@ static TransportVersion def(int id) {
160160
public static final TransportVersion RERANK_COMMON_OPTIONS_ADDED_8_19 = def(8_841_0_15);
161161
public static final TransportVersion REMOTE_EXCEPTION_8_19 = def(8_841_0_16);
162162
public static final TransportVersion AMAZON_BEDROCK_TASK_SETTINGS_8_19 = def(8_841_0_17);
163+
public static final TransportVersion SEMANTIC_TEXT_CHUNKING_CONFIG_8_19 = def(8_841_0_18);
163164
public static final TransportVersion BATCHED_QUERY_PHASE_VERSION_BACKPORT_8_X = def(8_841_0_19);
164165
public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL_BACKPORT_8_19 = def(8_841_0_20);
165166
public static final TransportVersion ML_INFERENCE_SAGEMAKER_8_19 = def(8_841_0_21);

server/src/main/java/org/elasticsearch/cluster/metadata/InferenceFieldMetadata.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.Objects;
2828

2929
import static org.elasticsearch.TransportVersions.SEMANTIC_TEXT_CHUNKING_CONFIG;
30+
import static org.elasticsearch.TransportVersions.SEMANTIC_TEXT_CHUNKING_CONFIG_8_19;
3031

3132
/**
3233
* Contains inference field data for fields.
@@ -74,7 +75,8 @@ public InferenceFieldMetadata(StreamInput input) throws IOException {
7475
this.searchInferenceId = this.inferenceId;
7576
}
7677
this.sourceFields = input.readStringArray();
77-
if (input.getTransportVersion().onOrAfter(SEMANTIC_TEXT_CHUNKING_CONFIG)) {
78+
if (input.getTransportVersion().onOrAfter(SEMANTIC_TEXT_CHUNKING_CONFIG)
79+
|| input.getTransportVersion().isPatchFrom(SEMANTIC_TEXT_CHUNKING_CONFIG_8_19)) {
7880
this.chunkingSettings = input.readGenericMap();
7981
} else {
8082
this.chunkingSettings = null;
@@ -89,7 +91,8 @@ public void writeTo(StreamOutput out) throws IOException {
8991
out.writeString(searchInferenceId);
9092
}
9193
out.writeStringArray(sourceFields);
92-
if (out.getTransportVersion().onOrAfter(SEMANTIC_TEXT_CHUNKING_CONFIG)) {
94+
if (out.getTransportVersion().onOrAfter(SEMANTIC_TEXT_CHUNKING_CONFIG)
95+
|| out.getTransportVersion().isPatchFrom(SEMANTIC_TEXT_CHUNKING_CONFIG_8_19)) {
9396
out.writeGenericMap(chunkingSettings);
9497
}
9598
}

0 commit comments

Comments
 (0)