-
Notifications
You must be signed in to change notification settings - Fork 25.6k
[ML] Apply source query on data frame analytics memory estimation #49517
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
dimitris-athanasiou
merged 3 commits into
elastic:master
from
dimitris-athanasiou:apply-source-query-on-dfa-memory-estimation
Nov 25, 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
64 changes: 64 additions & 0 deletions
64
...sts/src/test/java/org/elasticsearch/xpack/ml/integration/ExplainDataFrameAnalyticsIT.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 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
| package org.elasticsearch.xpack.ml.integration; | ||
|
|
||
| import org.elasticsearch.action.bulk.BulkRequestBuilder; | ||
| import org.elasticsearch.action.bulk.BulkResponse; | ||
| import org.elasticsearch.action.index.IndexRequest; | ||
| import org.elasticsearch.action.support.WriteRequest; | ||
| import org.elasticsearch.index.query.QueryBuilders; | ||
| import org.elasticsearch.xpack.core.ml.action.ExplainDataFrameAnalyticsAction; | ||
| import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig; | ||
| import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsSource; | ||
| import org.elasticsearch.xpack.core.ml.dataframe.analyses.Classification; | ||
| import org.elasticsearch.xpack.core.ml.utils.QueryProvider; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.hamcrest.Matchers.lessThanOrEqualTo; | ||
|
|
||
| public class ExplainDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTestCase { | ||
|
|
||
| public void testSourceQueryIsApplied() throws IOException { | ||
| // To test the source query is applied when we extract data, | ||
| // we set up a job where we have a query which excludes all but one document. | ||
| // We then assert the memory estimation is low enough. | ||
|
|
||
| String sourceIndex = "test-source-query-is-applied"; | ||
|
|
||
| client().admin().indices().prepareCreate(sourceIndex) | ||
| .addMapping("_doc", "numeric_1", "type=double", "numeric_2", "type=float", "categorical", "type=keyword") | ||
| .get(); | ||
|
|
||
| BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); | ||
| bulkRequestBuilder.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); | ||
|
|
||
| for (int i = 0; i < 30; i++) { | ||
| IndexRequest indexRequest = new IndexRequest(sourceIndex); | ||
|
|
||
| // We insert one odd value out of 5 for one feature | ||
| indexRequest.source("numeric_1", 1.0, "numeric_2", 2.0, "categorical", i == 0 ? "only-one" : "normal"); | ||
| bulkRequestBuilder.add(indexRequest); | ||
| } | ||
| BulkResponse bulkResponse = bulkRequestBuilder.get(); | ||
| if (bulkResponse.hasFailures()) { | ||
| fail("Failed to index data: " + bulkResponse.buildFailureMessage()); | ||
| } | ||
|
|
||
| String id = "test_source_query_is_applied"; | ||
|
|
||
| DataFrameAnalyticsConfig config = new DataFrameAnalyticsConfig.Builder() | ||
| .setId(id) | ||
| .setSource(new DataFrameAnalyticsSource(new String[] { sourceIndex }, | ||
| QueryProvider.fromParsedQuery(QueryBuilders.termQuery("categorical", "only-one")))) | ||
| .setAnalysis(new Classification("categorical")) | ||
| .buildForExplain(); | ||
|
|
||
| ExplainDataFrameAnalyticsAction.Response explainResponse = explainDataFrame(config); | ||
|
|
||
| assertThat(explainResponse.getMemoryEstimation().getExpectedMemoryWithoutDisk().getKb(), lessThanOrEqualTo(500L)); | ||
| } | ||
| } | ||
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
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
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
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
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
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.
I'm wondering if
would work as well.
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.
It does but it makes the line longer and I don't think it significantly improves readability.