[7.x] [ML] Remove unnecessary call to get datafeed stats in preview (#65660) (#65662)

Author: davidkyle

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

@@ -20,13 +20,13 @@
 import org.elasticsearch.xpack.core.ml.action.PreviewDatafeedAction;
 import org.elasticsearch.xpack.core.ml.datafeed.ChunkingConfig;
 import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig;
+import org.elasticsearch.xpack.core.ml.datafeed.DatafeedTimingStats;
 import org.elasticsearch.xpack.core.ml.datafeed.extractor.DataExtractor;
 import org.elasticsearch.xpack.core.security.SecurityContext;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedTimingStatsReporter;
 import org.elasticsearch.xpack.ml.datafeed.extractor.DataExtractorFactory;
 import org.elasticsearch.xpack.ml.datafeed.persistence.DatafeedConfigProvider;
 import org.elasticsearch.xpack.ml.job.persistence.JobConfigProvider;
-import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -44,21 +44,19 @@ public class TransportPreviewDatafeedAction extends HandledTransportAction<Previ
     private final Client client;
     private final JobConfigProvider jobConfigProvider;
     private final DatafeedConfigProvider datafeedConfigProvider;
-    private final JobResultsProvider jobResultsProvider;
     private final NamedXContentRegistry xContentRegistry;
     private final SecurityContext securityContext;
 
     @Inject
     public TransportPreviewDatafeedAction(Settings settings, ThreadPool threadPool, TransportService transportService,
                                           ActionFilters actionFilters, Client client, JobConfigProvider jobConfigProvider,
-                                          DatafeedConfigProvider datafeedConfigProvider, JobResultsProvider jobResultsProvider,
+                                          DatafeedConfigProvider datafeedConfigProvider,
                                           NamedXContentRegistry xContentRegistry) {
         super(PreviewDatafeedAction.NAME, transportService, actionFilters, PreviewDatafeedAction.Request::new);
         this.threadPool = threadPool;
         this.client = client;
         this.jobConfigProvider = jobConfigProvider;
         this.datafeedConfigProvider = datafeedConfigProvider;
-        this.jobResultsProvider = jobResultsProvider;
         this.xContentRegistry = xContentRegistry;
         this.securityContext = XPackSettings.SECURITY_ENABLED.get(settings) ?
             new SecurityContext(settings, threadPool.getThreadContext()) : null;
@@ -74,33 +72,30 @@ protected void doExecute(Task task, PreviewDatafeedAction.Request request, Actio
                         DatafeedConfig.Builder previewDatafeed = buildPreviewDatafeed(datafeedConfig);
                         useSecondaryAuthIfAvailable(securityContext, () -> {
                             previewDatafeed.setHeaders(filterSecurityHeaders(threadPool.getThreadContext().getHeaders()));
-                            jobResultsProvider.datafeedTimingStats(
-                                jobBuilder.getId(),
-                                timingStats -> {
-                                    // NB: this is using the client from the transport layer, NOT the internal client.
-                                    // This is important because it means the datafeed search will fail if the user
-                                    // requesting the preview doesn't have permission to search the relevant indices.
-                                    DataExtractorFactory.create(
-                                        client,
-                                        previewDatafeed.build(),
-                                        jobBuilder.build(),
-                                        xContentRegistry,
-                                        // Fake DatafeedTimingStatsReporter that does not have access to results index
-                                        new DatafeedTimingStatsReporter(timingStats, (ts, refreshPolicy) -> {}),
-                                        new ActionListener<DataExtractorFactory>() {
-                                            @Override
-                                            public void onResponse(DataExtractorFactory dataExtractorFactory) {
-                                                DataExtractor dataExtractor = dataExtractorFactory.newExtractor(0, Long.MAX_VALUE);
-                                                threadPool.generic().execute(() -> previewDatafeed(dataExtractor, listener));
-                                            }
 
-                                            @Override
-                                            public void onFailure(Exception e) {
-                                                listener.onFailure(e);
-                                            }
-                                        });
-                                },
-                                listener::onFailure);
+                            // NB: this is using the client from the transport layer, NOT the internal client.
+                            // This is important because it means the datafeed search will fail if the user
+                            // requesting the preview doesn't have permission to search the relevant indices.
+                            DataExtractorFactory.create(
+                                client,
+                                previewDatafeed.build(),
+                                jobBuilder.build(),
+                                xContentRegistry,
+                                // Fake DatafeedTimingStatsReporter that does not have access to results index
+                                new DatafeedTimingStatsReporter(new DatafeedTimingStats(datafeedConfig.getJobId()), (ts, refreshPolicy) -> {
+                                }),
+                                new ActionListener<DataExtractorFactory>() {
+                                    @Override
+                                    public void onResponse(DataExtractorFactory dataExtractorFactory) {
+                                        DataExtractor dataExtractor = dataExtractorFactory.newExtractor(0, Long.MAX_VALUE);
+                                        threadPool.generic().execute(() -> previewDatafeed(dataExtractor, listener));
+                                    }
+
+                                    @Override
+                                    public void onFailure(Exception e) {
+                                        listener.onFailure(e);
+                                    }
+                                });
                         });
                     },
                     listener::onFailure));
@@ -143,7 +138,7 @@ static void previewDatafeed(DataExtractor dataExtractor, ActionListener<PreviewD
             }
             responseBuilder.append("]");
             listener.onResponse(new PreviewDatafeedAction.Response(
-                    new BytesArray(responseBuilder.toString().getBytes(StandardCharsets.UTF_8))));
+                new BytesArray(responseBuilder.toString().getBytes(StandardCharsets.UTF_8))));
         } catch (Exception e) {
             listener.onFailure(e);
         } finally {

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportPreviewDatafeedActionTests.java

@@ -52,7 +52,7 @@ public void setUpTests() {
 
         doAnswer(new Answer<Void>() {
             @Override
-            public Void answer(InvocationOnMock invocationOnMock) throws Throwable {
+            public Void answer(InvocationOnMock invocationOnMock) {
                 PreviewDatafeedAction.Response response = (PreviewDatafeedAction.Response) invocationOnMock.getArguments()[0];
                 capturedResponse = response.toString();
                 return null;
@@ -61,7 +61,7 @@ public Void answer(InvocationOnMock invocationOnMock) throws Throwable {
 
         doAnswer(new Answer<Void>() {
             @Override
-            public Void answer(InvocationOnMock invocationOnMock) throws Throwable {
+            public Void answer(InvocationOnMock invocationOnMock) {
                 capturedFailure = (Exception) invocationOnMock.getArguments()[0];
                 return null;
             }