Skip to content

[8.x] Optimize MlConfigVersion#getMinMaxMlConfigVersion (#125432) #125500

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 3 commits into from
Mar 24, 2025
Merged

[8.x] Optimize MlConfigVersion#getMinMaxMlConfigVersion (#125432) #125500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8287f40
Optimize MlConfigVersion#getMinMaxMlConfigVersion (#125432)
joegallo Mar 24, 2025
18c5075
Revert part of #125432
joegallo Mar 24, 2025
2c3a087
Merge branch '8.x' into backport/8.x/pr-125432
joegallo Mar 24, 2025
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
5 changes: 4 additions & 1 deletion x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlConfigVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,9 @@ public static MlConfigVersion getMlConfigVersionForNode(DiscoveryNode node) {
return fromId(node.getPre811VersionId().orElseThrow(() -> new IllegalStateException("getting legacy version id not possible")));
}

// supports fromString below
private static final Pattern ML_VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+)(?:-\\w+)?$");

// Parse an MlConfigVersion from a string.
// Note that version "8.10.x" and "8.11.0" are silently converted to "10.0.0".
// This is to support upgrade scenarios in pre-prod QA environments.
Expand All @@ -319,7 +322,7 @@ public static MlConfigVersion fromString(String str) {
if (str.startsWith("8.10.") || str.equals("8.11.0")) {
return V_10;
}
Matcher matcher = Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+)(?:-\\w+)?$").matcher(str);
Matcher matcher = ML_VERSION_PATTERN.matcher(str);
if (matcher.matches() == false) {
throw new IllegalArgumentException("ML config version [" + str + "] not valid");
}
Expand Down
8 changes: 1 addition & 7 deletions ...ore/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsStatsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,6 @@ public static class TrainedModelStats implements ToXContentObject, Writeable {
private final AssignmentStats deploymentStats;
private final int pipelineCount;

private static final IngestStats EMPTY_INGEST_STATS = new IngestStats(
IngestStats.Stats.IDENTITY,
Collections.emptyList(),
Collections.emptyMap()
);

public TrainedModelStats(
String modelId,
TrainedModelSizeStats modelSizeStats,
Expand All @@ -107,7 +101,7 @@ public TrainedModelStats(
) {
this.modelId = Objects.requireNonNull(modelId);
this.modelSizeStats = modelSizeStats;
this.ingestStats = ingestStats == null ? EMPTY_INGEST_STATS : ingestStats;
this.ingestStats = ingestStats == null ? IngestStats.IDENTITY : ingestStats;
if (pipelineCount < 0) {
throw new ElasticsearchException("[{}] must be a greater than or equal to 0", PIPELINE_COUNT.getPreferredName());
}
Expand Down