github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 23:27:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Collapse 8.16.1 transport versions (#124003)

Browse source
This commit is contained in:
Simon Cooper 2025-03-05 12:29:29 +00:00 • committed by GitHub
parent 025acaa603
commit 3b323dc588
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesetListItem.java
View file

@ -68,7 +68,7 @@ public class QueryRulesetListItem implements Writeable, ToXContentObject {
this.criteriaTypeToCountMap = Map.of();
}
TransportVersion streamTransportVersion = in.getTransportVersion();
if (streamTransportVersion.isPatchFrom(TransportVersions.QUERY_RULES_LIST_INCLUDES_TYPES_BACKPORT_8_16)
if (streamTransportVersion.isPatchFrom(TransportVersions.V_8_16_1)
|| streamTransportVersion.onOrAfter(TransportVersions.QUERY_RULES_LIST_INCLUDES_TYPES)) {
this.ruleTypeToCountMap = in.readMap(m -> in.readEnum(QueryRule.QueryRuleType.class), StreamInput::readInt);
} else {
@ -103,7 +103,7 @@ public class QueryRulesetListItem implements Writeable, ToXContentObject {
out.writeMap(criteriaTypeToCountMap, StreamOutput::writeEnum, StreamOutput::writeInt);
}
TransportVersion streamTransportVersion = out.getTransportVersion();
if (streamTransportVersion.isPatchFrom(TransportVersions.QUERY_RULES_LIST_INCLUDES_TYPES_BACKPORT_8_16)
if (streamTransportVersion.isPatchFrom(TransportVersions.V_8_16_1)
|| streamTransportVersion.onOrAfter(TransportVersions.QUERY_RULES_LIST_INCLUDES_TYPES)) {
out.writeMap(ruleTypeToCountMap, StreamOutput::writeEnum, StreamOutput::writeInt);
}

3
x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsActionResponseBWCSerializingTests.java
View file

@ -59,8 +59,7 @@ public class ListQueryRulesetsActionResponseBWCSerializingTests extends Abstract
ListQueryRulesetsAction.Response instance,
TransportVersion version
) {
if (version.isPatchFrom(TransportVersions.QUERY_RULES_LIST_INCLUDES_TYPES_BACKPORT_8_16)
|| version.onOrAfter(TransportVersions.QUERY_RULES_LIST_INCLUDES_TYPES)) {
if (version.isPatchFrom(TransportVersions.V_8_16_1) || version.onOrAfter(TransportVersions.QUERY_RULES_LIST_INCLUDES_TYPES)) {
return instance;
} else if (version.onOrAfter(QueryRulesetListItem.EXPANDED_RULESET_COUNT_TRANSPORT_VERSION)) {
List<QueryRulesetListItem> updatedResults = new ArrayList<>();