Skip to content

Commit 1567931

Browse files
davidkyledavidkyle
authored
[ML] Rename JobProvider to JobResultsProvider (#32551)
1 parent 43430fe commit 1567931

33 files changed

+251
-239
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
import org.elasticsearch.xpack.ml.job.categorization.MlClassicTokenizer;
163163
import org.elasticsearch.xpack.ml.job.categorization.MlClassicTokenizerFactory;
164164
import org.elasticsearch.xpack.ml.job.persistence.JobDataCountsPersister;
165-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
165+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
166166
import org.elasticsearch.xpack.ml.job.persistence.JobResultsPersister;
167167
import org.elasticsearch.xpack.ml.job.process.DataCountsReporter;
168168
import org.elasticsearch.xpack.ml.job.process.NativeController;
@@ -357,9 +357,9 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
357357
}
358358

359359
Auditor auditor = new Auditor(client, clusterService.nodeName());
360-
JobProvider jobProvider = new JobProvider(client, settings);
360+
JobResultsProvider jobResultsProvider = new JobResultsProvider(client, settings);
361361
UpdateJobProcessNotifier notifier = new UpdateJobProcessNotifier(settings, client, clusterService, threadPool);
362-
JobManager jobManager = new JobManager(env, settings, jobProvider, clusterService, auditor, client, notifier);
362+
JobManager jobManager = new JobManager(env, settings, jobResultsProvider, clusterService, auditor, client, notifier);
363363

364364
JobDataCountsPersister jobDataCountsPersister = new JobDataCountsPersister(settings, client);
365365
JobResultsPersister jobResultsPersister = new JobResultsPersister(settings, client);
@@ -390,10 +390,10 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
390390
NormalizerFactory normalizerFactory = new NormalizerFactory(normalizerProcessFactory,
391391
threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME));
392392
AutodetectProcessManager autodetectProcessManager = new AutodetectProcessManager(env, settings, client, threadPool,
393-
jobManager, jobProvider, jobResultsPersister, jobDataCountsPersister, autodetectProcessFactory,
393+
jobManager, jobResultsProvider, jobResultsPersister, jobDataCountsPersister, autodetectProcessFactory,
394394
normalizerFactory, xContentRegistry, auditor);
395395
this.autodetectProcessManager.set(autodetectProcessManager);
396-
DatafeedJobBuilder datafeedJobBuilder = new DatafeedJobBuilder(client, jobProvider, auditor, System::currentTimeMillis);
396+
DatafeedJobBuilder datafeedJobBuilder = new DatafeedJobBuilder(client, jobResultsProvider, auditor, System::currentTimeMillis);
397397
DatafeedManager datafeedManager = new DatafeedManager(threadPool, client, clusterService, datafeedJobBuilder,
398398
System::currentTimeMillis, auditor);
399399
this.datafeedManager.set(datafeedManager);
@@ -408,7 +408,7 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
408408

409409
return Arrays.asList(
410410
mlLifeCycleService,
411-
jobProvider,
411+
jobResultsProvider,
412412
jobManager,
413413
autodetectProcessManager,
414414
new MlInitializationService(settings, threadPool, clusterService, client),

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.elasticsearch.xpack.core.ml.action.DeleteCalendarAction;
2525
import org.elasticsearch.xpack.core.ml.calendars.Calendar;
2626
import org.elasticsearch.xpack.ml.job.JobManager;
27-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
27+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2828

2929
import java.util.function.Supplier;
3030

@@ -35,16 +35,17 @@ public class TransportDeleteCalendarAction extends HandledTransportAction<Delete
3535

3636
private final Client client;
3737
private final JobManager jobManager;
38-
private final JobProvider jobProvider;
38+
private final JobResultsProvider jobResultsProvider;
3939

4040
@Inject
4141
public TransportDeleteCalendarAction(Settings settings, TransportService transportService,
42-
ActionFilters actionFilters, Client client, JobManager jobManager, JobProvider jobProvider) {
42+
ActionFilters actionFilters, Client client, JobManager jobManager,
43+
JobResultsProvider jobResultsProvider) {
4344
super(settings, DeleteCalendarAction.NAME, transportService, actionFilters,
4445
(Supplier<DeleteCalendarAction.Request>) DeleteCalendarAction.Request::new);
4546
this.client = client;
4647
this.jobManager = jobManager;
47-
this.jobProvider = jobProvider;
48+
this.jobResultsProvider = jobResultsProvider;
4849
}
4950

5051
@Override
@@ -70,7 +71,7 @@ protected void doExecute(Task task, DeleteCalendarAction.Request request, Action
7071
listener::onFailure
7172
);
7273

73-
jobProvider.calendar(calendarId, calendarListener);
74+
jobResultsProvider.calendar(calendarId, calendarListener);
7475
}
7576

7677
private DeleteByQueryRequest buildDeleteByQuery(String calendarId) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.elasticsearch.xpack.core.ml.calendars.Calendar;
2727
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
2828
import org.elasticsearch.xpack.ml.job.JobManager;
29-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
29+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
3030

3131
import java.util.Map;
3232

@@ -37,16 +37,16 @@ public class TransportDeleteCalendarEventAction extends HandledTransportAction<D
3737
DeleteCalendarEventAction.Response> {
3838

3939
private final Client client;
40-
private final JobProvider jobProvider;
40+
private final JobResultsProvider jobResultsProvider;
4141
private final JobManager jobManager;
4242

4343
@Inject
4444
public TransportDeleteCalendarEventAction(Settings settings, TransportService transportService, ActionFilters actionFilters,
45-
Client client, JobProvider jobProvider, JobManager jobManager) {
45+
Client client, JobResultsProvider jobResultsProvider, JobManager jobManager) {
4646
super(settings, DeleteCalendarEventAction.NAME, transportService, actionFilters,
4747
DeleteCalendarEventAction.Request::new);
4848
this.client = client;
49-
this.jobProvider = jobProvider;
49+
this.jobResultsProvider = jobResultsProvider;
5050
this.jobManager = jobManager;
5151
}
5252

@@ -87,7 +87,7 @@ protected void doExecute(Task task, DeleteCalendarEventAction.Request request,
8787
}, listener::onFailure);
8888

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

9393
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‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.elasticsearch.xpack.core.ml.job.persistence.JobDataDeleter;
2323
import org.elasticsearch.xpack.core.ml.job.process.autodetect.state.ModelSnapshot;
2424
import org.elasticsearch.xpack.ml.job.JobManager;
25-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
25+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2626
import org.elasticsearch.xpack.ml.notifications.Auditor;
2727

2828
import java.util.Collections;
@@ -32,17 +32,18 @@ public class TransportDeleteModelSnapshotAction extends HandledTransportAction<D
3232
DeleteModelSnapshotAction.Response> {
3333

3434
private final Client client;
35-
private final JobProvider jobProvider;
35+
private final JobResultsProvider jobResultsProvider;
3636
private final ClusterService clusterService;
3737
private final Auditor auditor;
3838

3939
@Inject
4040
public TransportDeleteModelSnapshotAction(Settings settings, TransportService transportService, ActionFilters actionFilters,
41-
JobProvider jobProvider, ClusterService clusterService, Client client, Auditor auditor) {
41+
JobResultsProvider jobResultsProvider, ClusterService clusterService, Client client,
42+
Auditor auditor) {
4243
super(settings, DeleteModelSnapshotAction.NAME, transportService, actionFilters,
4344
DeleteModelSnapshotAction.Request::new);
4445
this.client = client;
45-
this.jobProvider = jobProvider;
46+
this.jobResultsProvider = jobResultsProvider;
4647
this.clusterService = clusterService;
4748
this.auditor = auditor;
4849
}
@@ -51,7 +52,7 @@ public TransportDeleteModelSnapshotAction(Settings settings, TransportService tr
5152
protected void doExecute(Task task, DeleteModelSnapshotAction.Request request,
5253
ActionListener<DeleteModelSnapshotAction.Response> listener) {
5354
// Verify the snapshot exists
54-
jobProvider.modelSnapshots(
55+
jobResultsProvider.modelSnapshots(
5556
request.getJobId(), 0, 1, null, null, null, true, request.getSnapshotId(),
5657
page -> {
5758
List<ModelSnapshot> deleteCandidates = page.results();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.elasticsearch.xpack.core.ml.job.results.ForecastRequestStats;
2525
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
2626
import org.elasticsearch.xpack.ml.job.JobManager;
27-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
27+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2828
import org.elasticsearch.xpack.ml.job.process.autodetect.AutodetectProcessManager;
2929
import org.elasticsearch.xpack.ml.job.process.autodetect.params.ForecastParams;
3030

@@ -40,15 +40,15 @@ public class TransportForecastJobAction extends TransportJobTaskAction<ForecastJ
4040

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

43-
private final JobProvider jobProvider;
43+
private final JobResultsProvider jobResultsProvider;
4444
@Inject
4545
public TransportForecastJobAction(Settings settings, TransportService transportService,
4646
ClusterService clusterService, ActionFilters actionFilters,
47-
JobProvider jobProvider, AutodetectProcessManager processManager) {
47+
JobResultsProvider jobResultsProvider, AutodetectProcessManager processManager) {
4848
super(settings, ForecastJobAction.NAME, clusterService, transportService, actionFilters,
4949
ForecastJobAction.Request::new, ForecastJobAction.Response::new,
5050
ThreadPool.Names.SAME, processManager);
51-
this.jobProvider = jobProvider;
51+
this.jobResultsProvider = jobResultsProvider;
5252
// ThreadPool.Names.SAME, because operations is executed by autodetect worker thread
5353
}
5454

@@ -107,7 +107,7 @@ protected void taskOperation(ForecastJobAction.Request request, TransportOpenJob
107107
}
108108
};
109109

110-
jobProvider.getForecastRequestStats(request.getJobId(), params.getForecastId(),
110+
jobResultsProvider.getForecastRequestStats(request.getJobId(), params.getForecastId(),
111111
forecastRequestStatsHandler, listener::onFailure);
112112
} else {
113113
listener.onFailure(e);

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,23 @@
1616
import org.elasticsearch.xpack.core.ml.action.GetBucketsAction;
1717
import org.elasticsearch.xpack.ml.job.JobManager;
1818
import org.elasticsearch.xpack.ml.job.persistence.BucketsQueryBuilder;
19-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
19+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2020

2121
import java.util.function.Supplier;
2222

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

25-
private final JobProvider jobProvider;
25+
private final JobResultsProvider jobResultsProvider;
2626
private final JobManager jobManager;
2727
private final Client client;
2828

2929
@Inject
3030
public TransportGetBucketsAction(Settings settings, TransportService transportService,
31-
ActionFilters actionFilters, JobProvider jobProvider, JobManager jobManager, Client client) {
31+
ActionFilters actionFilters, JobResultsProvider jobResultsProvider,
32+
JobManager jobManager, Client client) {
3233
super(settings, GetBucketsAction.NAME, transportService, actionFilters,
3334
(Supplier<GetBucketsAction.Request>) GetBucketsAction.Request::new);
34-
this.jobProvider = jobProvider;
35+
this.jobResultsProvider = jobResultsProvider;
3536
this.jobManager = jobManager;
3637
this.client = client;
3738
}
@@ -59,7 +60,7 @@ protected void doExecute(Task task, GetBucketsAction.Request request, ActionList
5960
query.start(request.getStart());
6061
query.end(request.getEnd());
6162
}
62-
jobProvider.buckets(request.getJobId(), query, q ->
63+
jobResultsProvider.buckets(request.getJobId(), query, q ->
6364
listener.onResponse(new GetBucketsAction.Response(q)), listener::onFailure, client);
6465
}
6566
}

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.elasticsearch.xpack.core.ml.calendars.ScheduledEvent;
2222
import org.elasticsearch.xpack.core.ml.job.config.Job;
2323
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
24-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
24+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2525
import org.elasticsearch.xpack.ml.job.persistence.ScheduledEventsQueryBuilder;
2626

2727
import java.util.Collections;
@@ -31,15 +31,16 @@
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, TransportService transportService,
39-
ActionFilters actionFilters, ClusterService clusterService, JobProvider jobProvider) {
39+
ActionFilters actionFilters, ClusterService clusterService,
40+
JobResultsProvider jobResultsProvider) {
4041
super(settings, GetCalendarEventsAction.NAME, transportService, actionFilters,
4142
(Supplier<GetCalendarEventsAction.Request>) GetCalendarEventsAction.Request::new);
42-
this.jobProvider = jobProvider;
43+
this.jobResultsProvider = jobResultsProvider;
4344
this.clusterService = clusterService;
4445
}
4546

@@ -85,9 +86,9 @@ protected void doExecute(Task task, GetCalendarEventsAction.Request request,
8586
jobGroups = job.getGroups();
8687
}
8788

88-
jobProvider.scheduledEventsForJob(requestId, jobGroups, query, eventsListener);
89+
jobResultsProvider.scheduledEventsForJob(requestId, jobGroups, query, eventsListener);
8990
} else {
90-
jobProvider.scheduledEvents(query, eventsListener);
91+
jobResultsProvider.scheduledEvents(query, eventsListener);
9192
}
9293
},
9394
listener::onFailure);
@@ -101,7 +102,7 @@ private void checkCalendarExists(String calendarId, ActionListener<Boolean> list
101102
return;
102103
}
103104

104-
jobProvider.calendar(calendarId, ActionListener.wrap(
105+
jobResultsProvider.calendar(calendarId, ActionListener.wrap(
105106
c -> listener.onResponse(true),
106107
listener::onFailure
107108
));

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
import org.elasticsearch.xpack.core.ml.action.util.QueryPage;
1818
import org.elasticsearch.xpack.core.ml.calendars.Calendar;
1919
import org.elasticsearch.xpack.ml.job.persistence.CalendarQueryBuilder;
20-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
20+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
2121

2222
import java.util.Collections;
2323

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

26-
private final JobProvider jobProvider;
26+
private final JobResultsProvider jobResultsProvider;
2727

2828
@Inject
2929
public TransportGetCalendarsAction(Settings settings, TransportService transportService,
30-
ActionFilters actionFilters, JobProvider jobProvider) {
30+
ActionFilters actionFilters, JobResultsProvider jobResultsProvider) {
3131
super(settings, GetCalendarsAction.NAME, transportService, actionFilters,
3232
GetCalendarsAction.Request::new);
33-
this.jobProvider = jobProvider;
33+
this.jobResultsProvider = jobResultsProvider;
3434
}
3535

3636
@Override
@@ -49,7 +49,7 @@ protected void doExecute(Task task, GetCalendarsAction.Request request, ActionLi
4949

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

52-
jobProvider.calendar(calendarId, ActionListener.wrap(
52+
jobResultsProvider.calendar(calendarId, ActionListener.wrap(
5353
calendar -> {
5454
QueryPage<Calendar> page = new QueryPage<>(Collections.singletonList(calendar), 1, Calendar.RESULTS_FIELD);
5555
listener.onResponse(new GetCalendarsAction.Response(page));
@@ -60,7 +60,7 @@ private void getCalendar(String calendarId, ActionListener<GetCalendarsAction.Re
6060

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

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,23 @@
1515
import org.elasticsearch.transport.TransportService;
1616
import org.elasticsearch.xpack.core.ml.action.GetCategoriesAction;
1717
import org.elasticsearch.xpack.ml.job.JobManager;
18-
import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
18+
import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
1919

2020
import java.util.function.Supplier;
2121

2222
public class TransportGetCategoriesAction extends HandledTransportAction<GetCategoriesAction.Request, GetCategoriesAction.Response> {
2323

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

2828
@Inject
2929
public TransportGetCategoriesAction(Settings settings, TransportService transportService,
30-
ActionFilters actionFilters, JobProvider jobProvider, Client client, JobManager jobManager) {
30+
ActionFilters actionFilters, JobResultsProvider jobResultsProvider,
31+
Client client, JobManager jobManager) {
3132
super(settings, GetCategoriesAction.NAME, transportService, actionFilters,
3233
(Supplier<GetCategoriesAction.Request>) GetCategoriesAction.Request::new);
33-
this.jobProvider = jobProvider;
34+
this.jobResultsProvider = jobResultsProvider;
3435
this.client = client;
3536
this.jobManager = jobManager;
3637
}
@@ -41,7 +42,7 @@ protected void doExecute(Task task, GetCategoriesAction.Request request, ActionL
4142

4243
Integer from = request.getPageParams() != null ? request.getPageParams().getFrom() : null;
4344
Integer size = request.getPageParams() != null ? request.getPageParams().getSize() : null;
44-
jobProvider.categoryDefinitions(request.getJobId(), request.getCategoryId(), true, from, size,
45+
jobResultsProvider.categoryDefinitions(request.getJobId(), request.getCategoryId(), true, from, size,
4546
r -> listener.onResponse(new GetCategoriesAction.Response(r)), listener::onFailure, client);
4647
}
4748
}

0 commit comments

Comments
 (0)