Skip to content

Commit 5ac551c

Browse files
davidkyledavidkyle
committed
[ML] Rename JobProvider to JobResultsProvider (#32551)
1 parent 5d804d0 commit 5ac551c

33 files changed

+244
-239
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
import org.elasticsearch.xpack.ml.job.categorization.MlClassicTokenizer;
164164
import org.elasticsearch.xpack.ml.job.categorization.MlClassicTokenizerFactory;
165165
import org.elasticsearch.xpack.ml.job.persistence.JobDataCountsPersister;
166-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
166+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
167167
import org.elasticsearch.xpack.ml.job.persistence.JobResultsPersister;
168168
import org.elasticsearch.xpack.ml.job.process.DataCountsReporter;
169169
import org.elasticsearch.xpack.ml.job.process.NativeController;
@@ -362,9 +362,9 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
362362
}
363363

364364
Auditor auditor = new Auditor(client, clusterService.nodeName());
365-
JobProvider jobProvider = new JobProvider(client, settings);
365+
JobResultsProvider jobResultsProvider = new JobResultsProvider(client, settings);
366366
UpdateJobProcessNotifier notifier = new UpdateJobProcessNotifier(settings, client, clusterService, threadPool);
367-
JobManager jobManager = new JobManager(env, settings, jobProvider, clusterService, auditor, client, notifier);
367+
JobManager jobManager = new JobManager(env, settings, jobResultsProvider, clusterService, auditor, client, notifier);
368368

369369
JobDataCountsPersister jobDataCountsPersister = new JobDataCountsPersister(settings, client);
370370
JobResultsPersister jobResultsPersister = new JobResultsPersister(settings, client);
@@ -395,10 +395,10 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
395395
NormalizerFactory normalizerFactory = new NormalizerFactory(normalizerProcessFactory,
396396
threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME));
397397
AutodetectProcessManager autodetectProcessManager = new AutodetectProcessManager(env, settings, client, threadPool,
398-
jobManager, jobProvider, jobResultsPersister, jobDataCountsPersister, autodetectProcessFactory,
398+
jobManager, jobResultsProvider, jobResultsPersister, jobDataCountsPersister, autodetectProcessFactory,
399399
normalizerFactory, xContentRegistry, auditor);
400400
this.autodetectProcessManager.set(autodetectProcessManager);
401-
DatafeedJobBuilder datafeedJobBuilder = new DatafeedJobBuilder(client, jobProvider, auditor, System::currentTimeMillis);
401+
DatafeedJobBuilder datafeedJobBuilder = new DatafeedJobBuilder(client, jobResultsProvider, auditor, System::currentTimeMillis);
402402
DatafeedManager datafeedManager = new DatafeedManager(threadPool, client, clusterService, datafeedJobBuilder,
403403
System::currentTimeMillis, auditor);
404404
this.datafeedManager.set(datafeedManager);
@@ -413,7 +413,7 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
413413

414414
return Arrays.asList(
415415
mlLifeCycleService,
416-
jobProvider,
416+
jobResultsProvider,
417417
jobManager,
418418
autodetectProcessManager,
419419
new MlInitializationService(settings, threadPool, clusterService, client),

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.elasticsearch.xpack.core.ml.action.DeleteCalendarAction;
2626
import org.elasticsearch.xpack.core.ml.calendars.Calendar;
2727
import org.elasticsearch.xpack.ml.job.JobManager;
28-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
28+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2929

3030
import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN;
3131
import static org.elasticsearch.xpack.core.ClientHelper.executeAsyncWithOrigin;
@@ -34,18 +34,18 @@ public class TransportDeleteCalendarAction extends HandledTransportAction<Delete
3434

3535
private final Client client;
3636
private final JobManager jobManager;
37-
private final JobProvider jobProvider;
37+
private final JobResultsProvider jobResultsProvider;
3838

3939
@Inject
4040
public TransportDeleteCalendarAction(Settings settings, ThreadPool threadPool,
4141
TransportService transportService, ActionFilters actionFilters,
4242
IndexNameExpressionResolver indexNameExpressionResolver,
43-
Client client, JobManager jobManager, JobProvider jobProvider) {
43+
Client client, JobManager jobManager, JobResultsProvider jobResultsProvider) {
4444
super(settings, DeleteCalendarAction.NAME, threadPool, transportService, actionFilters,
4545
indexNameExpressionResolver, DeleteCalendarAction.Request::new);
4646
this.client = client;
4747
this.jobManager = jobManager;
48-
this.jobProvider = jobProvider;
48+
this.jobResultsProvider = jobResultsProvider;
4949
}
5050

5151
@Override
@@ -71,7 +71,7 @@ protected void doExecute(DeleteCalendarAction.Request request, ActionListener<De
7171
listener::onFailure
7272
);
7373

74-
jobProvider.calendar(calendarId, calendarListener);
74+
jobResultsProvider.calendar(calendarId, calendarListener);
7575
}
7676

7777
private DeleteByQueryRequest buildDeleteByQuery(String calendarId) {

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.elasticsearch.xpack.core.ml.calendars.Calendar;
2828
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
2929
import org.elasticsearch.xpack.ml.job.JobManager;
30-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
30+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
3131

3232
import java.util.Map;
3333

@@ -38,18 +38,18 @@ public class TransportDeleteCalendarEventAction extends HandledTransportAction<D
3838
DeleteCalendarEventAction.Response> {
3939

4040
private final Client client;
41-
private final JobProvider jobProvider;
41+
private final JobResultsProvider jobResultsProvider;
4242
private final JobManager jobManager;
4343

4444
@Inject
4545
public TransportDeleteCalendarEventAction(Settings settings, ThreadPool threadPool,
4646
TransportService transportService, ActionFilters actionFilters,
4747
IndexNameExpressionResolver indexNameExpressionResolver,
48-
Client client, JobProvider jobProvider, JobManager jobManager) {
48+
Client client, JobResultsProvider jobResultsProvider, JobManager jobManager) {
4949
super(settings, DeleteCalendarEventAction.NAME, threadPool, transportService, actionFilters,
5050
indexNameExpressionResolver, DeleteCalendarEventAction.Request::new);
5151
this.client = client;
52-
this.jobProvider = jobProvider;
52+
this.jobResultsProvider = jobResultsProvider;
5353
this.jobManager = jobManager;
5454
}
5555

@@ -89,7 +89,7 @@ protected void doExecute(DeleteCalendarEventAction.Request request, ActionListen
8989
}, listener::onFailure);
9090

9191
// Get the calendar first so we check the calendar exists before checking the event exists
92-
jobProvider.calendar(request.getCalendarId(), calendarListener);
92+
jobResultsProvider.calendar(request.getCalendarId(), calendarListener);
9393
}
9494

9595
private void deleteEvent(String eventId, Calendar calendar, ActionListener<DeleteCalendarEventAction.Response> listener) {

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.elasticsearch.xpack.core.ml.job.persistence.JobDataDeleter;
2424
import org.elasticsearch.xpack.core.ml.job.process.autodetect.state.ModelSnapshot;
2525
import org.elasticsearch.xpack.ml.job.JobManager;
26-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
26+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2727
import org.elasticsearch.xpack.ml.notifications.Auditor;
2828

2929
import java.util.Collections;
@@ -33,26 +33,27 @@ public class TransportDeleteModelSnapshotAction extends HandledTransportAction<D
3333
DeleteModelSnapshotAction.Response> {
3434

3535
private final Client client;
36-
private final JobProvider jobProvider;
36+
private final JobResultsProvider jobResultsProvider;
3737
private final ClusterService clusterService;
3838
private final Auditor auditor;
3939

4040
@Inject
4141
public TransportDeleteModelSnapshotAction(Settings settings, TransportService transportService, ThreadPool threadPool,
4242
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
43-
JobProvider jobProvider, ClusterService clusterService, Client client, Auditor auditor) {
43+
JobResultsProvider jobResultsProvider, ClusterService clusterService, Client client,
44+
Auditor auditor) {
4445
super(settings, DeleteModelSnapshotAction.NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver,
4546
DeleteModelSnapshotAction.Request::new);
4647
this.client = client;
47-
this.jobProvider = jobProvider;
48+
this.jobResultsProvider = jobResultsProvider;
4849
this.clusterService = clusterService;
4950
this.auditor = auditor;
5051
}
5152

5253
@Override
5354
protected void doExecute(DeleteModelSnapshotAction.Request request, ActionListener<DeleteModelSnapshotAction.Response> listener) {
5455
// Verify the snapshot exists
55-
jobProvider.modelSnapshots(
56+
jobResultsProvider.modelSnapshots(
5657
request.getJobId(), 0, 1, null, null, null, true, request.getSnapshotId(),
5758
page -> {
5859
List<ModelSnapshot> deleteCandidates = page.results();

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.elasticsearch.xpack.core.ml.job.results.ForecastRequestStats;
2626
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
2727
import org.elasticsearch.xpack.ml.job.JobManager;
28-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
28+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2929
import org.elasticsearch.xpack.ml.job.process.autodetect.AutodetectProcessManager;
3030
import org.elasticsearch.xpack.ml.job.process.autodetect.params.ForecastParams;
3131

@@ -41,16 +41,16 @@ public class TransportForecastJobAction extends TransportJobTaskAction<ForecastJ
4141

4242
private static final ByteSizeValue FORECAST_LOCAL_STORAGE_LIMIT = new ByteSizeValue(500, ByteSizeUnit.MB);
4343

44-
private final JobProvider jobProvider;
44+
private final JobResultsProvider jobResultsProvider;
4545
@Inject
4646
public TransportForecastJobAction(Settings settings, TransportService transportService, ThreadPool threadPool,
4747
ClusterService clusterService, ActionFilters actionFilters,
48-
IndexNameExpressionResolver indexNameExpressionResolver, JobProvider jobProvider,
48+
IndexNameExpressionResolver indexNameExpressionResolver, JobResultsProvider jobResultsProvider,
4949
AutodetectProcessManager processManager) {
5050
super(settings, ForecastJobAction.NAME, threadPool, clusterService, transportService, actionFilters,
5151
indexNameExpressionResolver, ForecastJobAction.Request::new, ForecastJobAction.Response::new,
5252
ThreadPool.Names.SAME, processManager);
53-
this.jobProvider = jobProvider;
53+
this.jobResultsProvider = jobResultsProvider;
5454
// ThreadPool.Names.SAME, because operations is executed by autodetect worker thread
5555
}
5656

@@ -109,7 +109,7 @@ protected void taskOperation(ForecastJobAction.Request request, TransportOpenJob
109109
}
110110
};
111111

112-
jobProvider.getForecastRequestStats(request.getJobId(), params.getForecastId(),
112+
jobResultsProvider.getForecastRequestStats(request.getJobId(), params.getForecastId(),
113113
forecastRequestStatsHandler, listener::onFailure);
114114
} else {
115115
listener.onFailure(e);

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
import org.elasticsearch.xpack.core.ml.action.GetBucketsAction;
1818
import org.elasticsearch.xpack.ml.job.persistence.BucketsQueryBuilder;
1919
import org.elasticsearch.xpack.ml.job.JobManager;
20-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
20+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2121

2222
public class TransportGetBucketsAction extends HandledTransportAction<GetBucketsAction.Request, GetBucketsAction.Response> {
2323

24-
private final JobProvider jobProvider;
24+
private final JobResultsProvider jobResultsProvider;
2525
private final JobManager jobManager;
2626
private final Client client;
2727

2828
@Inject
2929
public TransportGetBucketsAction(Settings settings, ThreadPool threadPool, TransportService transportService,
3030
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
31-
JobProvider jobProvider, JobManager jobManager, Client client) {
31+
JobResultsProvider jobResultsProvider, JobManager jobManager, Client client) {
3232
super(settings, GetBucketsAction.NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver,
3333
GetBucketsAction.Request::new);
34-
this.jobProvider = jobProvider;
34+
this.jobResultsProvider = jobResultsProvider;
3535
this.jobManager = jobManager;
3636
this.client = client;
3737
}
@@ -59,7 +59,7 @@ protected void doExecute(GetBucketsAction.Request request, ActionListener<GetBuc
5959
query.start(request.getStart());
6060
query.end(request.getEnd());
6161
}
62-
jobProvider.buckets(request.getJobId(), query, q ->
62+
jobResultsProvider.buckets(request.getJobId(), query, q ->
6363
listener.onResponse(new GetBucketsAction.Response(q)), listener::onFailure, client);
6464
}
6565
}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@
2323
import org.elasticsearch.xpack.core.ml.job.config.Job;
2424
import org.elasticsearch.xpack.ml.job.persistence.ScheduledEventsQueryBuilder;
2525
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
26-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
26+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2727

2828
import java.util.Collections;
2929
import java.util.List;
3030

3131
public class TransportGetCalendarEventsAction extends HandledTransportAction<GetCalendarEventsAction.Request,
3232
GetCalendarEventsAction.Response> {
3333

34-
private final JobProvider jobProvider;
34+
private final JobResultsProvider jobResultsProvider;
3535
private final ClusterService clusterService;
3636

3737
@Inject
3838
public TransportGetCalendarEventsAction(Settings settings, ThreadPool threadPool,
3939
TransportService transportService, ActionFilters actionFilters,
4040
IndexNameExpressionResolver indexNameExpressionResolver,
41-
ClusterService clusterService, JobProvider jobProvider) {
41+
ClusterService clusterService, JobResultsProvider jobResultsProvider) {
4242
super(settings, GetCalendarEventsAction.NAME, threadPool, transportService, actionFilters,
4343
indexNameExpressionResolver, GetCalendarEventsAction.Request::new);
44-
this.jobProvider = jobProvider;
44+
this.jobResultsProvider = jobResultsProvider;
4545
this.clusterService = clusterService;
4646
}
4747

@@ -87,9 +87,9 @@ protected void doExecute(GetCalendarEventsAction.Request request,
8787
jobGroups = job.getGroups();
8888
}
8989

90-
jobProvider.scheduledEventsForJob(requestId, jobGroups, query, eventsListener);
90+
jobResultsProvider.scheduledEventsForJob(requestId, jobGroups, query, eventsListener);
9191
} else {
92-
jobProvider.scheduledEvents(query, eventsListener);
92+
jobResultsProvider.scheduledEvents(query, eventsListener);
9393
}
9494
},
9595
listener::onFailure);
@@ -103,7 +103,7 @@ private void checkCalendarExists(String calendarId, ActionListener<Boolean> list
103103
return;
104104
}
105105

106-
jobProvider.calendar(calendarId, ActionListener.wrap(
106+
jobResultsProvider.calendar(calendarId, ActionListener.wrap(
107107
c -> listener.onResponse(true),
108108
listener::onFailure
109109
));

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
import org.elasticsearch.xpack.core.ml.action.util.QueryPage;
1919
import org.elasticsearch.xpack.core.ml.calendars.Calendar;
2020
import org.elasticsearch.xpack.ml.job.persistence.CalendarQueryBuilder;
21-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
21+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2222

2323
import java.util.Collections;
2424

2525
public class TransportGetCalendarsAction extends HandledTransportAction<GetCalendarsAction.Request, GetCalendarsAction.Response> {
2626

27-
private final JobProvider jobProvider;
27+
private final JobResultsProvider jobResultsProvider;
2828

2929
@Inject
3030
public TransportGetCalendarsAction(Settings settings, ThreadPool threadPool,
3131
TransportService transportService, ActionFilters actionFilters,
3232
IndexNameExpressionResolver indexNameExpressionResolver,
33-
JobProvider jobProvider) {
33+
JobResultsProvider jobResultsProvider) {
3434
super(settings, GetCalendarsAction.NAME, threadPool, transportService, actionFilters,
3535
indexNameExpressionResolver, GetCalendarsAction.Request::new);
36-
this.jobProvider = jobProvider;
36+
this.jobResultsProvider = jobResultsProvider;
3737
}
3838

3939
@Override
@@ -52,7 +52,7 @@ protected void doExecute(GetCalendarsAction.Request request, ActionListener<GetC
5252

5353
private void getCalendar(String calendarId, ActionListener<GetCalendarsAction.Response> listener) {
5454

55-
jobProvider.calendar(calendarId, ActionListener.wrap(
55+
jobResultsProvider.calendar(calendarId, ActionListener.wrap(
5656
calendar -> {
5757
QueryPage<Calendar> page = new QueryPage<>(Collections.singletonList(calendar), 1, Calendar.RESULTS_FIELD);
5858
listener.onResponse(new GetCalendarsAction.Response(page));
@@ -63,7 +63,7 @@ private void getCalendar(String calendarId, ActionListener<GetCalendarsAction.Re
6363

6464
private void getCalendars(PageParams pageParams, ActionListener<GetCalendarsAction.Response> listener) {
6565
CalendarQueryBuilder query = new CalendarQueryBuilder().pageParams(pageParams).sort(true);
66-
jobProvider.calendars(query, ActionListener.wrap(
66+
jobResultsProvider.calendars(query, ActionListener.wrap(
6767
calendars -> {
6868
listener.onResponse(new GetCalendarsAction.Response(calendars));
6969
},

0 commit comments

Comments
 (0)