Resolving conflicts

Signed-off-by: Bharathwaj G <[email protected]>
opensearch-project · Jul 19, 2022 · 41d342d · 41d342d
2 parents ab3f0d4 + 55eb86d
commit 41d342d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/server/src/main/java/org/opensearch/action/search/TransportCreatePitAction.java b/server/src/main/java/org/opensearch/action/search/TransportCreatePitAction.java
@@ -66,13 +66,6 @@ public TransportCreatePitAction(
 
     @Override
     protected void doExecute(Task task, CreatePitRequest request, ActionListener<CreatePitResponse> listener) {
-        CreatePitController controller = new CreatePitController(
-            searchTransportService,
-            clusterService,
-            transportSearchAction,
-            namedWriteableRegistry,
-            pitService
-        );
         final StepListener<SearchResponse> createPitListener = new StepListener<>();
         final ActionListener<CreatePitResponse> updatePitIdListener = ActionListener.wrap(r -> listener.onResponse(r), e -> {
             logger.error(

diff --git a/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java b/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java
@@ -435,7 +435,10 @@ protected Engine.Searcher acquireSearcherInternal(String source) {
             when(sliceBuilder.getMax()).thenReturn(numSlicesForPit);
             context5.sliceBuilder(sliceBuilder);
 
-            OpenSearchRejectedExecutionException exception1 = expectThrows(OpenSearchRejectedExecutionException.class, () -> context5.preProcess(false));
+            OpenSearchRejectedExecutionException exception1 = expectThrows(
+                OpenSearchRejectedExecutionException.class,
+                () -> context5.preProcess(false)
+            );
             assertThat(
                 exception1.getMessage(),
                 equalTo(

diff --git a/server/src/test/java/org/opensearch/search/SearchServiceTests.java b/server/src/test/java/org/opensearch/search/SearchServiceTests.java
@@ -40,7 +40,17 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.action.index.IndexResponse;
-import org.opensearch.action.search.*;
+import org.opensearch.action.search.ClearScrollRequest;
+import org.opensearch.action.search.DeletePitResponse;
+import org.opensearch.action.search.PitSearchContextIdForNode;
+import org.opensearch.action.search.SearchContextIdForNode;
+import org.opensearch.action.search.SearchPhaseExecutionException;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.search.SearchShardTask;
+import org.opensearch.action.search.SearchType;
+import org.opensearch.action.search.UpdatePitContextRequest;
+import org.opensearch.action.search.UpdatePitContextResponse;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.action.support.WriteRequest;