honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ML] Rename datafeed indexes to indices (elastic/x-pack-elasticsearch#1297) 

Renames datafeed indexes to indices but keeps indexes
as a synonym while parsing.

relates elastic/x-pack-elasticsearch#1292

Original commit: elastic/x-pack-elasticsearch@1fcdd97f88
This commit is contained in:
Dimitris Athanasiou 2017-05-04 11:37:12 +01:00 committed by GitHub
parent b922b37c3f
commit 7f2c7dbe17
31 changed files with 130 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/rest-api/ml/datafeedresource.asciidoc
View File

@ -30,7 +30,7 @@ A {dfeed} resource has the following properties:
bucket spans, or, for longer bucket spans, a sensible fraction of the bucket bucket spans, or, for longer bucket spans, a sensible fraction of the bucket
span. For example: "150s" span. For example: "150s"
`indexes` (required):: `indices` (required)::
(array) An array of index names. For example: ["it_ops_metrics"] (array) An array of index names. For example: ["it_ops_metrics"]
`job_id` (required):: `job_id` (required)::

6
docs/en/rest-api/ml/put-datafeed.asciidoc
View File

@ -38,7 +38,7 @@ You must create a job before you create a {dfeed}. You can associate only one
bucket spans, or, for longer bucket spans, a sensible fraction of the bucket bucket spans, or, for longer bucket spans, a sensible fraction of the bucket
span. For example: "150s". span. For example: "150s".
`indexes` (required):: `indices` (required)::
(array) An array of index names. Wildcards are supported. For example: (array) An array of index names. Wildcards are supported. For example:
["it_ops_metrics", "server*"]. ["it_ops_metrics", "server*"].
@ -83,7 +83,7 @@ The following example creates the `datafeed-it-ops-kpi` {dfeed}:
PUT _xpack/ml/datafeeds/datafeed-it-ops-kpi PUT _xpack/ml/datafeeds/datafeed-it-ops-kpi
{ {
"job_id": "it-ops-kpi", "job_id": "it-ops-kpi",
"indexes": ["it_ops_metrics"], "indices": ["it_ops_metrics"],
"types": ["kpi","network","sql"], "types": ["kpi","network","sql"],
"query": { "query": {
"match_all": { "match_all": {
@ -102,7 +102,7 @@ When the {dfeed} is created, you receive the following results:
"datafeed_id": "datafeed-it-ops-kpi", "datafeed_id": "datafeed-it-ops-kpi",
"job_id": "it-ops-kpi", "job_id": "it-ops-kpi",
"query_delay": "1m", "query_delay": "1m",
"indexes": [ "indices": [
"it_ops_metrics" "it_ops_metrics"
], ],
"types": [ "types": [

4
docs/en/rest-api/ml/update-datafeed.asciidoc
View File

@ -33,7 +33,7 @@ The following properties can be updated after the {dfeed} is created:
bucket spans, or, for longer bucket spans, a sensible fraction of the bucket bucket spans, or, for longer bucket spans, a sensible fraction of the bucket
span. For example: "150s". span. For example: "150s".
`indexes`:: `indices`::
(array) An array of index names. Wildcards are supported. For example: (array) An array of index names. Wildcards are supported. For example:
["it_ops_metrics", "server*"]. ["it_ops_metrics", "server*"].
@ -97,7 +97,7 @@ with the updated values:
"datafeed_id": "datafeed-it-ops-kpi", "datafeed_id": "datafeed-it-ops-kpi",
"job_id": "it-ops-kpi", "job_id": "it-ops-kpi",
"query_delay": "1m", "query_delay": "1m",
"indexes": ["it-ops"], "indices": ["it-ops"],
"types": ["logs"], "types": ["logs"],
"query": { "query": {
"term": { "term": {

5
plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutDatafeedAction.java
View File

@ -233,8 +233,7 @@ public class PutDatafeedAction extends Action<PutDatafeedAction.Request, PutData
// We just check for permission to use the search action. In reality we'll also // We just check for permission to use the search action. In reality we'll also
// use the scroll action, but that's considered an implementation detail. // use the scroll action, but that's considered an implementation detail.
privRequest.indexPrivileges(RoleDescriptor.IndicesPrivileges.builder() privRequest.indexPrivileges(RoleDescriptor.IndicesPrivileges.builder()
.indices(request.getDatafeed().getIndexes() .indices(request.getDatafeed().getIndices().toArray(new String[0]))
.toArray(new String[0]))
.privileges(SearchAction.NAME) .privileges(SearchAction.NAME)
.build()); .build());
@ -259,7 +258,7 @@ public class PutDatafeedAction extends Action<PutDatafeedAction.Request, PutData
builder.endObject(); builder.endObject();
listener.onFailure(Exceptions.authorizationError("Cannot create datafeed [{}]" + listener.onFailure(Exceptions.authorizationError("Cannot create datafeed [{}]" +
" because user {} lacks permissions on the indexes to be" + " because user {} lacks permissions on the indices to be" +
" searched: {}", " searched: {}",
request.getDatafeed().getId(), username, builder.string())); request.getDatafeed().getId(), username, builder.string()));
} }

2
plugin/src/main/java/org/elasticsearch/xpack/ml/action/StartDatafeedAction.java
View File

@ -602,7 +602,7 @@ public class StartDatafeedAction
private static String verifyIndicesActive(Logger logger, DatafeedConfig datafeed, ClusterState clusterState, private static String verifyIndicesActive(Logger logger, DatafeedConfig datafeed, ClusterState clusterState,
IndexNameExpressionResolver resolver) { IndexNameExpressionResolver resolver) {
List<String> indices = datafeed.getIndexes(); List<String> indices = datafeed.getIndices();
for (String index : indices) { for (String index : indices) {
String[] concreteIndices; String[] concreteIndices;
String reason = "cannot start datafeed [" + datafeed.getId() + "] because index [" String reason = "cannot start datafeed [" + datafeed.getId() + "] because index ["

46
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedConfig.java
View File

@ -63,6 +63,7 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
public static final ParseField QUERY_DELAY = new ParseField("query_delay"); public static final ParseField QUERY_DELAY = new ParseField("query_delay");
public static final ParseField FREQUENCY = new ParseField("frequency"); public static final ParseField FREQUENCY = new ParseField("frequency");
public static final ParseField INDEXES = new ParseField("indexes"); public static final ParseField INDEXES = new ParseField("indexes");
public static final ParseField INDICES = new ParseField("indices");
public static final ParseField TYPES = new ParseField("types"); public static final ParseField TYPES = new ParseField("types");
public static final ParseField QUERY = new ParseField("query"); public static final ParseField QUERY = new ParseField("query");
public static final ParseField SCROLL_SIZE = new ParseField("scroll_size"); public static final ParseField SCROLL_SIZE = new ParseField("scroll_size");
@ -77,7 +78,8 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
static { static {
PARSER.declareString(Builder::setId, ID); PARSER.declareString(Builder::setId, ID);
PARSER.declareString(Builder::setJobId, Job.ID); PARSER.declareString(Builder::setJobId, Job.ID);
PARSER.declareStringArray(Builder::setIndexes, INDEXES); PARSER.declareStringArray(Builder::setIndices, INDEXES);
PARSER.declareStringArray(Builder::setIndices, INDICES);
PARSER.declareStringArray(Builder::setTypes, TYPES); PARSER.declareStringArray(Builder::setTypes, TYPES);
PARSER.declareString((builder, val) -> PARSER.declareString((builder, val) ->
builder.setQueryDelay(TimeValue.parseTimeValue(val, QUERY_DELAY.getPreferredName())), QUERY_DELAY); builder.setQueryDelay(TimeValue.parseTimeValue(val, QUERY_DELAY.getPreferredName())), QUERY_DELAY);
@ -114,7 +116,7 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
*/ */
private final TimeValue frequency; private final TimeValue frequency;
private final List<String> indexes; private final List<String> indices;
private final List<String> types; private final List<String> types;
private final QueryBuilder query; private final QueryBuilder query;
private final AggregatorFactories.Builder aggregations; private final AggregatorFactories.Builder aggregations;
@ -123,14 +125,14 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
private final boolean source; private final boolean source;
private final ChunkingConfig chunkingConfig; private final ChunkingConfig chunkingConfig;
private DatafeedConfig(String id, String jobId, TimeValue queryDelay, TimeValue frequency, List<String> indexes, List<String> types, private DatafeedConfig(String id, String jobId, TimeValue queryDelay, TimeValue frequency, List<String> indices, List<String> types,
QueryBuilder query, AggregatorFactories.Builder aggregations, List<SearchSourceBuilder.ScriptField> scriptFields, QueryBuilder query, AggregatorFactories.Builder aggregations, List<SearchSourceBuilder.ScriptField> scriptFields,
Integer scrollSize, boolean source, ChunkingConfig chunkingConfig) { Integer scrollSize, boolean source, ChunkingConfig chunkingConfig) {
this.id = id; this.id = id;
this.jobId = jobId; this.jobId = jobId;
this.queryDelay = queryDelay; this.queryDelay = queryDelay;
this.frequency = frequency; this.frequency = frequency;
this.indexes = indexes; this.indices = indices;
this.types = types; this.types = types;
this.query = query; this.query = query;
this.aggregations = aggregations; this.aggregations = aggregations;
@ -146,9 +148,9 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
this.queryDelay = in.readOptionalWriteable(TimeValue::new); this.queryDelay = in.readOptionalWriteable(TimeValue::new);
this.frequency = in.readOptionalWriteable(TimeValue::new); this.frequency = in.readOptionalWriteable(TimeValue::new);
if (in.readBoolean()) { if (in.readBoolean()) {
this.indexes = in.readList(StreamInput::readString); this.indices = in.readList(StreamInput::readString);
} else { } else {
this.indexes = null; this.indices = null;
} }
if (in.readBoolean()) { if (in.readBoolean()) {
this.types = in.readList(StreamInput::readString); this.types = in.readList(StreamInput::readString);
@ -183,8 +185,8 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
return frequency; return frequency;
} }
public List<String> getIndexes() { public List<String> getIndices() {
return indexes; return indices;
} }
public List<String> getTypes() { public List<String> getTypes() {
@ -315,9 +317,9 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
out.writeString(jobId); out.writeString(jobId);
out.writeOptionalWriteable(queryDelay); out.writeOptionalWriteable(queryDelay);
out.writeOptionalWriteable(frequency); out.writeOptionalWriteable(frequency);
if (indexes != null) { if (indices != null) {
out.writeBoolean(true); out.writeBoolean(true);
out.writeStringList(indexes); out.writeStringList(indices);
} else { } else {
out.writeBoolean(false); out.writeBoolean(false);
} }
@ -355,7 +357,7 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
if (frequency != null) { if (frequency != null) {
builder.field(FREQUENCY.getPreferredName(), frequency.getStringRep()); builder.field(FREQUENCY.getPreferredName(), frequency.getStringRep());
} }
builder.field(INDEXES.getPreferredName(), indexes); builder.field(INDICES.getPreferredName(), indices);
builder.field(TYPES.getPreferredName(), types); builder.field(TYPES.getPreferredName(), types);
builder.field(QUERY.getPreferredName(), query); builder.field(QUERY.getPreferredName(), query);
if (aggregations != null) { if (aggregations != null) {
@ -379,8 +381,8 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
} }
/** /**
* The lists of indexes and types are compared for equality but they are not * The lists of indices and types are compared for equality but they are not
* sorted first so this test could fail simply because the indexes and types * sorted first so this test could fail simply because the indices and types
* lists are in different orders. * lists are in different orders.
*/ */
@Override @Override
@ -399,7 +401,7 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
&& Objects.equals(this.jobId, that.jobId) && Objects.equals(this.jobId, that.jobId)
&& Objects.equals(this.frequency, that.frequency) && Objects.equals(this.frequency, that.frequency)
&& Objects.equals(this.queryDelay, that.queryDelay) && Objects.equals(this.queryDelay, that.queryDelay)
&& Objects.equals(this.indexes, that.indexes) && Objects.equals(this.indices, that.indices)
&& Objects.equals(this.types, that.types) && Objects.equals(this.types, that.types)
&& Objects.equals(this.query, that.query) && Objects.equals(this.query, that.query)
&& Objects.equals(this.scrollSize, that.scrollSize) && Objects.equals(this.scrollSize, that.scrollSize)
@ -411,7 +413,7 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(id, jobId, frequency, queryDelay, indexes, types, query, scrollSize, aggregations, scriptFields, source, return Objects.hash(id, jobId, frequency, queryDelay, indices, types, query, scrollSize, aggregations, scriptFields, source,
chunkingConfig); chunkingConfig);
} }
@ -430,7 +432,7 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
private String jobId; private String jobId;
private TimeValue queryDelay = DEFAULT_QUERY_DELAY; private TimeValue queryDelay = DEFAULT_QUERY_DELAY;
private TimeValue frequency; private TimeValue frequency;
private List<String> indexes = Collections.emptyList(); private List<String> indices = Collections.emptyList();
private List<String> types = Collections.emptyList(); private List<String> types = Collections.emptyList();
private QueryBuilder query = QueryBuilders.matchAllQuery(); private QueryBuilder query = QueryBuilders.matchAllQuery();
private AggregatorFactories.Builder aggregations; private AggregatorFactories.Builder aggregations;
@ -453,7 +455,7 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
this.jobId = config.jobId; this.jobId = config.jobId;
this.queryDelay = config.queryDelay; this.queryDelay = config.queryDelay;
this.frequency = config.frequency; this.frequency = config.frequency;
this.indexes = config.indexes; this.indices = config.indices;
this.types = config.types; this.types = config.types;
this.query = config.query; this.query = config.query;
this.aggregations = config.aggregations; this.aggregations = config.aggregations;
@ -471,8 +473,8 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
this.jobId = ExceptionsHelper.requireNonNull(jobId, Job.ID.getPreferredName()); this.jobId = ExceptionsHelper.requireNonNull(jobId, Job.ID.getPreferredName());
} }
public void setIndexes(List<String> indexes) { public void setIndices(List<String> indices) {
this.indexes = ExceptionsHelper.requireNonNull(indexes, INDEXES.getPreferredName()); this.indices = ExceptionsHelper.requireNonNull(indices, INDICES.getPreferredName());
} }
public void setTypes(List<String> types) { public void setTypes(List<String> types) {
@ -529,15 +531,15 @@ public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements
if (!MlStrings.isValidId(id)) { if (!MlStrings.isValidId(id)) {
throw new IllegalArgumentException(Messages.getMessage(Messages.INVALID_ID, ID.getPreferredName())); throw new IllegalArgumentException(Messages.getMessage(Messages.INVALID_ID, ID.getPreferredName()));
} }
if (indexes == null || indexes.isEmpty() || indexes.contains(null) || indexes.contains("")) { if (indices == null || indices.isEmpty() || indices.contains(null) || indices.contains("")) {
throw invalidOptionValue(INDEXES.getPreferredName(), indexes); throw invalidOptionValue(INDICES.getPreferredName(), indices);
} }
if (types == null || types.isEmpty() || types.contains(null) || types.contains("")) { if (types == null || types.isEmpty() || types.contains(null) || types.contains("")) {
throw invalidOptionValue(TYPES.getPreferredName(), types); throw invalidOptionValue(TYPES.getPreferredName(), types);
} }
validateAggregations(); validateAggregations();
setDefaultChunkingConfig(); setDefaultChunkingConfig();
return new DatafeedConfig(id, jobId, queryDelay, frequency, indexes, types, query, aggregations, scriptFields, scrollSize, return new DatafeedConfig(id, jobId, queryDelay, frequency, indices, types, query, aggregations, scriptFields, scrollSize,
source, chunkingConfig); source, chunkingConfig);
} }

41
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedUpdate.java
View File

@ -40,7 +40,8 @@ public class DatafeedUpdate implements Writeable, ToXContent {
static { static {
PARSER.declareString(Builder::setId, DatafeedConfig.ID); PARSER.declareString(Builder::setId, DatafeedConfig.ID);
PARSER.declareString(Builder::setJobId, Job.ID); PARSER.declareString(Builder::setJobId, Job.ID);
PARSER.declareStringArray(Builder::setIndexes, DatafeedConfig.INDEXES); PARSER.declareStringArray(Builder::setIndices, DatafeedConfig.INDEXES);
PARSER.declareStringArray(Builder::setIndices, DatafeedConfig.INDICES);
PARSER.declareStringArray(Builder::setTypes, DatafeedConfig.TYPES); PARSER.declareStringArray(Builder::setTypes, DatafeedConfig.TYPES);
PARSER.declareString((builder, val) -> builder.setQueryDelay( PARSER.declareString((builder, val) -> builder.setQueryDelay(
TimeValue.parseTimeValue(val, DatafeedConfig.QUERY_DELAY.getPreferredName())), DatafeedConfig.QUERY_DELAY); TimeValue.parseTimeValue(val, DatafeedConfig.QUERY_DELAY.getPreferredName())), DatafeedConfig.QUERY_DELAY);
@ -69,7 +70,7 @@ public class DatafeedUpdate implements Writeable, ToXContent {
private final String jobId; private final String jobId;
private final TimeValue queryDelay; private final TimeValue queryDelay;
private final TimeValue frequency; private final TimeValue frequency;
private final List<String> indexes; private final List<String> indices;
private final List<String> types; private final List<String> types;
private final QueryBuilder query; private final QueryBuilder query;
private final AggregatorFactories.Builder aggregations; private final AggregatorFactories.Builder aggregations;
@ -78,14 +79,14 @@ public class DatafeedUpdate implements Writeable, ToXContent {
private final Boolean source; private final Boolean source;
private final ChunkingConfig chunkingConfig; private final ChunkingConfig chunkingConfig;
private DatafeedUpdate(String id, String jobId, TimeValue queryDelay, TimeValue frequency, List<String> indexes, List<String> types, private DatafeedUpdate(String id, String jobId, TimeValue queryDelay, TimeValue frequency, List<String> indices, List<String> types,
QueryBuilder query, AggregatorFactories.Builder aggregations, List<SearchSourceBuilder.ScriptField> scriptFields, QueryBuilder query, AggregatorFactories.Builder aggregations, List<SearchSourceBuilder.ScriptField> scriptFields,
Integer scrollSize, Boolean source, ChunkingConfig chunkingConfig) { Integer scrollSize, Boolean source, ChunkingConfig chunkingConfig) {
this.id = id; this.id = id;
this.jobId = jobId; this.jobId = jobId;
this.queryDelay = queryDelay; this.queryDelay = queryDelay;
this.frequency = frequency; this.frequency = frequency;
this.indexes = indexes; this.indices = indices;
this.types = types; this.types = types;
this.query = query; this.query = query;
this.aggregations = aggregations; this.aggregations = aggregations;
@ -101,9 +102,9 @@ public class DatafeedUpdate implements Writeable, ToXContent {
this.queryDelay = in.readOptionalWriteable(TimeValue::new); this.queryDelay = in.readOptionalWriteable(TimeValue::new);
this.frequency = in.readOptionalWriteable(TimeValue::new); this.frequency = in.readOptionalWriteable(TimeValue::new);
if (in.readBoolean()) { if (in.readBoolean()) {
this.indexes = in.readList(StreamInput::readString); this.indices = in.readList(StreamInput::readString);
} else { } else {
this.indexes = null; this.indices = null;
} }
if (in.readBoolean()) { if (in.readBoolean()) {
this.types = in.readList(StreamInput::readString); this.types = in.readList(StreamInput::readString);
@ -135,9 +136,9 @@ public class DatafeedUpdate implements Writeable, ToXContent {
out.writeOptionalString(jobId); out.writeOptionalString(jobId);
out.writeOptionalWriteable(queryDelay); out.writeOptionalWriteable(queryDelay);
out.writeOptionalWriteable(frequency); out.writeOptionalWriteable(frequency);
if (indexes != null) { if (indices != null) {
out.writeBoolean(true); out.writeBoolean(true);
out.writeStringList(indexes); out.writeStringList(indices);
} else { } else {
out.writeBoolean(false); out.writeBoolean(false);
} }
@ -171,7 +172,7 @@ public class DatafeedUpdate implements Writeable, ToXContent {
if (frequency != null) { if (frequency != null) {
builder.field(DatafeedConfig.FREQUENCY.getPreferredName(), frequency.getStringRep()); builder.field(DatafeedConfig.FREQUENCY.getPreferredName(), frequency.getStringRep());
} }
addOptionalField(builder, DatafeedConfig.INDEXES, indexes); addOptionalField(builder, DatafeedConfig.INDICES, indices);
addOptionalField(builder, DatafeedConfig.TYPES, types); addOptionalField(builder, DatafeedConfig.TYPES, types);
addOptionalField(builder, DatafeedConfig.QUERY, query); addOptionalField(builder, DatafeedConfig.QUERY, query);
addOptionalField(builder, DatafeedConfig.AGGREGATIONS, aggregations); addOptionalField(builder, DatafeedConfig.AGGREGATIONS, aggregations);
@ -214,8 +215,8 @@ public class DatafeedUpdate implements Writeable, ToXContent {
if (frequency != null) { if (frequency != null) {
builder.setFrequency(frequency); builder.setFrequency(frequency);
} }
if (indexes != null) { if (indices != null) {
builder.setIndexes(indexes); builder.setIndices(indices);
} }
if (types != null) { if (types != null) {
builder.setTypes(types); builder.setTypes(types);
@ -242,8 +243,8 @@ public class DatafeedUpdate implements Writeable, ToXContent {
} }
/** /**
* The lists of indexes and types are compared for equality but they are not * The lists of indices and types are compared for equality but they are not
* sorted first so this test could fail simply because the indexes and types * sorted first so this test could fail simply because the indices and types
* lists are in different orders. * lists are in different orders.
*/ */
@Override @Override
@ -262,7 +263,7 @@ public class DatafeedUpdate implements Writeable, ToXContent {
&& Objects.equals(this.jobId, that.jobId) && Objects.equals(this.jobId, that.jobId)
&& Objects.equals(this.frequency, that.frequency) && Objects.equals(this.frequency, that.frequency)
&& Objects.equals(this.queryDelay, that.queryDelay) && Objects.equals(this.queryDelay, that.queryDelay)
&& Objects.equals(this.indexes, that.indexes) && Objects.equals(this.indices, that.indices)
&& Objects.equals(this.types, that.types) && Objects.equals(this.types, that.types)
&& Objects.equals(this.query, that.query) && Objects.equals(this.query, that.query)
&& Objects.equals(this.scrollSize, that.scrollSize) && Objects.equals(this.scrollSize, that.scrollSize)
@ -274,7 +275,7 @@ public class DatafeedUpdate implements Writeable, ToXContent {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(id, jobId, frequency, queryDelay, indexes, types, query, scrollSize, aggregations, scriptFields, source, return Objects.hash(id, jobId, frequency, queryDelay, indices, types, query, scrollSize, aggregations, scriptFields, source,
chunkingConfig); chunkingConfig);
} }
@ -289,7 +290,7 @@ public class DatafeedUpdate implements Writeable, ToXContent {
private String jobId; private String jobId;
private TimeValue queryDelay; private TimeValue queryDelay;
private TimeValue frequency; private TimeValue frequency;
private List<String> indexes; private List<String> indices;
private List<String> types; private List<String> types;
private QueryBuilder query; private QueryBuilder query;
private AggregatorFactories.Builder aggregations; private AggregatorFactories.Builder aggregations;
@ -310,7 +311,7 @@ public class DatafeedUpdate implements Writeable, ToXContent {
this.jobId = config.jobId; this.jobId = config.jobId;
this.queryDelay = config.queryDelay; this.queryDelay = config.queryDelay;
this.frequency = config.frequency; this.frequency = config.frequency;
this.indexes = config.indexes; this.indices = config.indices;
this.types = config.types; this.types = config.types;
this.query = config.query; this.query = config.query;
this.aggregations = config.aggregations; this.aggregations = config.aggregations;
@ -328,8 +329,8 @@ public class DatafeedUpdate implements Writeable, ToXContent {
this.jobId = jobId; this.jobId = jobId;
} }
public void setIndexes(List<String> indexes) { public void setIndices(List<String> indices) {
this.indexes = indexes; this.indices = indices;
} }
public void setTypes(List<String> types) { public void setTypes(List<String> types) {
@ -371,7 +372,7 @@ public class DatafeedUpdate implements Writeable, ToXContent {
} }
public DatafeedUpdate build() { public DatafeedUpdate build() {
return new DatafeedUpdate(id, jobId, queryDelay, frequency, indexes, types, query, aggregations, scriptFields, scrollSize, return new DatafeedUpdate(id, jobId, queryDelay, frequency, indices, types, query, aggregations, scriptFields, scrollSize,
source, chunkingConfig); source, chunkingConfig);
} }
} }

2
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AggregationDataExtractor.java
View File

@ -107,7 +107,7 @@ class AggregationDataExtractor implements DataExtractor {
private SearchRequestBuilder buildSearchRequest() { private SearchRequestBuilder buildSearchRequest() {
SearchRequestBuilder searchRequestBuilder = SearchAction.INSTANCE.newRequestBuilder(client) SearchRequestBuilder searchRequestBuilder = SearchAction.INSTANCE.newRequestBuilder(client)
.setIndices(context.indexes) .setIndices(context.indices)
.setTypes(context.types) .setTypes(context.types)
.setSize(0) .setSize(0)
.setQuery(ExtractorUtils.wrapInTimeRangeQuery(context.query, context.timeField, context.start, context.end)); .setQuery(ExtractorUtils.wrapInTimeRangeQuery(context.query, context.timeField, context.start, context.end));

6
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AggregationDataExtractorContext.java
View File

@ -15,7 +15,7 @@ class AggregationDataExtractorContext {
final String jobId; final String jobId;
final String timeField; final String timeField;
final String[] indexes; final String[] indices;
final String[] types; final String[] types;
final QueryBuilder query; final QueryBuilder query;
final AggregatorFactories.Builder aggs; final AggregatorFactories.Builder aggs;
@ -23,11 +23,11 @@ class AggregationDataExtractorContext {
final long end; final long end;
final boolean includeDocCount; final boolean includeDocCount;
AggregationDataExtractorContext(String jobId, String timeField, List<String> indexes, List<String> types, QueryBuilder query, AggregationDataExtractorContext(String jobId, String timeField, List<String> indices, List<String> types, QueryBuilder query,
AggregatorFactories.Builder aggs, long start, long end, boolean includeDocCount) { AggregatorFactories.Builder aggs, long start, long end, boolean includeDocCount) {
this.jobId = Objects.requireNonNull(jobId); this.jobId = Objects.requireNonNull(jobId);
this.timeField = Objects.requireNonNull(timeField); this.timeField = Objects.requireNonNull(timeField);
this.indexes = indexes.toArray(new String[indexes.size()]); this.indices = indices.toArray(new String[indices.size()]);
this.types = types.toArray(new String[types.size()]); this.types = types.toArray(new String[types.size()]);
this.query = Objects.requireNonNull(query); this.query = Objects.requireNonNull(query);
this.aggs = Objects.requireNonNull(aggs); this.aggs = Objects.requireNonNull(aggs);

2
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AggregationDataExtractorFactory.java
View File

@ -30,7 +30,7 @@ public class AggregationDataExtractorFactory implements DataExtractorFactory {
AggregationDataExtractorContext dataExtractorContext = new AggregationDataExtractorContext( AggregationDataExtractorContext dataExtractorContext = new AggregationDataExtractorContext(
job.getId(), job.getId(),
job.getDataDescription().getTimeField(), job.getDataDescription().getTimeField(),
datafeedConfig.getIndexes(), datafeedConfig.getIndices(),
datafeedConfig.getTypes(), datafeedConfig.getTypes(),
datafeedConfig.getQuery(), datafeedConfig.getQuery(),
datafeedConfig.getAggregations(), datafeedConfig.getAggregations(),

2
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/chunked/ChunkedDataExtractor.java
View File

@ -108,7 +108,7 @@ public class ChunkedDataExtractor implements DataExtractor {
private DataSummary requestDataSummary() throws IOException { private DataSummary requestDataSummary() throws IOException {
SearchRequestBuilder searchRequestBuilder = SearchAction.INSTANCE.newRequestBuilder(client) SearchRequestBuilder searchRequestBuilder = SearchAction.INSTANCE.newRequestBuilder(client)
.setSize(0) .setSize(0)
.setIndices(context.indexes) .setIndices(context.indices)
.setTypes(context.types) .setTypes(context.types)
.setQuery(ExtractorUtils.wrapInTimeRangeQuery(context.query, context.timeField, currentStart, context.end)) .setQuery(ExtractorUtils.wrapInTimeRangeQuery(context.query, context.timeField, currentStart, context.end))
.addAggregation(AggregationBuilders.min(EARLIEST_TIME).field(context.timeField)) .addAggregation(AggregationBuilders.min(EARLIEST_TIME).field(context.timeField))

6
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/chunked/ChunkedDataExtractorContext.java
View File

@ -16,7 +16,7 @@ class ChunkedDataExtractorContext {
final String jobId; final String jobId;
final String timeField; final String timeField;
final String[] indexes; final String[] indices;
final String[] types; final String[] types;
final QueryBuilder query; final QueryBuilder query;
final int scrollSize; final int scrollSize;
@ -24,11 +24,11 @@ class ChunkedDataExtractorContext {
final long end; final long end;
final TimeValue chunkSpan; final TimeValue chunkSpan;
ChunkedDataExtractorContext(String jobId, String timeField, List<String> indexes, List<String> types, ChunkedDataExtractorContext(String jobId, String timeField, List<String> indices, List<String> types,
QueryBuilder query, int scrollSize, long start, long end, @Nullable TimeValue chunkSpan) { QueryBuilder query, int scrollSize, long start, long end, @Nullable TimeValue chunkSpan) {
this.jobId = Objects.requireNonNull(jobId); this.jobId = Objects.requireNonNull(jobId);
this.timeField = Objects.requireNonNull(timeField); this.timeField = Objects.requireNonNull(timeField);
this.indexes = indexes.toArray(new String[indexes.size()]); this.indices = indices.toArray(new String[indices.size()]);
this.types = types.toArray(new String[types.size()]); this.types = types.toArray(new String[types.size()]);
this.query = Objects.requireNonNull(query); this.query = Objects.requireNonNull(query);
this.scrollSize = scrollSize; this.scrollSize = scrollSize;

2
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/chunked/ChunkedDataExtractorFactory.java
View File

@ -32,7 +32,7 @@ public class ChunkedDataExtractorFactory implements DataExtractorFactory {
ChunkedDataExtractorContext dataExtractorContext = new ChunkedDataExtractorContext( ChunkedDataExtractorContext dataExtractorContext = new ChunkedDataExtractorContext(
job.getId(), job.getId(),
job.getDataDescription().getTimeField(), job.getDataDescription().getTimeField(),
datafeedConfig.getIndexes(), datafeedConfig.getIndices(),
datafeedConfig.getTypes(), datafeedConfig.getTypes(),
datafeedConfig.getQuery(), datafeedConfig.getQuery(),
datafeedConfig.getScrollSize(), datafeedConfig.getScrollSize(),

2
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractor.java
View File

@ -99,7 +99,7 @@ class ScrollDataExtractor implements DataExtractor {
SearchRequestBuilder searchRequestBuilder = SearchAction.INSTANCE.newRequestBuilder(client) SearchRequestBuilder searchRequestBuilder = SearchAction.INSTANCE.newRequestBuilder(client)
.setScroll(SCROLL_TIMEOUT) .setScroll(SCROLL_TIMEOUT)
.addSort(context.extractedFields.timeField(), SortOrder.ASC) .addSort(context.extractedFields.timeField(), SortOrder.ASC)
.setIndices(context.indexes) .setIndices(context.indices)
.setTypes(context.types) .setTypes(context.types)
.setSize(context.scrollSize) .setSize(context.scrollSize)
.setQuery(ExtractorUtils.wrapInTimeRangeQuery( .setQuery(ExtractorUtils.wrapInTimeRangeQuery(

6
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorContext.java
View File

@ -15,7 +15,7 @@ class ScrollDataExtractorContext {
final String jobId; final String jobId;
final ExtractedFields extractedFields; final ExtractedFields extractedFields;
final String[] indexes; final String[] indices;
final String[] types; final String[] types;
final QueryBuilder query; final QueryBuilder query;
final List<SearchSourceBuilder.ScriptField> scriptFields; final List<SearchSourceBuilder.ScriptField> scriptFields;
@ -23,12 +23,12 @@ class ScrollDataExtractorContext {
final long start; final long start;
final long end; final long end;
ScrollDataExtractorContext(String jobId, ExtractedFields extractedFields, List<String> indexes, List<String> types, ScrollDataExtractorContext(String jobId, ExtractedFields extractedFields, List<String> indices, List<String> types,
QueryBuilder query, List<SearchSourceBuilder.ScriptField> scriptFields, int scrollSize, QueryBuilder query, List<SearchSourceBuilder.ScriptField> scriptFields, int scrollSize,
long start, long end) { long start, long end) {
this.jobId = Objects.requireNonNull(jobId); this.jobId = Objects.requireNonNull(jobId);
this.extractedFields = Objects.requireNonNull(extractedFields); this.extractedFields = Objects.requireNonNull(extractedFields);
this.indexes = indexes.toArray(new String[indexes.size()]); this.indices = indices.toArray(new String[indices.size()]);
this.types = types.toArray(new String[types.size()]); this.types = types.toArray(new String[types.size()]);
this.query = Objects.requireNonNull(query); this.query = Objects.requireNonNull(query);
this.scriptFields = Objects.requireNonNull(scriptFields); this.scriptFields = Objects.requireNonNull(scriptFields);

2
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorFactory.java
View File

@ -32,7 +32,7 @@ public class ScrollDataExtractorFactory implements DataExtractorFactory {
ScrollDataExtractorContext dataExtractorContext = new ScrollDataExtractorContext( ScrollDataExtractorContext dataExtractorContext = new ScrollDataExtractorContext(
job.getId(), job.getId(),
extractedFields, extractedFields,
datafeedConfig.getIndexes(), datafeedConfig.getIndices(),
datafeedConfig.getTypes(), datafeedConfig.getTypes(),
datafeedConfig.getQuery(), datafeedConfig.getQuery(),
datafeedConfig.getScriptFields(), datafeedConfig.getScriptFields(),

2
plugin/src/test/java/org/elasticsearch/xpack/ml/MlMetadataTests.java
View File

@ -251,7 +251,7 @@ public class MlMetadataTests extends AbstractSerializingTestCase<MlMetadata> {
DatafeedConfig updatedDatafeed = updatedMetadata.getDatafeed(datafeedConfig1.getId()); DatafeedConfig updatedDatafeed = updatedMetadata.getDatafeed(datafeedConfig1.getId());
assertThat(updatedDatafeed.getJobId(), equalTo(datafeedConfig1.getJobId())); assertThat(updatedDatafeed.getJobId(), equalTo(datafeedConfig1.getJobId()));
assertThat(updatedDatafeed.getIndexes(), equalTo(datafeedConfig1.getIndexes())); assertThat(updatedDatafeed.getIndices(), equalTo(datafeedConfig1.getIndices()));
assertThat(updatedDatafeed.getTypes(), equalTo(datafeedConfig1.getTypes())); assertThat(updatedDatafeed.getTypes(), equalTo(datafeedConfig1.getTypes()));
assertThat(updatedDatafeed.getScrollSize(), equalTo(5000)); assertThat(updatedDatafeed.getScrollSize(), equalTo(5000));
} }

2
plugin/src/test/java/org/elasticsearch/xpack/ml/action/PutDatafeedActionRequestTests.java
View File

@ -26,7 +26,7 @@ public class PutDatafeedActionRequestTests extends AbstractStreamableXContentTes
@Override @Override
protected Request createTestInstance() { protected Request createTestInstance() {
DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, randomAlphaOfLength(10)); DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, randomAlphaOfLength(10));
datafeedConfig.setIndexes(Arrays.asList(randomAlphaOfLength(10))); datafeedConfig.setIndices(Arrays.asList(randomAlphaOfLength(10)));
datafeedConfig.setTypes(Arrays.asList(randomAlphaOfLength(10))); datafeedConfig.setTypes(Arrays.asList(randomAlphaOfLength(10)));
return new Request(datafeedConfig.build()); return new Request(datafeedConfig.build());
} }

2
plugin/src/test/java/org/elasticsearch/xpack/ml/action/PutDatafeedActionResponseTests.java
View File

@ -18,7 +18,7 @@ public class PutDatafeedActionResponseTests extends AbstractStreamableTestCase<R
protected Response createTestInstance() { protected Response createTestInstance() {
DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder( DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(
DatafeedConfigTests.randomValidDatafeedId(), randomAlphaOfLength(10)); DatafeedConfigTests.randomValidDatafeedId(), randomAlphaOfLength(10));
datafeedConfig.setIndexes(Arrays.asList(randomAlphaOfLength(10))); datafeedConfig.setIndices(Arrays.asList(randomAlphaOfLength(10)));
datafeedConfig.setTypes(Arrays.asList(randomAlphaOfLength(10))); datafeedConfig.setTypes(Arrays.asList(randomAlphaOfLength(10)));
return new Response(randomBoolean(), datafeedConfig.build()); return new Response(randomBoolean(), datafeedConfig.build());
} }

54
plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedConfigTests.java
View File

@ -45,7 +45,7 @@ public class DatafeedConfigTests extends AbstractSerializingTestCase<DatafeedCon
public static DatafeedConfig createRandomizedDatafeedConfig(String jobId, long bucketSpanMillis) { public static DatafeedConfig createRandomizedDatafeedConfig(String jobId, long bucketSpanMillis) {
DatafeedConfig.Builder builder = new DatafeedConfig.Builder(randomValidDatafeedId(), jobId); DatafeedConfig.Builder builder = new DatafeedConfig.Builder(randomValidDatafeedId(), jobId);
builder.setIndexes(randomStringList(1, 10)); builder.setIndices(randomStringList(1, 10));
builder.setTypes(randomStringList(1, 10)); builder.setTypes(randomStringList(1, 10));
if (randomBoolean()) { if (randomBoolean()) {
builder.setQuery(QueryBuilders.termQuery(randomAlphaOfLength(10), randomAlphaOfLength(10))); builder.setQuery(QueryBuilders.termQuery(randomAlphaOfLength(10), randomAlphaOfLength(10)));
@ -118,47 +118,47 @@ public class DatafeedConfigTests extends AbstractSerializingTestCase<DatafeedCon
public void testFillDefaults() { public void testFillDefaults() {
DatafeedConfig.Builder expectedDatafeedConfig = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder expectedDatafeedConfig = new DatafeedConfig.Builder("datafeed1", "job1");
expectedDatafeedConfig.setIndexes(Arrays.asList("index")); expectedDatafeedConfig.setIndices(Arrays.asList("index"));
expectedDatafeedConfig.setTypes(Arrays.asList("type")); expectedDatafeedConfig.setTypes(Arrays.asList("type"));
expectedDatafeedConfig.setQueryDelay(TimeValue.timeValueMinutes(1)); expectedDatafeedConfig.setQueryDelay(TimeValue.timeValueMinutes(1));
expectedDatafeedConfig.setScrollSize(1000); expectedDatafeedConfig.setScrollSize(1000);
DatafeedConfig.Builder defaultedDatafeedConfig = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder defaultedDatafeedConfig = new DatafeedConfig.Builder("datafeed1", "job1");
defaultedDatafeedConfig.setIndexes(Arrays.asList("index")); defaultedDatafeedConfig.setIndices(Arrays.asList("index"));
defaultedDatafeedConfig.setTypes(Arrays.asList("type")); defaultedDatafeedConfig.setTypes(Arrays.asList("type"));
assertEquals(expectedDatafeedConfig.build(), defaultedDatafeedConfig.build()); assertEquals(expectedDatafeedConfig.build(), defaultedDatafeedConfig.build());
} }
public void testCheckValid_GivenNullIndexes() throws IOException { public void testCheckValid_GivenNullIndices() throws IOException {
DatafeedConfig.Builder conf = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder conf = new DatafeedConfig.Builder("datafeed1", "job1");
expectThrows(IllegalArgumentException.class, () -> conf.setIndexes(null)); expectThrows(IllegalArgumentException.class, () -> conf.setIndices(null));
} }
public void testCheckValid_GivenEmptyIndexes() throws IOException { public void testCheckValid_GivenEmptyIndices() throws IOException {
DatafeedConfig.Builder conf = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder conf = new DatafeedConfig.Builder("datafeed1", "job1");
conf.setIndexes(Collections.emptyList()); conf.setIndices(Collections.emptyList());
IllegalArgumentException e = ESTestCase.expectThrows(IllegalArgumentException.class, conf::build); IllegalArgumentException e = ESTestCase.expectThrows(IllegalArgumentException.class, conf::build);
assertEquals(Messages.getMessage(Messages.DATAFEED_CONFIG_INVALID_OPTION_VALUE, "indexes", "[]"), e.getMessage()); assertEquals(Messages.getMessage(Messages.DATAFEED_CONFIG_INVALID_OPTION_VALUE, "indices", "[]"), e.getMessage());
} }
public void testCheckValid_GivenIndexesContainsOnlyNulls() throws IOException { public void testCheckValid_GivenIndicesContainsOnlyNulls() throws IOException {
List<String> indexes = new ArrayList<>(); List<String> indices = new ArrayList<>();
indexes.add(null); indices.add(null);
indexes.add(null); indices.add(null);
DatafeedConfig.Builder conf = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder conf = new DatafeedConfig.Builder("datafeed1", "job1");
conf.setIndexes(indexes); conf.setIndices(indices);
IllegalArgumentException e = ESTestCase.expectThrows(IllegalArgumentException.class, conf::build); IllegalArgumentException e = ESTestCase.expectThrows(IllegalArgumentException.class, conf::build);
assertEquals(Messages.getMessage(Messages.DATAFEED_CONFIG_INVALID_OPTION_VALUE, "indexes", "[null, null]"), e.getMessage()); assertEquals(Messages.getMessage(Messages.DATAFEED_CONFIG_INVALID_OPTION_VALUE, "indices", "[null, null]"), e.getMessage());
} }
public void testCheckValid_GivenIndexesContainsOnlyEmptyStrings() throws IOException { public void testCheckValid_GivenIndicesContainsOnlyEmptyStrings() throws IOException {
List<String> indexes = new ArrayList<>(); List<String> indices = new ArrayList<>();
indexes.add(""); indices.add("");
indexes.add(""); indices.add("");
DatafeedConfig.Builder conf = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder conf = new DatafeedConfig.Builder("datafeed1", "job1");
conf.setIndexes(indexes); conf.setIndices(indices);
IllegalArgumentException e = ESTestCase.expectThrows(IllegalArgumentException.class, conf::build); IllegalArgumentException e = ESTestCase.expectThrows(IllegalArgumentException.class, conf::build);
assertEquals(Messages.getMessage(Messages.DATAFEED_CONFIG_INVALID_OPTION_VALUE, "indexes", "[, ]"), e.getMessage()); assertEquals(Messages.getMessage(Messages.DATAFEED_CONFIG_INVALID_OPTION_VALUE, "indices", "[, ]"), e.getMessage());
} }
public void testCheckValid_GivenNegativeQueryDelay() throws IOException { public void testCheckValid_GivenNegativeQueryDelay() throws IOException {
@ -189,7 +189,7 @@ public class DatafeedConfigTests extends AbstractSerializingTestCase<DatafeedCon
public void testBuild_GivenScriptFieldsAndAggregations() { public void testBuild_GivenScriptFieldsAndAggregations() {
DatafeedConfig.Builder datafeed = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder datafeed = new DatafeedConfig.Builder("datafeed1", "job1");
datafeed.setIndexes(Arrays.asList("my_index")); datafeed.setIndices(Arrays.asList("my_index"));
datafeed.setTypes(Arrays.asList("my_type")); datafeed.setTypes(Arrays.asList("my_type"));
datafeed.setScriptFields(Arrays.asList(new SearchSourceBuilder.ScriptField(randomAlphaOfLength(10), datafeed.setScriptFields(Arrays.asList(new SearchSourceBuilder.ScriptField(randomAlphaOfLength(10),
mockScript(randomAlphaOfLength(10)), randomBoolean()))); mockScript(randomAlphaOfLength(10)), randomBoolean())));
@ -202,7 +202,7 @@ public class DatafeedConfigTests extends AbstractSerializingTestCase<DatafeedCon
public void testHasAggregations_GivenNull() { public void testHasAggregations_GivenNull() {
DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1");
builder.setIndexes(Arrays.asList("myIndex")); builder.setIndices(Arrays.asList("myIndex"));
builder.setTypes(Arrays.asList("myType")); builder.setTypes(Arrays.asList("myType"));
DatafeedConfig datafeedConfig = builder.build(); DatafeedConfig datafeedConfig = builder.build();
@ -211,7 +211,7 @@ public class DatafeedConfigTests extends AbstractSerializingTestCase<DatafeedCon
public void testHasAggregations_NonEmpty() { public void testHasAggregations_NonEmpty() {
DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1");
builder.setIndexes(Arrays.asList("myIndex")); builder.setIndices(Arrays.asList("myIndex"));
builder.setTypes(Arrays.asList("myType")); builder.setTypes(Arrays.asList("myType"));
builder.setAggregations(new AggregatorFactories.Builder().addAggregator( builder.setAggregations(new AggregatorFactories.Builder().addAggregator(
AggregationBuilders.dateHistogram("time").interval(300000))); AggregationBuilders.dateHistogram("time").interval(300000)));
@ -222,7 +222,7 @@ public class DatafeedConfigTests extends AbstractSerializingTestCase<DatafeedCon
public void testBuild_GivenEmptyAggregations() { public void testBuild_GivenEmptyAggregations() {
DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1");
builder.setIndexes(Arrays.asList("myIndex")); builder.setIndices(Arrays.asList("myIndex"));
builder.setTypes(Arrays.asList("myType")); builder.setTypes(Arrays.asList("myType"));
builder.setAggregations(new AggregatorFactories.Builder()); builder.setAggregations(new AggregatorFactories.Builder());
@ -233,7 +233,7 @@ public class DatafeedConfigTests extends AbstractSerializingTestCase<DatafeedCon
public void testBuild_GivenTopLevelAggIsTerms() { public void testBuild_GivenTopLevelAggIsTerms() {
DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1");
builder.setIndexes(Arrays.asList("myIndex")); builder.setIndices(Arrays.asList("myIndex"));
builder.setTypes(Arrays.asList("myType")); builder.setTypes(Arrays.asList("myType"));
builder.setAggregations(new AggregatorFactories.Builder().addAggregator(AggregationBuilders.terms("foo"))); builder.setAggregations(new AggregatorFactories.Builder().addAggregator(AggregationBuilders.terms("foo")));
@ -244,7 +244,7 @@ public class DatafeedConfigTests extends AbstractSerializingTestCase<DatafeedCon
public void testBuild_GivenHistogramWithDefaultInterval() { public void testBuild_GivenHistogramWithDefaultInterval() {
DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1");
builder.setIndexes(Arrays.asList("myIndex")); builder.setIndices(Arrays.asList("myIndex"));
builder.setTypes(Arrays.asList("myType")); builder.setTypes(Arrays.asList("myType"));
builder.setAggregations(new AggregatorFactories.Builder().addAggregator(AggregationBuilders.histogram("time"))); builder.setAggregations(new AggregatorFactories.Builder().addAggregator(AggregationBuilders.histogram("time")));
@ -329,7 +329,7 @@ public class DatafeedConfigTests extends AbstractSerializingTestCase<DatafeedCon
private static DatafeedConfig createDatafeedWithDateHistogram(DateHistogramAggregationBuilder dateHistogram) { private static DatafeedConfig createDatafeedWithDateHistogram(DateHistogramAggregationBuilder dateHistogram) {
DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1"); DatafeedConfig.Builder builder = new DatafeedConfig.Builder("datafeed1", "job1");
builder.setIndexes(Arrays.asList("myIndex")); builder.setIndices(Arrays.asList("myIndex"));
builder.setTypes(Arrays.asList("myType")); builder.setTypes(Arrays.asList("myType"));
builder.setAggregations(new AggregatorFactories.Builder().addAggregator(dateHistogram)); builder.setAggregations(new AggregatorFactories.Builder().addAggregator(dateHistogram));
return builder.build(); return builder.build();

2
plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJobValidatorTests.java
View File

@ -145,7 +145,7 @@ public class DatafeedJobValidatorTests extends ESTestCase {
private static DatafeedConfig.Builder createValidDatafeedConfig() { private static DatafeedConfig.Builder createValidDatafeedConfig() {
DatafeedConfig.Builder builder = new DatafeedConfig.Builder("my-datafeed", "my-job"); DatafeedConfig.Builder builder = new DatafeedConfig.Builder("my-datafeed", "my-job");
builder.setIndexes(Collections.singletonList("myIndex")); builder.setIndices(Collections.singletonList("myIndex"));
builder.setTypes(Collections.singletonList("myType")); builder.setTypes(Collections.singletonList("myType"));
return builder; return builder;
} }

2
plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManagerTests.java
View File

@ -356,7 +356,7 @@ public class DatafeedManagerTests extends ESTestCase {
public static DatafeedConfig.Builder createDatafeedConfig(String datafeedId, String jobId) { public static DatafeedConfig.Builder createDatafeedConfig(String datafeedId, String jobId) {
DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, jobId); DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, jobId);
datafeedConfig.setIndexes(Arrays.asList("myIndex")); datafeedConfig.setIndices(Arrays.asList("myIndex"));
datafeedConfig.setTypes(Arrays.asList("myType")); datafeedConfig.setTypes(Arrays.asList("myType"));
return datafeedConfig; return datafeedConfig;
} }

14
plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedUpdateTests.java
View File

@ -40,7 +40,7 @@ public class DatafeedUpdateTests extends AbstractSerializingTestCase<DatafeedUpd
builder.setFrequency(TimeValue.timeValueSeconds(randomIntBetween(1, Integer.MAX_VALUE))); builder.setFrequency(TimeValue.timeValueSeconds(randomIntBetween(1, Integer.MAX_VALUE)));
} }
if (randomBoolean()) { if (randomBoolean()) {
builder.setIndexes(DatafeedConfigTests.randomStringList(1, 10)); builder.setIndices(DatafeedConfigTests.randomStringList(1, 10));
} }
if (randomBoolean()) { if (randomBoolean()) {
builder.setTypes(DatafeedConfigTests.randomStringList(1, 10)); builder.setTypes(DatafeedConfigTests.randomStringList(1, 10));
@ -114,13 +114,13 @@ public class DatafeedUpdateTests extends AbstractSerializingTestCase<DatafeedUpd
public void testApply_givenFullUpdateNoAggregations() { public void testApply_givenFullUpdateNoAggregations() {
DatafeedConfig.Builder datafeedBuilder = new DatafeedConfig.Builder("foo", "foo-feed"); DatafeedConfig.Builder datafeedBuilder = new DatafeedConfig.Builder("foo", "foo-feed");
datafeedBuilder.setIndexes(Arrays.asList("i_1")); datafeedBuilder.setIndices(Arrays.asList("i_1"));
datafeedBuilder.setTypes(Arrays.asList("t_1")); datafeedBuilder.setTypes(Arrays.asList("t_1"));
DatafeedConfig datafeed = datafeedBuilder.build(); DatafeedConfig datafeed = datafeedBuilder.build();
DatafeedUpdate.Builder update = new DatafeedUpdate.Builder(datafeed.getId()); DatafeedUpdate.Builder update = new DatafeedUpdate.Builder(datafeed.getId());
update.setJobId("bar"); update.setJobId("bar");
update.setIndexes(Arrays.asList("i_2")); update.setIndices(Arrays.asList("i_2"));
update.setTypes(Arrays.asList("t_2")); update.setTypes(Arrays.asList("t_2"));
update.setQueryDelay(TimeValue.timeValueSeconds(42)); update.setQueryDelay(TimeValue.timeValueSeconds(42));
update.setFrequency(TimeValue.timeValueSeconds(142)); update.setFrequency(TimeValue.timeValueSeconds(142));
@ -133,7 +133,7 @@ public class DatafeedUpdateTests extends AbstractSerializingTestCase<DatafeedUpd
DatafeedConfig updatedDatafeed = update.build().apply(datafeed); DatafeedConfig updatedDatafeed = update.build().apply(datafeed);
assertThat(updatedDatafeed.getJobId(), equalTo("bar")); assertThat(updatedDatafeed.getJobId(), equalTo("bar"));
assertThat(updatedDatafeed.getIndexes(), equalTo(Arrays.asList("i_2"))); assertThat(updatedDatafeed.getIndices(), equalTo(Arrays.asList("i_2")));
assertThat(updatedDatafeed.getTypes(), equalTo(Arrays.asList("t_2"))); assertThat(updatedDatafeed.getTypes(), equalTo(Arrays.asList("t_2")));
assertThat(updatedDatafeed.getQueryDelay(), equalTo(TimeValue.timeValueSeconds(42))); assertThat(updatedDatafeed.getQueryDelay(), equalTo(TimeValue.timeValueSeconds(42)));
assertThat(updatedDatafeed.getFrequency(), equalTo(TimeValue.timeValueSeconds(142))); assertThat(updatedDatafeed.getFrequency(), equalTo(TimeValue.timeValueSeconds(142)));
@ -148,7 +148,7 @@ public class DatafeedUpdateTests extends AbstractSerializingTestCase<DatafeedUpd
public void testApply_givenAggregations() { public void testApply_givenAggregations() {
DatafeedConfig.Builder datafeedBuilder = new DatafeedConfig.Builder("foo", "foo-feed"); DatafeedConfig.Builder datafeedBuilder = new DatafeedConfig.Builder("foo", "foo-feed");
datafeedBuilder.setIndexes(Arrays.asList("i_1")); datafeedBuilder.setIndices(Arrays.asList("i_1"));
datafeedBuilder.setTypes(Arrays.asList("t_1")); datafeedBuilder.setTypes(Arrays.asList("t_1"));
DatafeedConfig datafeed = datafeedBuilder.build(); DatafeedConfig datafeed = datafeedBuilder.build();
@ -158,10 +158,10 @@ public class DatafeedUpdateTests extends AbstractSerializingTestCase<DatafeedUpd
DatafeedConfig updatedDatafeed = update.build().apply(datafeed); DatafeedConfig updatedDatafeed = update.build().apply(datafeed);
assertThat(updatedDatafeed.getIndexes(), equalTo(Arrays.asList("i_1"))); assertThat(updatedDatafeed.getIndices(), equalTo(Arrays.asList("i_1")));
assertThat(updatedDatafeed.getTypes(), equalTo(Arrays.asList("t_1"))); assertThat(updatedDatafeed.getTypes(), equalTo(Arrays.asList("t_1")));
assertThat(updatedDatafeed.getAggregations(), assertThat(updatedDatafeed.getAggregations(),
equalTo(new AggregatorFactories.Builder().addAggregator( equalTo(new AggregatorFactories.Builder().addAggregator(
AggregationBuilders.histogram("a").interval(300000)))); AggregationBuilders.histogram("a").interval(300000))));
} }
} }

6
plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AggregationDataExtractorTests.java
View File

@ -50,7 +50,7 @@ public class AggregationDataExtractorTests extends ESTestCase {
private String jobId; private String jobId;
private String timeField; private String timeField;
private List<String> types; private List<String> types;
private List<String> indexes; private List<String> indices;
private QueryBuilder query; private QueryBuilder query;
private AggregatorFactories.Builder aggs; private AggregatorFactories.Builder aggs;
@ -79,7 +79,7 @@ public class AggregationDataExtractorTests extends ESTestCase {
capturedSearchRequests = new ArrayList<>(); capturedSearchRequests = new ArrayList<>();
jobId = "test-job"; jobId = "test-job";
timeField = "time"; timeField = "time";
indexes = Arrays.asList("index-1", "index-2"); indices = Arrays.asList("index-1", "index-2");
types = Arrays.asList("type-1", "type-2"); types = Arrays.asList("type-1", "type-2");
query = QueryBuilders.matchAllQuery(); query = QueryBuilders.matchAllQuery();
aggs = new AggregatorFactories.Builder() aggs = new AggregatorFactories.Builder()
@ -270,7 +270,7 @@ public class AggregationDataExtractorTests extends ESTestCase {
} }
private AggregationDataExtractorContext createContext(long start, long end) { private AggregationDataExtractorContext createContext(long start, long end) {
return new AggregationDataExtractorContext(jobId, timeField, indexes, types, query, aggs, start, end, true); return new AggregationDataExtractorContext(jobId, timeField, indices, types, query, aggs, start, end, true);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

6
plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/chunked/ChunkedDataExtractorTests.java
View File

@ -48,7 +48,7 @@ public class ChunkedDataExtractorTests extends ESTestCase {
private String jobId; private String jobId;
private String timeField; private String timeField;
private List<String> types; private List<String> types;
private List<String> indexes; private List<String> indices;
private QueryBuilder query; private QueryBuilder query;
private int scrollSize; private int scrollSize;
private TimeValue chunkSpan; private TimeValue chunkSpan;
@ -79,7 +79,7 @@ public class ChunkedDataExtractorTests extends ESTestCase {
capturedSearchRequests = new ArrayList<>(); capturedSearchRequests = new ArrayList<>();
jobId = "test-job"; jobId = "test-job";
timeField = "time"; timeField = "time";
indexes = Arrays.asList("index-1", "index-2"); indices = Arrays.asList("index-1", "index-2");
types = Arrays.asList("type-1", "type-2"); types = Arrays.asList("type-1", "type-2");
query = QueryBuilders.matchAllQuery(); query = QueryBuilders.matchAllQuery();
scrollSize = 1000; scrollSize = 1000;
@ -445,7 +445,7 @@ public class ChunkedDataExtractorTests extends ESTestCase {
} }
private ChunkedDataExtractorContext createContext(long start, long end) { private ChunkedDataExtractorContext createContext(long start, long end) {
return new ChunkedDataExtractorContext(jobId, timeField, indexes, types, query, scrollSize, start, end, chunkSpan); return new ChunkedDataExtractorContext(jobId, timeField, indices, types, query, scrollSize, start, end, chunkSpan);
} }
private static class StubSubExtractor implements DataExtractor { private static class StubSubExtractor implements DataExtractor {

8
plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorTests.java
View File

@ -51,7 +51,7 @@ public class ScrollDataExtractorTests extends ESTestCase {
private String jobId; private String jobId;
private ExtractedFields extractedFields; private ExtractedFields extractedFields;
private List<String> types; private List<String> types;
private List<String> indexes; private List<String> indices;
private QueryBuilder query; private QueryBuilder query;
private List<SearchSourceBuilder.ScriptField> scriptFields; private List<SearchSourceBuilder.ScriptField> scriptFields;
private int scrollSize; private int scrollSize;
@ -100,7 +100,7 @@ public class ScrollDataExtractorTests extends ESTestCase {
ExtractedField timeField = ExtractedField.newField("time", ExtractedField.ExtractionMethod.DOC_VALUE); ExtractedField timeField = ExtractedField.newField("time", ExtractedField.ExtractionMethod.DOC_VALUE);
extractedFields = new ExtractedFields(timeField, extractedFields = new ExtractedFields(timeField,
Arrays.asList(timeField, ExtractedField.newField("field_1", ExtractedField.ExtractionMethod.DOC_VALUE))); Arrays.asList(timeField, ExtractedField.newField("field_1", ExtractedField.ExtractionMethod.DOC_VALUE)));
indexes = Arrays.asList("index-1", "index-2"); indices = Arrays.asList("index-1", "index-2");
types = Arrays.asList("type-1", "type-2"); types = Arrays.asList("type-1", "type-2");
query = QueryBuilders.matchAllQuery(); query = QueryBuilders.matchAllQuery();
scriptFields = Collections.emptyList(); scriptFields = Collections.emptyList();
@ -285,7 +285,7 @@ public class ScrollDataExtractorTests extends ESTestCase {
"script2", new Script(ScriptType.INLINE, "painless", "return domainSplit('foo.com', params);", emptyMap()), false); "script2", new Script(ScriptType.INLINE, "painless", "return domainSplit('foo.com', params);", emptyMap()), false);
List<SearchSourceBuilder.ScriptField> sFields = Arrays.asList(withoutSplit, withSplit); List<SearchSourceBuilder.ScriptField> sFields = Arrays.asList(withoutSplit, withSplit);
ScrollDataExtractorContext context = new ScrollDataExtractorContext(jobId, extractedFields, indexes, ScrollDataExtractorContext context = new ScrollDataExtractorContext(jobId, extractedFields, indices,
types, query, sFields, scrollSize, 1000, 2000); types, query, sFields, scrollSize, 1000, 2000);
TestDataExtractor extractor = new TestDataExtractor(context); TestDataExtractor extractor = new TestDataExtractor(context);
@ -332,7 +332,7 @@ public class ScrollDataExtractorTests extends ESTestCase {
} }
private ScrollDataExtractorContext createContext(long start, long end) { private ScrollDataExtractorContext createContext(long start, long end) {
return new ScrollDataExtractorContext(jobId, extractedFields, indexes, types, query, scriptFields, scrollSize, start, end); return new ScrollDataExtractorContext(jobId, extractedFields, indices, types, query, scriptFields, scrollSize, start, end);
} }
private SearchResponse createEmptySearchResponse() { private SearchResponse createEmptySearchResponse() {

4
plugin/src/test/java/org/elasticsearch/xpack/ml/integration/CategorizationIT.java
View File

@ -89,7 +89,7 @@ public class CategorizationIT extends MlNativeAutodetectIntegTestCase {
String datafeedId = job.getId() + "-feed"; String datafeedId = job.getId() + "-feed";
DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, job.getId()); DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, job.getId());
datafeedConfig.setIndexes(Arrays.asList(DATA_INDEX)); datafeedConfig.setIndices(Arrays.asList(DATA_INDEX));
datafeedConfig.setTypes(Arrays.asList(DATA_TYPE)); datafeedConfig.setTypes(Arrays.asList(DATA_TYPE));
DatafeedConfig datafeed = datafeedConfig.build(); DatafeedConfig datafeed = datafeedConfig.build();
registerDatafeed(datafeed); registerDatafeed(datafeed);
@ -135,7 +135,7 @@ public class CategorizationIT extends MlNativeAutodetectIntegTestCase {
String datafeedId = job.getId() + "-feed"; String datafeedId = job.getId() + "-feed";
DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, job.getId()); DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, job.getId());
datafeedConfig.setIndexes(Arrays.asList(DATA_INDEX)); datafeedConfig.setIndices(Arrays.asList(DATA_INDEX));
datafeedConfig.setTypes(Arrays.asList(DATA_TYPE)); datafeedConfig.setTypes(Arrays.asList(DATA_TYPE));
DatafeedConfig datafeed = datafeedConfig.build(); DatafeedConfig datafeed = datafeedConfig.build();
registerDatafeed(datafeed); registerDatafeed(datafeed);

2
plugin/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsRestIT.java
View File

@ -265,7 +265,7 @@ public class DatafeedJobsRestIT extends ESRestTestCase {
assertThat(e.getMessage(), containsString("Cannot create datafeed")); assertThat(e.getMessage(), containsString("Cannot create datafeed"));
assertThat(e.getMessage(), assertThat(e.getMessage(),
containsString("user ml_admin lacks permissions on the indexes to be searched")); containsString("user ml_admin lacks permissions on the indices to be searched"));
} }
public void testInsufficientSearchPrivilegesOnPreview() throws Exception { public void testInsufficientSearchPrivilegesOnPreview() throws Exception {

2
plugin/src/test/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java
View File

@ -95,7 +95,7 @@ public class DeleteExpiredDataIT extends MlNativeAutodetectIntegTestCase {
String datafeedId = job.getId() + "-feed"; String datafeedId = job.getId() + "-feed";
DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, job.getId()); DatafeedConfig.Builder datafeedConfig = new DatafeedConfig.Builder(datafeedId, job.getId());
datafeedConfig.setIndexes(Arrays.asList(DATA_INDEX)); datafeedConfig.setIndices(Arrays.asList(DATA_INDEX));
datafeedConfig.setTypes(Arrays.asList(DATA_TYPE)); datafeedConfig.setTypes(Arrays.asList(DATA_TYPE));
DatafeedConfig datafeed = datafeedConfig.build(); DatafeedConfig datafeed = datafeedConfig.build();
registerDatafeed(datafeed); registerDatafeed(datafeed);

8
plugin/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java
View File

@ -164,15 +164,15 @@ public abstract class BaseMlIntegTestCase extends ESIntegTestCase {
return builder; return builder;
} }
public static DatafeedConfig createDatafeed(String datafeedId, String jobId, List<String> indexes) { public static DatafeedConfig createDatafeed(String datafeedId, String jobId, List<String> indices) {
return createDatafeedBuilder(datafeedId, jobId, indexes).build(); return createDatafeedBuilder(datafeedId, jobId, indices).build();
} }
public static DatafeedConfig.Builder createDatafeedBuilder(String datafeedId, String jobId, List<String> indexes) { public static DatafeedConfig.Builder createDatafeedBuilder(String datafeedId, String jobId, List<String> indices) {
DatafeedConfig.Builder builder = new DatafeedConfig.Builder(datafeedId, jobId); DatafeedConfig.Builder builder = new DatafeedConfig.Builder(datafeedId, jobId);
builder.setQueryDelay(TimeValue.timeValueSeconds(1)); builder.setQueryDelay(TimeValue.timeValueSeconds(1));
builder.setFrequency(TimeValue.timeValueSeconds(2)); builder.setFrequency(TimeValue.timeValueSeconds(2));
builder.setIndexes(indexes); builder.setIndices(indices);
builder.setTypes(Collections.singletonList("type")); builder.setTypes(Collections.singletonList("type"));
return builder; return builder;
} }

8
plugin/src/test/resources/rest-api-spec/test/ml/datafeeds_crud.yaml
View File

@ -71,7 +71,7 @@ setup:
} }
- match: { datafeed_id: "test-datafeed-1" } - match: { datafeed_id: "test-datafeed-1" }
- match: { job_id: "datafeeds-crud-1" } - match: { job_id: "datafeeds-crud-1" }
- match: { indexes: ["index-foo"] } - match: { indices: ["index-foo"] }
- match: { types: ["type-bar"] } - match: { types: ["type-bar"] }
- match: { scroll_size: 1000 } - match: { scroll_size: 1000 }
- is_true: query.match_all - is_true: query.match_all
@ -166,7 +166,7 @@ setup:
} }
- match: { datafeed_id: "test-datafeed-1" } - match: { datafeed_id: "test-datafeed-1" }
- match: { job_id: "datafeeds-crud-1" } - match: { job_id: "datafeeds-crud-1" }
- match: { indexes: ["index-*"] } - match: { indices: ["index-*"] }
- match: { types: ["type-bar"] } - match: { types: ["type-bar"] }
- match: { scroll_size: 10000 } - match: { scroll_size: 10000 }
- match: { frequency: "2m" } - match: { frequency: "2m" }
@ -194,7 +194,7 @@ setup:
} }
- match: { datafeed_id: "test-datafeed-1" } - match: { datafeed_id: "test-datafeed-1" }
- match: { job_id: "datafeeds-crud-2" } - match: { job_id: "datafeeds-crud-2" }
- match: { indexes: ["index-foo"] } - match: { indices: ["index-foo"] }
- match: { types: ["type-bar"] } - match: { types: ["type-bar"] }
--- ---
@ -275,7 +275,7 @@ setup:
body: > body: >
{ {
"job_id":"datafeeds-crud-1", "job_id":"datafeeds-crud-1",
"indexes":["index-foo"], "indices":["index-foo"],
"types":["type-bar"], "types":["type-bar"],
"chunking_config": {"mode":"manual","time_span": "1h"} "chunking_config": {"mode":"manual","time_span": "1h"}
} }