-
Notifications
You must be signed in to change notification settings - Fork 25.2k
[ML][Data Frame] add node attr to GET _stats #43842
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.
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
benwtrent
merged 3 commits into
elastic:master
from
benwtrent:feature/ml-df-add-node-attr-to-_stats
Jul 2, 2019
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
156 changes: 156 additions & 0 deletions
156
...igh-level/src/main/java/org/elasticsearch/client/dataframe/transforms/NodeAttributes.java
This file contains hidden or 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,156 @@ | ||
| /* | ||
| * 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.dataframe.transforms; | ||
|
|
||
| import org.elasticsearch.common.ParseField; | ||
| import org.elasticsearch.common.Strings; | ||
| import org.elasticsearch.common.xcontent.ConstructingObjectParser; | ||
| import org.elasticsearch.common.xcontent.ObjectParser; | ||
| import org.elasticsearch.common.xcontent.ToXContentObject; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * A Pojo class containing an Elastic Node's attributes | ||
| */ | ||
| public class NodeAttributes implements ToXContentObject { | ||
|
|
||
| public static final ParseField ID = new ParseField("id"); | ||
| public static final ParseField NAME = new ParseField("name"); | ||
| public static final ParseField EPHEMERAL_ID = new ParseField("ephemeral_id"); | ||
| public static final ParseField TRANSPORT_ADDRESS = new ParseField("transport_address"); | ||
| public static final ParseField ATTRIBUTES = new ParseField("attributes"); | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| public static final ConstructingObjectParser<NodeAttributes, Void> PARSER = | ||
| new ConstructingObjectParser<>("node", true, | ||
| (a) -> { | ||
| int i = 0; | ||
| String id = (String) a[i++]; | ||
| String name = (String) a[i++]; | ||
| String ephemeralId = (String) a[i++]; | ||
| String transportAddress = (String) a[i++]; | ||
| Map<String, String> attributes = (Map<String, String>) a[i]; | ||
| return new NodeAttributes(id, name, ephemeralId, transportAddress, attributes); | ||
| }); | ||
|
|
||
| static { | ||
| PARSER.declareString(ConstructingObjectParser.constructorArg(), ID); | ||
| PARSER.declareString(ConstructingObjectParser.constructorArg(), NAME); | ||
| PARSER.declareString(ConstructingObjectParser.constructorArg(), EPHEMERAL_ID); | ||
| PARSER.declareString(ConstructingObjectParser.constructorArg(), TRANSPORT_ADDRESS); | ||
| PARSER.declareField(ConstructingObjectParser.constructorArg(), | ||
| (p, c) -> p.mapStrings(), | ||
| ATTRIBUTES, | ||
| ObjectParser.ValueType.OBJECT); | ||
| } | ||
|
|
||
| private final String id; | ||
| private final String name; | ||
| private final String ephemeralId; | ||
| private final String transportAddress; | ||
| private final Map<String, String> attributes; | ||
|
|
||
| public NodeAttributes(String id, String name, String ephemeralId, String transportAddress, Map<String, String> attributes) { | ||
| this.id = id; | ||
| this.name = name; | ||
| this.ephemeralId = ephemeralId; | ||
| this.transportAddress = transportAddress; | ||
| this.attributes = Collections.unmodifiableMap(attributes); | ||
| } | ||
|
|
||
| /** | ||
| * The unique identifier of the node. | ||
| */ | ||
| public String getId() { | ||
| return id; | ||
| } | ||
|
|
||
| /** | ||
| * The node name. | ||
| */ | ||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| /** | ||
| * The ephemeral id of the node. | ||
| */ | ||
| public String getEphemeralId() { | ||
| return ephemeralId; | ||
| } | ||
|
|
||
| /** | ||
| * The host and port where transport HTTP connections are accepted. | ||
| */ | ||
| public String getTransportAddress() { | ||
| return transportAddress; | ||
| } | ||
|
|
||
| /** | ||
| * Additional attributes related to this node | ||
| */ | ||
| public Map<String, String> getAttributes() { | ||
| return attributes; | ||
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { | ||
| builder.startObject(); | ||
| builder.field(ID.getPreferredName(), id); | ||
| builder.field(NAME.getPreferredName(), name); | ||
| builder.field(EPHEMERAL_ID.getPreferredName(), ephemeralId); | ||
| builder.field(TRANSPORT_ADDRESS.getPreferredName(), transportAddress); | ||
| builder.field(ATTRIBUTES.getPreferredName(), attributes); | ||
| builder.endObject(); | ||
| return builder; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(id, name, ephemeralId, transportAddress, attributes); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (this == other) { | ||
| return true; | ||
| } | ||
|
|
||
| if (other == null || getClass() != other.getClass()) { | ||
| return false; | ||
| } | ||
|
|
||
| NodeAttributes that = (NodeAttributes) other; | ||
| return Objects.equals(id, that.id) && | ||
| Objects.equals(name, that.name) && | ||
| Objects.equals(ephemeralId, that.ephemeralId) && | ||
| Objects.equals(transportAddress, that.transportAddress) && | ||
| Objects.equals(attributes, that.attributes); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return Strings.toString(this); | ||
| } | ||
| } |
This file contains hidden or 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
64 changes: 64 additions & 0 deletions
64
...evel/src/test/java/org/elasticsearch/client/dataframe/transforms/NodeAttributesTests.java
This file contains hidden or 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,64 @@ | ||
| /* | ||
| * 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.dataframe.transforms; | ||
|
|
||
| import org.elasticsearch.common.xcontent.XContentParser; | ||
| import org.elasticsearch.test.AbstractXContentTestCase; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.function.Predicate; | ||
|
|
||
| public class NodeAttributesTests extends AbstractXContentTestCase<NodeAttributes> { | ||
|
|
||
| public static NodeAttributes createRandom() { | ||
| int numberOfAttributes = randomIntBetween(1, 10); | ||
| Map<String, String> attributes = new HashMap<>(numberOfAttributes); | ||
| for(int i = 0; i < numberOfAttributes; i++) { | ||
| String val = randomAlphaOfLength(10); | ||
| attributes.put("key-"+i, val); | ||
| } | ||
| return new NodeAttributes(randomAlphaOfLength(10), | ||
| randomAlphaOfLength(10), | ||
| randomAlphaOfLength(10), | ||
| randomAlphaOfLength(10), | ||
| attributes); | ||
| } | ||
|
|
||
| @Override | ||
| protected NodeAttributes createTestInstance() { | ||
| return createRandom(); | ||
| } | ||
|
|
||
| @Override | ||
| protected NodeAttributes doParseInstance(XContentParser parser) throws IOException { | ||
| return NodeAttributes.PARSER.parse(parser, null); | ||
| } | ||
|
|
||
| @Override | ||
| protected Predicate<String> getRandomFieldsExcludeFilter() { | ||
| return field -> !field.isEmpty(); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean supportsUnknownFields() { | ||
| return true; | ||
| } | ||
| } |
This file contains hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as above