Skip to content

[ML] Rename analytics package to dataframe #37583

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
Jan 21, 2019
Merged

[ML] Rename analytics package to dataframe #37583

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@
import org.elasticsearch.xpack.ml.action.TransportUpdateProcessAction;
import org.elasticsearch.xpack.ml.action.TransportValidateDetectorAction;
import org.elasticsearch.xpack.ml.action.TransportValidateJobConfigAction;
import org.elasticsearch.xpack.ml.analytics.process.AnalyticsProcessFactory;
import org.elasticsearch.xpack.ml.analytics.process.AnalyticsProcessManager;
import org.elasticsearch.xpack.ml.analytics.process.NativeAnalyticsProcessFactory;
import org.elasticsearch.xpack.ml.dataframe.process.AnalyticsProcessFactory;
import org.elasticsearch.xpack.ml.dataframe.process.AnalyticsProcessManager;
import org.elasticsearch.xpack.ml.dataframe.process.NativeAnalyticsProcessFactory;
import org.elasticsearch.xpack.ml.datafeed.DatafeedJobBuilder;
import org.elasticsearch.xpack.ml.datafeed.DatafeedManager;
import org.elasticsearch.xpack.ml.datafeed.persistence.DatafeedConfigProvider;
Expand Down
6 changes: 3 additions & 3 deletions ...lugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportRunAnalyticsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
import org.elasticsearch.xpack.core.ml.action.RunAnalyticsAction;
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
import org.elasticsearch.xpack.ml.MachineLearning;
import org.elasticsearch.xpack.ml.analytics.DataFrameDataExtractorFactory;
import org.elasticsearch.xpack.ml.analytics.DataFrameFields;
import org.elasticsearch.xpack.ml.analytics.process.AnalyticsProcessManager;
import org.elasticsearch.xpack.ml.dataframe.DataFrameDataExtractorFactory;
import org.elasticsearch.xpack.ml.dataframe.DataFrameFields;
Copy link

@hendrikmuhs hendrikmuhs Jan 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the only downside I see: I have a class DataFrameField in the data frame plugin. When working with an IDE it's easy to pick the wrong one. But that's also true for the HLRC, anyway, if you see a chance for a better name, that would be great.

(off-topic comment, the classname hasn't changed in this PR)

import org.elasticsearch.xpack.ml.dataframe.process.AnalyticsProcessManager;

import java.util.Arrays;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion ...xpack/ml/analytics/DataFrameAnalysis.java → ...xpack/ml/dataframe/DataFrameAnalysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics;
package org.elasticsearch.xpack.ml.dataframe;

import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.ToXContentObject;
Expand Down
2 changes: 1 addition & 1 deletion .../ml/analytics/DataFrameDataExtractor.java → .../ml/dataframe/DataFrameDataExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics;
package org.elasticsearch.xpack.ml.dataframe;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...lytics/DataFrameDataExtractorContext.java → ...aframe/DataFrameDataExtractorContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics;
package org.elasticsearch.xpack.ml.dataframe;

import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.xpack.ml.datafeed.extractor.fields.ExtractedFields;
Expand Down
2 changes: 1 addition & 1 deletion ...lytics/DataFrameDataExtractorFactory.java → ...aframe/DataFrameDataExtractorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics;
package org.elasticsearch.xpack.ml.dataframe;

import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.ActionListener;
Expand Down
2 changes: 1 addition & 1 deletion ...h/xpack/ml/analytics/DataFrameFields.java → ...h/xpack/ml/dataframe/DataFrameFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics;
package org.elasticsearch.xpack.ml.dataframe;

public final class DataFrameFields {

Expand Down
2 changes: 1 addition & 1 deletion ...l/analytics/process/AnalyticsBuilder.java → ...l/dataframe/process/AnalyticsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.elasticsearch.common.Strings;
import org.elasticsearch.common.xcontent.ToXContent;
Expand Down
2 changes: 1 addition & 1 deletion ...rocess/AnalyticsControlMessageWriter.java → ...rocess/AnalyticsControlMessageWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.elasticsearch.xpack.ml.process.writer.AbstractControlMsgWriter;
import org.elasticsearch.xpack.ml.process.writer.LengthEncodedWriter;
Expand Down
2 changes: 1 addition & 1 deletion ...l/analytics/process/AnalyticsProcess.java → ...l/dataframe/process/AnalyticsProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.elasticsearch.xpack.ml.process.NativeProcess;

Expand Down
4 changes: 2 additions & 2 deletions ...ytics/process/AnalyticsProcessConfig.java → ...frame/process/AnalyticsProcessConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.xpack.ml.analytics.DataFrameAnalysis;
import org.elasticsearch.xpack.ml.dataframe.DataFrameAnalysis;

import java.io.IOException;
import java.util.Objects;
Expand Down
2 changes: 1 addition & 1 deletion ...tics/process/AnalyticsProcessFactory.java → ...rame/process/AnalyticsProcessFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import java.util.concurrent.ExecutorService;

Expand Down
8 changes: 4 additions & 4 deletions ...tics/process/AnalyticsProcessManager.java → ...rame/process/AnalyticsProcessManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand All @@ -15,9 +15,9 @@
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
import org.elasticsearch.xpack.ml.MachineLearning;
import org.elasticsearch.xpack.ml.analytics.DataFrameAnalysis;
import org.elasticsearch.xpack.ml.analytics.DataFrameDataExtractor;
import org.elasticsearch.xpack.ml.analytics.DataFrameDataExtractorFactory;
import org.elasticsearch.xpack.ml.dataframe.DataFrameAnalysis;
import org.elasticsearch.xpack.ml.dataframe.DataFrameDataExtractor;
import org.elasticsearch.xpack.ml.dataframe.DataFrameDataExtractorFactory;

import java.io.IOException;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...ml/analytics/process/AnalyticsResult.java → ...ml/dataframe/process/AnalyticsResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
Expand Down
4 changes: 2 additions & 2 deletions ...ics/process/AnalyticsResultProcessor.java → ...ame/process/AnalyticsResultProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand All @@ -14,7 +14,7 @@
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.client.Client;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.xpack.ml.analytics.DataFrameDataExtractor;
import org.elasticsearch.xpack.ml.dataframe.DataFrameDataExtractor;

import java.util.ArrayList;
import java.util.Iterator;
Expand Down
2 changes: 1 addition & 1 deletion ...ytics/process/NativeAnalyticsProcess.java → ...frame/process/NativeAnalyticsProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.elasticsearch.xpack.ml.process.AbstractNativeProcess;
import org.elasticsearch.xpack.ml.process.ProcessResultsParser;
Expand Down
2 changes: 1 addition & 1 deletion ...rocess/NativeAnalyticsProcessFactory.java → ...rocess/NativeAnalyticsProcessFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...s/DataFrameDataExtractorFactoryTests.java → ...e/DataFrameDataExtractorFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics;
package org.elasticsearch.xpack.ml.dataframe;

import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.action.fieldcaps.FieldCapabilities;
Expand Down
2 changes: 1 addition & 1 deletion ...s/AnalyticsControlMessageWriterTests.java → ...s/AnalyticsControlMessageWriterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.xpack.ml.process.writer.LengthEncodedWriter;
Expand Down
4 changes: 2 additions & 2 deletions ...rocess/AnalyticsResultProcessorTests.java → ...rocess/AnalyticsResultProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.bulk.BulkAction;
Expand All @@ -16,7 +16,7 @@
import org.elasticsearch.common.text.Text;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.xpack.ml.analytics.DataFrameDataExtractor;
import org.elasticsearch.xpack.ml.dataframe.DataFrameDataExtractor;
import org.junit.Before;
import org.mockito.ArgumentCaptor;

Expand Down
2 changes: 1 addition & 1 deletion ...alytics/process/AnalyticsResultTests.java → ...taframe/process/AnalyticsResultTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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.analytics.process;
package org.elasticsearch.xpack.ml.dataframe.process;

import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.test.AbstractXContentTestCase;
Expand Down