Skip to content

Commit 7cae545

Browse files
authored
Adding patch version from 8.16 for skip_inner_hits_search_source (elastic#116741)
1 parent d6b2425 commit 7cae545

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
@@ -291,7 +291,8 @@ public SearchSourceBuilder(StreamInput in) throws IOException {
291291
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
292292
rankBuilder = in.readOptionalNamedWriteable(RankBuilder.class);
293293
}
294-
if (in.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
294+
if (in.getTransportVersion().isPatchFrom(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16)
295+
|| in.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
295296
skipInnerHits = in.readBoolean();
296297
} else {
297298
skipInnerHits = false;
@@ -385,7 +386,8 @@ public void writeTo(StreamOutput out) throws IOException {
385386
} else if (rankBuilder != null) {
386387
throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]");
387388
}
388-
if (out.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
389+
if (out.getTransportVersion().isPatchFrom(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16)
390+
|| out.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
389391
out.writeBoolean(skipInnerHits);
390392
}
391393
}
@@ -1866,9 +1868,6 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t
18661868
if (false == runtimeMappings.isEmpty()) {
18671869
builder.field(RUNTIME_MAPPINGS_FIELD.getPreferredName(), runtimeMappings);
18681870
}
1869-
if (skipInnerHits) {
1870-
builder.field("skipInnerHits", true);
1871-
}
18721871

18731872
return builder;
18741873
}

0 commit comments

Comments
 (0)