Skip to content

Commit 8a1ca6b

Browse files
authored
[8.19] Migrate transport versions 8841050 through 8841041 (elastic#135555) (elastic#135562)
Backports the following commits to 8.19: - Migrate transport versions 8841050 through 8841041 (elastic#135555)
1 parent ce8af96 commit 8a1ca6b

File tree

25 files changed

+79
-40
lines changed

25 files changed

+79
-40
lines changed

modules/data-streams/src/main/java/org/elasticsearch/datastreams/options/action/GetDataStreamOptionsAction.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
package org.elasticsearch.datastreams.options.action;
1010

11-
import org.elasticsearch.TransportVersions;
11+
import org.elasticsearch.TransportVersion;
1212
import org.elasticsearch.action.ActionRequestValidationException;
1313
import org.elasticsearch.action.ActionResponse;
1414
import org.elasticsearch.action.ActionType;
@@ -45,6 +45,10 @@ private GetDataStreamOptionsAction() {/* no instances */}
4545

4646
public static class Request extends MasterNodeReadRequest<Request> implements IndicesRequest.Replaceable {
4747

48+
private static final TransportVersion DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS = TransportVersion.fromName(
49+
"data_stream_options_api_remove_include_defaults"
50+
);
51+
4852
private String[] names;
4953
private IndicesOptions indicesOptions = IndicesOptions.builder()
5054
.concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
@@ -79,7 +83,8 @@ public Request(StreamInput in) throws IOException {
7983
super(in);
8084
this.names = in.readOptionalStringArray();
8185
this.indicesOptions = IndicesOptions.readIndicesOptions(in);
82-
if (in.getTransportVersion().before(TransportVersions.DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS_8_19)) {
86+
// This boolean was removed in 8.19
87+
if (in.getTransportVersion().supports(DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS) == false) {
8388
in.readBoolean();
8489
}
8590
}
@@ -89,7 +94,7 @@ public void writeTo(StreamOutput out) throws IOException {
8994
super.writeTo(out);
9095
out.writeOptionalStringArray(names);
9196
indicesOptions.writeIndicesOptions(out);
92-
if (out.getTransportVersion().before(TransportVersions.DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS_8_19)) {
97+
if (out.getTransportVersion().supports(DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS) == false) {
9398
out.writeBoolean(false);
9499
}
95100
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,6 @@ static TransportVersion def(int id) {
221221
public static final TransportVersion ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED_8_19 = def(8_841_0_38);
222222
public static final TransportVersion INFERENCE_CUSTOM_SERVICE_ADDED_8_19 = def(8_841_0_39);
223223
public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ADDED_8_19 = def(8_841_0_40);
224-
public static final TransportVersion DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS_8_19 = def(8_841_0_41);
225-
public static final TransportVersion JOIN_ON_ALIASES_8_19 = def(8_841_0_42);
226-
public static final TransportVersion ILM_ADD_SKIP_SETTING_8_19 = def(8_841_0_43);
227-
public static final TransportVersion ESQL_REGEX_MATCH_WITH_CASE_INSENSITIVITY_8_19 = def(8_841_0_44);
228-
public static final TransportVersion ESQL_QUERY_PLANNING_DURATION_8_19 = def(8_841_0_45);
229-
public static final TransportVersion SEARCH_SOURCE_EXCLUDE_VECTORS_PARAM_8_19 = def(8_841_0_46);
230-
public static final TransportVersion ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED_8_19 = def(8_841_0_47);
231-
public static final TransportVersion ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19 = def(8_841_0_48);
232-
public static final TransportVersion NONE_CHUNKING_STRATEGY_8_19 = def(8_841_0_49);
233-
public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ALLOW_LIST_8_19 = def(8_841_0_50);
234224

235225
/*
236226
* STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java

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

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.common.ParsingException;
1514
import org.elasticsearch.common.Strings;
1615
import org.elasticsearch.common.io.stream.StreamInput;
@@ -46,6 +45,11 @@ public class FetchSourceContext implements Writeable, ToXContentObject {
4645
Strings.EMPTY_ARRAY,
4746
Strings.EMPTY_ARRAY
4847
);
48+
49+
private static final TransportVersion SEARCH_SOURCE_EXCLUDE_VECTORS_PARAM = TransportVersion.fromName(
50+
"search_source_exclude_vectors_param"
51+
);
52+
4953
private final boolean fetchSource;
5054
private final String[] includes;
5155
private final String[] excludes;
@@ -97,7 +101,7 @@ public void writeTo(StreamOutput out) throws IOException {
97101
}
98102

99103
private static boolean isVersionCompatibleWithExcludeVectors(TransportVersion version) {
100-
return version.onOrAfter(TransportVersions.SEARCH_SOURCE_EXCLUDE_VECTORS_PARAM_8_19);
104+
return version.supports(SEARCH_SOURCE_EXCLUDE_VECTORS_PARAM);
101105
}
102106

103107
public boolean fetchSource() {
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# We have taken a donor primary id from
2+
# another collapsed primary id since
3+
# we only have a patch id here given that
4+
# this feature was removed in 8.19.
5+
# This works because our donor was taken
6+
# prior to 9.1.0 release. So this still
7+
# honors bwc from 8.19 -> 9.1 and
8+
# 9.0 -> 9.x.
9+
9081000,8841041
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9055000,8841045
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9086000,8841044
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9091000,8841050
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9089000,8841043
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9088000,8841042
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9094000,8841048

0 commit comments

Comments
 (0)