Skip to content

Make CompatibilityVersions.minimumVersions cheaper #112186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Make CompatibilityVersions.minimumVersions cheaper #112186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions server/src/main/java/org/elasticsearch/cluster/version/CompatibilityVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@

import java.io.IOException;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
* Wraps component version numbers for cluster state
Expand All @@ -42,25 +39,35 @@ public record CompatibilityVersions(
Map<String, org.elasticsearch.indices.SystemIndexDescriptor.MappingsVersion> systemIndexMappingsVersion
) implements Writeable, ToXContentFragment {

public static final CompatibilityVersions EMPTY = new CompatibilityVersions(TransportVersions.MINIMUM_COMPATIBLE, Map.of());

/**
* Constructs a VersionWrapper collecting all the minimum versions from the values of the map.
*
* @param compatibilityVersions A map of strings (typically node identifiers) and versions wrappers
* @return Minimum versions for the cluster
*/
public static CompatibilityVersions minimumVersions(Collection<CompatibilityVersions> compatibilityVersions) {
TransportVersion minimumTransport = compatibilityVersions.stream()
.map(CompatibilityVersions::transportVersion)
.min(Comparator.naturalOrder())
// In practice transportVersions is always nonempty (except in tests) but use a conservative default anyway:
.orElse(TransportVersions.MINIMUM_COMPATIBLE);

Map<String, SystemIndexDescriptor.MappingsVersion> minimumMappingsVersions = compatibilityVersions.stream()
.flatMap(mv -> mv.systemIndexMappingsVersion().entrySet().stream())
.collect(
Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (v1, v2) -> Stream.of(v1, v2).min(Comparator.naturalOrder()).get())
);

if (compatibilityVersions.isEmpty()) {
return EMPTY;
}
TransportVersion minimumTransport = null;
Map<String, SystemIndexDescriptor.MappingsVersion> minimumMappingsVersions = null;
for (CompatibilityVersions cv : compatibilityVersions) {
TransportVersion version = cv.transportVersion();
if (minimumTransport == null) {
minimumTransport = version;
minimumMappingsVersions = new HashMap<>(cv.systemIndexMappingsVersion());
continue;
}
if (version.compareTo(minimumTransport) < 0) {
minimumTransport = version;
}
for (Map.Entry<String, SystemIndexDescriptor.MappingsVersion> entry : cv.systemIndexMappingsVersion().entrySet()) {
minimumMappingsVersions.merge(entry.getKey(), entry.getValue(), (v1, v2) -> v1.compareTo(v2) < 0 ? v1 : v2);
}
}
// transportVersions is always non-null since we break out on empty above
return new CompatibilityVersions(minimumTransport, minimumMappingsVersions);
}

Expand Down