-
Notifications
You must be signed in to change notification settings - Fork 25.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce DataFrameAnalyticsConfig update API (#58302)
- Loading branch information
1 parent
38185e5
commit 3953de4
Showing
32 changed files
with
1,919 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
...high-level/src/main/java/org/elasticsearch/client/ml/UpdateDataFrameAnalyticsRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.client.ml; | ||
|
|
||
| import org.elasticsearch.client.Validatable; | ||
| import org.elasticsearch.client.ValidationException; | ||
| import org.elasticsearch.client.ml.dataframe.DataFrameAnalyticsConfigUpdate; | ||
| import org.elasticsearch.common.Strings; | ||
| import org.elasticsearch.common.xcontent.ToXContentObject; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
|
|
||
| public class UpdateDataFrameAnalyticsRequest implements ToXContentObject, Validatable { | ||
|
|
||
| private final DataFrameAnalyticsConfigUpdate update; | ||
|
|
||
| public UpdateDataFrameAnalyticsRequest(DataFrameAnalyticsConfigUpdate update) { | ||
| this.update = update; | ||
| } | ||
|
|
||
| public DataFrameAnalyticsConfigUpdate getUpdate() { | ||
| return update; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<ValidationException> validate() { | ||
| if (update == null) { | ||
| return Optional.of(ValidationException.withError("update requires a non-null data frame analytics config update")); | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { | ||
| return update.toXContent(builder, params); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
|
|
||
| UpdateDataFrameAnalyticsRequest other = (UpdateDataFrameAnalyticsRequest) o; | ||
| return Objects.equals(update, other.update); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(update); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return Strings.toString(this); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
165 changes: 165 additions & 0 deletions
165
...l/src/main/java/org/elasticsearch/client/ml/dataframe/DataFrameAnalyticsConfigUpdate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.client.ml.dataframe; | ||
|
|
||
| import org.elasticsearch.common.Nullable; | ||
| import org.elasticsearch.common.unit.ByteSizeValue; | ||
| import org.elasticsearch.common.xcontent.ObjectParser; | ||
| import org.elasticsearch.common.xcontent.ToXContentObject; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
| import org.elasticsearch.common.xcontent.XContentParser; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Objects; | ||
|
|
||
| import static org.elasticsearch.common.xcontent.ObjectParser.ValueType.VALUE; | ||
|
|
||
| public class DataFrameAnalyticsConfigUpdate implements ToXContentObject { | ||
|
|
||
| public static DataFrameAnalyticsConfigUpdate fromXContent(XContentParser parser) { | ||
| return PARSER.apply(parser, null).build(); | ||
| } | ||
|
|
||
| public static Builder builder() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
| public static final ObjectParser<Builder, Void> PARSER = new ObjectParser<>("data_frame_analytics_config_update", true, Builder::new); | ||
|
|
||
| static { | ||
| PARSER.declareString(Builder::setId, DataFrameAnalyticsConfig.ID); | ||
| PARSER.declareStringOrNull(Builder::setDescription, DataFrameAnalyticsConfig.DESCRIPTION); | ||
| PARSER.declareField( | ||
| Builder::setModelMemoryLimit, | ||
| (p, c) -> ByteSizeValue.parseBytesSizeValue(p.text(), DataFrameAnalyticsConfig.MODEL_MEMORY_LIMIT.getPreferredName()), | ||
| DataFrameAnalyticsConfig.MODEL_MEMORY_LIMIT, | ||
| VALUE); | ||
| PARSER.declareBoolean(Builder::setAllowLazyStart, DataFrameAnalyticsConfig.ALLOW_LAZY_START); | ||
|
|
||
| } | ||
|
|
||
| private final String id; | ||
| private final String description; | ||
| private final ByteSizeValue modelMemoryLimit; | ||
| private final Boolean allowLazyStart; | ||
|
|
||
| private DataFrameAnalyticsConfigUpdate(String id, | ||
| @Nullable String description, | ||
| @Nullable ByteSizeValue modelMemoryLimit, | ||
| @Nullable Boolean allowLazyStart) { | ||
| this.id = id; | ||
| this.description = description; | ||
| this.modelMemoryLimit = modelMemoryLimit; | ||
| this.allowLazyStart = allowLazyStart; | ||
| } | ||
|
|
||
| public String getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public String getDescription() { | ||
| return description; | ||
| } | ||
|
|
||
| public ByteSizeValue getModelMemoryLimit() { | ||
| return modelMemoryLimit; | ||
| } | ||
|
|
||
| public Boolean isAllowLazyStart() { | ||
| return allowLazyStart; | ||
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { | ||
| builder.startObject(); | ||
| builder.field(DataFrameAnalyticsConfig.ID.getPreferredName(), id); | ||
| if (description != null) { | ||
| builder.field(DataFrameAnalyticsConfig.DESCRIPTION.getPreferredName(), description); | ||
| } | ||
| if (modelMemoryLimit != null) { | ||
| builder.field(DataFrameAnalyticsConfig.MODEL_MEMORY_LIMIT.getPreferredName(), modelMemoryLimit.getStringRep()); | ||
| } | ||
| if (allowLazyStart != null) { | ||
| builder.field(DataFrameAnalyticsConfig.ALLOW_LAZY_START.getPreferredName(), allowLazyStart); | ||
| } | ||
| builder.endObject(); | ||
| return builder; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (this == other) { | ||
| return true; | ||
| } | ||
|
|
||
| if (other instanceof DataFrameAnalyticsConfigUpdate == false) { | ||
| return false; | ||
| } | ||
|
|
||
| DataFrameAnalyticsConfigUpdate that = (DataFrameAnalyticsConfigUpdate) other; | ||
|
|
||
| return Objects.equals(this.id, that.id) | ||
| && Objects.equals(this.description, that.description) | ||
| && Objects.equals(this.modelMemoryLimit, that.modelMemoryLimit) | ||
| && Objects.equals(this.allowLazyStart, that.allowLazyStart); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(id, description, modelMemoryLimit, allowLazyStart); | ||
| } | ||
|
|
||
| public static class Builder { | ||
|
|
||
| private String id; | ||
| private String description; | ||
| private ByteSizeValue modelMemoryLimit; | ||
| private Boolean allowLazyStart; | ||
|
|
||
| private Builder() {} | ||
|
|
||
| public String getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public Builder setId(String id) { | ||
| this.id = id; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder setDescription(String description) { | ||
| this.description = description; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder setModelMemoryLimit(ByteSizeValue modelMemoryLimit) { | ||
| this.modelMemoryLimit = modelMemoryLimit; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder setAllowLazyStart(Boolean allowLazyStart) { | ||
| this.allowLazyStart = allowLazyStart; | ||
| return this; | ||
| } | ||
|
|
||
| public DataFrameAnalyticsConfigUpdate build() { | ||
| return new DataFrameAnalyticsConfigUpdate(id, description, modelMemoryLimit, allowLazyStart); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.