Skip to content

Commit a9f2f33

Browse files
authored
Adding patch version from 8.16 for skip_inner_hits_search_source (elastic#116724)
1 parent 59602a9 commit a9f2f33

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ static TransportVersion def(int id) {
176176
public static final TransportVersion CONVERT_FAILURE_STORE_OPTIONS_TO_SELECTOR_OPTIONS_INTERNALLY = def(8_772_00_0);
177177
public static final TransportVersion INFERENCE_DONT_PERSIST_ON_READ_BACKPORT_8_16 = def(8_772_00_1);
178178
public static final TransportVersion ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO_BACKPORT_8_16 = def(8_772_00_2);
179+
public static final TransportVersion SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16 = def(8_772_00_3);
179180
public static final TransportVersion REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_773_00_0);
180181
public static final TransportVersion REVERT_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_774_00_0);
181182
public static final TransportVersion ESQL_FIELD_ATTRIBUTE_PARENT_SIMPLIFIED = def(8_775_00_0);

server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,8 @@ public SearchSourceBuilder(StreamInput in) throws IOException {
292292
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
293293
rankBuilder = in.readOptionalNamedWriteable(RankBuilder.class);
294294
}
295-
if (in.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
295+
if (in.getTransportVersion().isPatchFrom(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16)
296+
|| in.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
296297
skipInnerHits = in.readBoolean();
297298
} else {
298299
skipInnerHits = false;
@@ -386,7 +387,8 @@ public void writeTo(StreamOutput out) throws IOException {
386387
} else if (rankBuilder != null) {
387388
throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]");
388389
}
389-
if (out.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
390+
if (out.getTransportVersion().isPatchFrom(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16)
391+
|| out.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
390392
out.writeBoolean(skipInnerHits);
391393
}
392394
}
@@ -1849,9 +1851,6 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t
18491851
if (false == runtimeMappings.isEmpty()) {
18501852
builder.field(RUNTIME_MAPPINGS_FIELD.getPreferredName(), runtimeMappings);
18511853
}
1852-
if (skipInnerHits) {
1853-
builder.field("skipInnerHits", true);
1854-
}
18551854

18561855
return builder;
18571856
}

0 commit comments

Comments
 (0)