Skip to content

Commit 447bac2

Browse files
dimitris-athanasioudimitris-athanasiou
authored
[7.x][ML] Delete unused data frame analytics state (#50243) (#50280)
This commit adds removal of unused data frame analytics state from the _delete_expired_data API (and in extend th ML daily maintenance task). At the moment the potential state docs include the progress document and state for regression and classification analyses. Backport of #50243
1 parent 8208692 commit 447bac2

25 files changed

+235
-22
lines changed

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java

+10
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package org.elasticsearch.xpack.core.ml.dataframe;
77

88
import org.elasticsearch.Version;
9+
import org.elasticsearch.common.Nullable;
910
import org.elasticsearch.common.ParseField;
1011
import org.elasticsearch.common.Strings;
1112
import org.elasticsearch.common.io.stream.StreamInput;
@@ -310,6 +311,15 @@ public static String documentId(String id) {
310311
return TYPE + "-" + id;
311312
}
312313

314+
/**
315+
* Returns the job id from the doc id. Returns {@code null} if the doc id is invalid.
316+
*/
317+
@Nullable
318+
public static String extractJobIdFromDocId(String docId) {
319+
String jobId = docId.replaceAll("^" + TYPE +"-", "");
320+
return jobId.equals(docId) ? null : jobId;
321+
}
322+
313323
public static class Builder {
314324

315325
private String id;

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/analyses/Classification.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public class Classification implements DataFrameAnalysis {
3939
public static final ParseField TRAINING_PERCENT = new ParseField("training_percent");
4040
public static final ParseField RANDOMIZE_SEED = new ParseField("randomize_seed");
4141

42+
private static final String STATE_DOC_ID_SUFFIX = "_classification_state#1";
43+
4244
private static final ConstructingObjectParser<Classification, Void> LENIENT_PARSER = createParser(true);
4345
private static final ConstructingObjectParser<Classification, Void> STRICT_PARSER = createParser(false);
4446

@@ -258,7 +260,12 @@ public boolean persistsState() {
258260

259261
@Override
260262
public String getStateDocId(String jobId) {
261-
return jobId + "_classification_state#1";
263+
return jobId + STATE_DOC_ID_SUFFIX;
264+
}
265+
266+
public static String extractJobIdFromStateDoc(String stateDocId) {
267+
int suffixIndex = stateDocId.lastIndexOf(STATE_DOC_ID_SUFFIX);
268+
return suffixIndex <= 0 ? null : stateDocId.substring(0, suffixIndex);
262269
}
263270

264271
@Override

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/analyses/Regression.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public class Regression implements DataFrameAnalysis {
3636
public static final ParseField TRAINING_PERCENT = new ParseField("training_percent");
3737
public static final ParseField RANDOMIZE_SEED = new ParseField("randomize_seed");
3838

39+
private static final String STATE_DOC_ID_SUFFIX = "_regression_state#1";
40+
3941
private static final ConstructingObjectParser<Regression, Void> LENIENT_PARSER = createParser(true);
4042
private static final ConstructingObjectParser<Regression, Void> STRICT_PARSER = createParser(false);
4143

@@ -196,7 +198,12 @@ public boolean persistsState() {
196198

197199
@Override
198200
public String getStateDocId(String jobId) {
199-
return jobId + "_regression_state#1";
201+
return jobId + STATE_DOC_ID_SUFFIX;
202+
}
203+
204+
public static String extractJobIdFromStateDoc(String stateDocId) {
205+
int suffixIndex = stateDocId.lastIndexOf(STATE_DOC_ID_SUFFIX);
206+
return suffixIndex <= 0 ? null : stateDocId.substring(0, suffixIndex);
200207
}
201208

202209
@Override

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigTests.java

+8
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import static org.hamcrest.Matchers.is;
5454
import static org.hamcrest.Matchers.not;
5555
import static org.hamcrest.Matchers.notNullValue;
56+
import static org.hamcrest.Matchers.nullValue;
5657
import static org.hamcrest.Matchers.startsWith;
5758

5859
public class DataFrameAnalyticsConfigTests extends AbstractSerializingTestCase<DataFrameAnalyticsConfig> {
@@ -384,6 +385,13 @@ public void testToXContent_GivenAnalysisWithRandomizeSeedAndVersionIsBeforeItWas
384385
}
385386
}
386387

388+
public void testExtractJobIdFromDocId() {
389+
assertThat(DataFrameAnalyticsConfig.extractJobIdFromDocId("data_frame_analytics_config-foo"), equalTo("foo"));
390+
assertThat(DataFrameAnalyticsConfig.extractJobIdFromDocId("data_frame_analytics_config-data_frame_analytics_config-foo"),
391+
equalTo("data_frame_analytics_config-foo"));
392+
assertThat(DataFrameAnalyticsConfig.extractJobIdFromDocId("foo"), is(nullValue()));
393+
}
394+
387395
private static void assertTooSmall(ElasticsearchStatusException e) {
388396
assertThat(e.getMessage(), startsWith("model_memory_limit must be at least 1kb."));
389397
}

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/analyses/ClassificationTests.java

+5
Original file line numberDiff line numberDiff line change
@@ -215,4 +215,9 @@ public void testGetStateDocId() {
215215
String randomId = randomAlphaOfLength(10);
216216
assertThat(classification.getStateDocId(randomId), equalTo(randomId + "_classification_state#1"));
217217
}
218+
219+
public void testExtractJobIdFromStateDoc() {
220+
assertThat(Classification.extractJobIdFromStateDoc("foo_bar-1_classification_state#1"), equalTo("foo_bar-1"));
221+
assertThat(Classification.extractJobIdFromStateDoc("noop"), is(nullValue()));
222+
}
218223
}

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/analyses/RegressionTests.java

+5
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,11 @@ public void testGetStateDocId() {
111111
assertThat(regression.getStateDocId(randomId), equalTo(randomId + "_regression_state#1"));
112112
}
113113

114+
public void testExtractJobIdFromStateDoc() {
115+
assertThat(Regression.extractJobIdFromStateDoc("foo_bar-1_regression_state#1"), equalTo("foo_bar-1"));
116+
assertThat(Regression.extractJobIdFromStateDoc("noop"), is(nullValue()));
117+
}
118+
114119
public void testToXContent_GivenVersionBeforeRandomizeSeedWasIntroduced() throws IOException {
115120
Regression regression = createRandom();
116121
assertThat(regression.getRandomizeSeed(), is(notNullValue()));

‎x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java

+34
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
1111
import org.elasticsearch.action.bulk.BulkRequestBuilder;
1212
import org.elasticsearch.action.bulk.BulkResponse;
13+
import org.elasticsearch.action.delete.DeleteResponse;
1314
import org.elasticsearch.action.get.GetResponse;
1415
import org.elasticsearch.action.index.IndexAction;
1516
import org.elasticsearch.action.index.IndexRequest;
1617
import org.elasticsearch.action.search.SearchResponse;
1718
import org.elasticsearch.action.support.WriteRequest;
1819
import org.elasticsearch.index.query.QueryBuilder;
1920
import org.elasticsearch.index.query.QueryBuilders;
21+
import org.elasticsearch.rest.RestStatus;
2022
import org.elasticsearch.search.SearchHit;
2123
import org.elasticsearch.xpack.core.ml.action.EvaluateDataFrameAction;
2224
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig;
@@ -314,6 +316,38 @@ public void testTwoJobsWithSameRandomizeSeedUseSameTrainingSet() throws Exceptio
314316
assertThat(secondRunTrainingRowsIds, equalTo(firstRunTrainingRowsIds));
315317
}
316318

319+
public void testDeleteExpiredData_RemovesUnusedState() throws Exception {
320+
initialize("classification_delete_expired_data");
321+
indexData(sourceIndex, 100, 0, KEYWORD_FIELD);
322+
323+
DataFrameAnalyticsConfig config = buildAnalytics(jobId, sourceIndex, destIndex, null, new Classification(KEYWORD_FIELD));
324+
registerAnalytics(config);
325+
putAnalytics(config);
326+
startAnalytics(jobId);
327+
waitUntilAnalyticsIsStopped(jobId);
328+
329+
assertProgress(jobId, 100, 100, 100, 100);
330+
assertThat(searchStoredProgress(jobId).getHits().getTotalHits().value, equalTo(1L));
331+
assertModelStatePersisted(stateDocId());
332+
assertInferenceModelPersisted(jobId);
333+
334+
// Call _delete_expired_data API and check nothing was deleted
335+
assertThat(deleteExpiredData().isDeleted(), is(true));
336+
assertThat(searchStoredProgress(jobId).getHits().getTotalHits().value, equalTo(1L));
337+
assertModelStatePersisted(stateDocId());
338+
339+
// Delete the config straight from the config index
340+
DeleteResponse deleteResponse = client().prepareDelete().setIndex(".ml-config").setId(DataFrameAnalyticsConfig.documentId(jobId))
341+
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).execute().actionGet();
342+
assertThat(deleteResponse.status(), equalTo(RestStatus.OK));
343+
344+
// Now calling the _delete_expired_data API should remove unused state
345+
assertThat(deleteExpiredData().isDeleted(), is(true));
346+
347+
SearchResponse stateIndexSearchResponse = client().prepareSearch(".ml-state").execute().actionGet();
348+
assertThat(stateIndexSearchResponse.getHits().getTotalHits().value, equalTo(0L));
349+
}
350+
317351
private void initialize(String jobId) {
318352
this.jobId = jobId;
319353
this.sourceIndex = jobId + "_source_index";

‎x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void tearDownData() {
8787
cleanUp();
8888
}
8989

90-
public void testDeleteExpiredDataGivenNothingToDelete() throws Exception {
90+
public void testDeleteExpiredData_GivenNothingToDelete() throws Exception {
9191
// Tests that nothing goes wrong when there's nothing to delete
9292
client().execute(DeleteExpiredDataAction.INSTANCE, new DeleteExpiredDataAction.Request()).get();
9393
}
@@ -202,10 +202,7 @@ public void testDeleteExpiredData() throws Exception {
202202
assertThat(indexUnusedStateDocsResponse.get().status(), equalTo(RestStatus.OK));
203203

204204
// Now call the action under test
205-
client().execute(DeleteExpiredDataAction.INSTANCE, new DeleteExpiredDataAction.Request()).get();
206-
207-
// We need to refresh to ensure the deletion is visible
208-
client().admin().indices().prepareRefresh("*").get();
205+
assertThat(deleteExpiredData().isDeleted(), is(true));
209206

210207
// no-retention job should have kept all data
211208
assertThat(getBuckets("no-retention").size(), is(greaterThanOrEqualTo(70)));

‎x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/MlNativeAutodetectIntegTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.elasticsearch.search.SearchHits;
2222
import org.elasticsearch.search.sort.SortBuilders;
2323
import org.elasticsearch.search.sort.SortOrder;
24+
import org.elasticsearch.xpack.core.action.util.PageParams;
2425
import org.elasticsearch.xpack.core.ml.action.CloseJobAction;
2526
import org.elasticsearch.xpack.core.ml.action.DeleteDatafeedAction;
2627
import org.elasticsearch.xpack.core.ml.action.DeleteJobAction;
@@ -45,7 +46,6 @@
4546
import org.elasticsearch.xpack.core.ml.action.StopDatafeedAction;
4647
import org.elasticsearch.xpack.core.ml.action.UpdateDatafeedAction;
4748
import org.elasticsearch.xpack.core.ml.action.UpdateJobAction;
48-
import org.elasticsearch.xpack.core.action.util.PageParams;
4949
import org.elasticsearch.xpack.core.ml.calendars.Calendar;
5050
import org.elasticsearch.xpack.core.ml.calendars.ScheduledEvent;
5151
import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig;

‎x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.elasticsearch.xpack.core.ml.notifications.AuditorField;
4141
import org.elasticsearch.xpack.core.ml.utils.PhaseProgress;
4242
import org.elasticsearch.xpack.core.ml.utils.QueryProvider;
43-
import org.elasticsearch.xpack.ml.dataframe.DataFrameAnalyticsTask;
43+
import org.elasticsearch.xpack.ml.dataframe.StoredProgress;
4444
import org.hamcrest.Matcher;
4545
import org.hamcrest.Matchers;
4646

@@ -205,7 +205,7 @@ protected void assertProgress(String id, int reindexing, int loadingData, int an
205205
}
206206

207207
protected SearchResponse searchStoredProgress(String jobId) {
208-
String docId = DataFrameAnalyticsTask.progressDocId(jobId);
208+
String docId = StoredProgress.documentId(jobId);
209209
return client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern())
210210
.setQuery(QueryBuilders.idsQuery().addIds(docId))
211211
.get();

‎x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/MlNativeIntegTestCase.java

+11
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.elasticsearch.xpack.core.XPackSettings;
3030
import org.elasticsearch.xpack.core.ml.MlMetadata;
3131
import org.elasticsearch.xpack.core.ml.MlTasks;
32+
import org.elasticsearch.xpack.core.ml.action.DeleteExpiredDataAction;
3233
import org.elasticsearch.xpack.core.ml.action.OpenJobAction;
3334
import org.elasticsearch.xpack.core.ml.action.StartDataFrameAnalyticsAction;
3435
import org.elasticsearch.xpack.core.ml.action.StartDatafeedAction;
@@ -113,6 +114,16 @@ private void waitForPendingTasks() {
113114
}
114115
}
115116

117+
protected DeleteExpiredDataAction.Response deleteExpiredData() throws Exception {
118+
DeleteExpiredDataAction.Response response = client().execute(DeleteExpiredDataAction.INSTANCE,
119+
new DeleteExpiredDataAction.Request()).get();
120+
121+
// We need to refresh to ensure the deletion is visible
122+
client().admin().indices().prepareRefresh("*").get();
123+
124+
return response;
125+
}
126+
116127
@Override
117128
protected void ensureClusterStateConsistency() throws IOException {
118129
if (cluster() != null && cluster().size() > 0) {

‎x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java

+34
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77

88
import org.elasticsearch.action.bulk.BulkRequestBuilder;
99
import org.elasticsearch.action.bulk.BulkResponse;
10+
import org.elasticsearch.action.delete.DeleteResponse;
1011
import org.elasticsearch.action.get.GetResponse;
1112
import org.elasticsearch.action.index.IndexRequest;
1213
import org.elasticsearch.action.search.SearchResponse;
1314
import org.elasticsearch.action.support.WriteRequest;
1415
import org.elasticsearch.common.unit.TimeValue;
16+
import org.elasticsearch.rest.RestStatus;
1517
import org.elasticsearch.search.SearchHit;
1618
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig;
1719
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsState;
@@ -272,6 +274,38 @@ public void testTwoJobsWithSameRandomizeSeedUseSameTrainingSet() throws Exceptio
272274
assertThat(secondRunTrainingRowsIds, equalTo(firstRunTrainingRowsIds));
273275
}
274276

277+
public void testDeleteExpiredData_RemovesUnusedState() throws Exception {
278+
initialize("regression_delete_expired_data");
279+
indexData(sourceIndex, 100, 0);
280+
281+
DataFrameAnalyticsConfig config = buildAnalytics(jobId, sourceIndex, destIndex, null, new Regression(DEPENDENT_VARIABLE_FIELD));
282+
registerAnalytics(config);
283+
putAnalytics(config);
284+
startAnalytics(jobId);
285+
waitUntilAnalyticsIsStopped(jobId);
286+
287+
assertProgress(jobId, 100, 100, 100, 100);
288+
assertThat(searchStoredProgress(jobId).getHits().getTotalHits().value, equalTo(1L));
289+
assertModelStatePersisted(stateDocId());
290+
assertInferenceModelPersisted(jobId);
291+
292+
// Call _delete_expired_data API and check nothing was deleted
293+
assertThat(deleteExpiredData().isDeleted(), is(true));
294+
assertThat(searchStoredProgress(jobId).getHits().getTotalHits().value, equalTo(1L));
295+
assertModelStatePersisted(stateDocId());
296+
297+
// Delete the config straight from the config index
298+
DeleteResponse deleteResponse = client().prepareDelete().setIndex(".ml-config").setId(DataFrameAnalyticsConfig.documentId(jobId))
299+
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).execute().actionGet();
300+
assertThat(deleteResponse.status(), equalTo(RestStatus.OK));
301+
302+
// Now calling the _delete_expired_data API should remove unused state
303+
assertThat(deleteExpiredData().isDeleted(), is(true));
304+
305+
SearchResponse stateIndexSearchResponse = client().prepareSearch(".ml-state").execute().actionGet();
306+
assertThat(stateIndexSearchResponse.getHits().getTotalHits().value, equalTo(0L));
307+
}
308+
275309
private void initialize(String jobId) {
276310
this.jobId = jobId;
277311
this.sourceIndex = jobId + "_source_index";

‎x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDataFrameAnalyticsAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.elasticsearch.xpack.core.ml.job.messages.Messages;
4444
import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndex;
4545
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
46-
import org.elasticsearch.xpack.ml.dataframe.DataFrameAnalyticsTask;
46+
import org.elasticsearch.xpack.ml.dataframe.StoredProgress;
4747
import org.elasticsearch.xpack.ml.dataframe.persistence.DataFrameAnalyticsConfigProvider;
4848
import org.elasticsearch.xpack.ml.notifications.DataFrameAnalyticsAuditor;
4949
import org.elasticsearch.xpack.ml.process.MlMemoryTracker;
@@ -171,7 +171,7 @@ private void deleteState(ParentTaskAssigningClient parentTaskClient,
171171
DataFrameAnalyticsConfig config,
172172
ActionListener<BulkByScrollResponse> listener) {
173173
List<String> ids = new ArrayList<>();
174-
ids.add(DataFrameAnalyticsTask.progressDocId(config.getId()));
174+
ids.add(StoredProgress.documentId(config.getId()));
175175
if (config.getAnalysis().persistsState()) {
176176
ids.add(config.getAnalysis().getStateDocId(config.getId()));
177177
}

‎x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDataFrameAnalyticsStatsAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private void searchStoredProgresses(List<String> configIds, ActionListener<List<
187187
SearchRequest searchRequest = new SearchRequest(AnomalyDetectorsIndex.jobStateIndexPattern());
188188
searchRequest.indicesOptions(IndicesOptions.lenientExpandOpen());
189189
searchRequest.source().size(1);
190-
searchRequest.source().query(QueryBuilders.idsQuery().addIds(DataFrameAnalyticsTask.progressDocId(configId)));
190+
searchRequest.source().query(QueryBuilders.idsQuery().addIds(StoredProgress.documentId(configId)));
191191
multiSearchRequest.add(searchRequest);
192192
}
193193

‎x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DataFrameAnalyticsTask.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ private void persistProgress(Runnable runnable) {
244244
statsResponse -> {
245245
GetDataFrameAnalyticsStatsAction.Response.Stats stats = statsResponse.getResponse().results().get(0);
246246
IndexRequest indexRequest = new IndexRequest(AnomalyDetectorsIndex.jobStateIndexWriteAlias());
247-
indexRequest.id(progressDocId(taskParams.getId()));
247+
indexRequest.id(StoredProgress.documentId(taskParams.getId()));
248248
indexRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
249249
try (XContentBuilder jsonBuilder = JsonXContent.contentBuilder()) {
250250
new StoredProgress(stats.getProgress()).toXContent(jsonBuilder, Payload.XContent.EMPTY_PARAMS);
@@ -310,10 +310,6 @@ public static StartingState determineStartingState(String jobId, List<PhaseProgr
310310
}
311311
}
312312

313-
public static String progressDocId(String id) {
314-
return "data_frame_analytics-" + id + "-progress";
315-
}
316-
317313
public static class ProgressTracker {
318314

319315
public static final String REINDEXING = "reindexing";

‎x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/StoredProgress.java

+14
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package org.elasticsearch.xpack.ml.dataframe;
77

8+
import org.elasticsearch.common.Nullable;
89
import org.elasticsearch.common.ParseField;
910
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
1011
import org.elasticsearch.common.xcontent.ToXContentObject;
@@ -14,6 +15,8 @@
1415
import java.io.IOException;
1516
import java.util.List;
1617
import java.util.Objects;
18+
import java.util.regex.Matcher;
19+
import java.util.regex.Pattern;
1720

1821
public class StoredProgress implements ToXContentObject {
1922

@@ -57,4 +60,15 @@ public boolean equals(Object o) {
5760
public int hashCode() {
5861
return Objects.hash(progress);
5962
}
63+
64+
public static String documentId(String id) {
65+
return "data_frame_analytics-" + id + "-progress";
66+
}
67+
68+
@Nullable
69+
public static String extractJobIdFromDocId(String docId) {
70+
Pattern pattern = Pattern.compile("^data_frame_analytics-(.*)-progress$");
71+
Matcher matcher = pattern.matcher(docId);
72+
return matcher.find() ? matcher.group(1) : null;
73+
}
6074
}

‎x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/BatchedJobsIterator.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.elasticsearch.index.query.TermQueryBuilder;
1717
import org.elasticsearch.search.SearchHit;
1818
import org.elasticsearch.xpack.core.ml.job.config.Job;
19+
import org.elasticsearch.xpack.ml.utils.persistence.BatchedDocumentsIterator;
1920

2021
import java.io.IOException;
2122
import java.io.InputStream;

‎x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/BatchedResultsIterator.java

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.elasticsearch.index.query.TermsQueryBuilder;
1111
import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndex;
1212
import org.elasticsearch.xpack.core.ml.job.results.Result;
13+
import org.elasticsearch.xpack.ml.utils.persistence.BatchedDocumentsIterator;
1314

1415
public abstract class BatchedResultsIterator<T> extends BatchedDocumentsIterator<Result<T>> {
1516

0 commit comments

Comments
 (0)