remove unrelated changes

Signed-off-by: Kaushal Kumar <[email protected]>
opensearch-project · May 14, 2024 · 89f2694 · 89f2694
1 parent 80bd755
commit 89f2694
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 60 deletions.
diff --git a/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java b/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java
@@ -841,7 +841,6 @@ public final ShardSearchRequest buildShardSearchRequest(SearchShardIterator shar
         // than creating an empty response in the search thread pool.
         // Note that, we have to disable this shortcut for queries that create a context (scroll and search context).
         shardRequest.canReturnNullResponseIfMatchNoDocs(hasShardResponse.get() && shardRequest.scroll() == null);
-
         return shardRequest;
     }
 

diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequest.java b/server/src/main/java/org/opensearch/action/search/SearchRequest.java
@@ -710,6 +710,7 @@ public SearchRequest pipeline(String pipeline) {
     public String pipeline() {
         return pipeline;
     }
+
     @Override
     public SearchTask createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
         return new SearchTask(id, type, action, this::buildDescription, parentTaskId, headers, cancelAfterTimeInterval);

diff --git a/server/src/main/java/org/opensearch/action/search/SearchShardTask.java b/server/src/main/java/org/opensearch/action/search/SearchShardTask.java
@@ -53,7 +53,6 @@
 public class SearchShardTask extends CancellableTask implements SearchBackpressureTask {
     // generating metadata in a lazy way since source can be quite big
     private final MemoizedSupplier<String> metadataSupplier;
-    private String resourceLimitGroupId;
 
     public SearchShardTask(long id, String type, String action, String description, TaskId parentTaskId, Map<String, String> headers) {
         this(id, type, action, description, parentTaskId, headers, () -> "");

diff --git a/server/src/main/java/org/opensearch/action/search/SearchTask.java b/server/src/main/java/org/opensearch/action/search/SearchTask.java
@@ -53,7 +53,6 @@ public class SearchTask extends CancellableTask implements SearchBackpressureTas
     // generating description in a lazy way since source can be quite big
     private final Supplier<String> descriptionSupplier;
     private SearchProgressListener progressListener = SearchProgressListener.NOOP;
-    private String resourceLimitGroupId;
 
     public SearchTask(
         long id,

diff --git a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
@@ -72,7 +72,6 @@
 import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.core.tasks.TaskId;
 import org.opensearch.index.query.Rewriteable;
-import org.opensearch.search.MultiTenantLabel;
 import org.opensearch.search.SearchPhaseResult;
 import org.opensearch.search.SearchService;
 import org.opensearch.search.SearchShardTarget;
@@ -123,7 +122,8 @@
 import java.util.stream.StreamSupport;
 
 import static org.opensearch.action.admin.cluster.node.tasks.get.GetTaskAction.TASKS_ORIGIN;
-import static org.opensearch.action.search.SearchType.*;
+import static org.opensearch.action.search.SearchType.DFS_QUERY_THEN_FETCH;
+import static org.opensearch.action.search.SearchType.QUERY_THEN_FETCH;
 import static org.opensearch.search.sort.FieldSortBuilder.hasPrimaryFieldSort;
 
 /**
@@ -166,7 +166,6 @@ public class TransportSearchAction extends HandledTransportAction<SearchRequest,
         Setting.Property.Dynamic,
         Setting.Property.NodeScope
     );
-    public static final String NOT_PROVIDED = "NOT_PROVIDED";
 
     private final NodeClient client;
     private final ThreadPool threadPool;
@@ -1105,7 +1104,6 @@ private void executeSearch(
             concreteLocalIndices,
             localShardIterators.size() + remoteShardIterators.size()
         );
-
         searchAsyncActionProvider.asyncSearchAction(
             task,
             searchRequest,

diff --git a/server/src/main/java/org/opensearch/search/MultiTenantLabel.java b/server/src/main/java/org/opensearch/search/MultiTenantLabel.java