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

Collapse transport versions for 8.17.0 (#124005)

Browse source
This commit is contained in:
Simon Cooper 2025-03-05 15:18:01 +00:00 • committed by GitHub
parent 152d086c0f
commit 22a7b5ea12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 48 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/retriever/RuleQueryRankDoc.java
View file

@ -121,6 +121,6 @@ public class RuleQueryRankDoc extends RankDoc {
@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.QUERY_RULES_RETRIEVER;
return TransportVersions.V_8_17_0;
}
}

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

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