From 89f269476464717df44f96bc654306130ce3e861 Mon Sep 17 00:00:00 2001
From: Kaushal Kumar <ravi.kaushal97@gmail.com>
Date: Tue, 14 May 2024 11:41:44 -0700
Subject: [PATCH] remove unrelated changes

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
---
 .../search/AbstractSearchAsyncAction.java     |  1 -
 .../action/search/SearchRequest.java          |  1 +
 .../action/search/SearchShardTask.java        |  1 -
 .../opensearch/action/search/SearchTask.java  |  1 -
 .../action/search/TransportSearchAction.java  |  6 +--
 .../opensearch/search/MultiTenantLabel.java   | 53 -------------------
 6 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 server/src/main/java/org/opensearch/search/MultiTenantLabel.java

diff --git a/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java b/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java
index 8ead4a500cc78..9bf4a4b1e18f1 100644
--- 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
index fe2f550a040db..4d3bb868b779a 100644
--- 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
index 21392fedb9cae..dfecf4f462c4d 100644
--- 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
index 23fda5eb93a56..d3c1043c50cce 100644
--- 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
index fceec5dd08404..143b01af3f62f 100644
--- 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
deleted file mode 100644
index 13234a7a3e662..0000000000000
--- a/server/src/main/java/org/opensearch/search/MultiTenantLabel.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- */
-
-package org.opensearch.search;
-
-import org.opensearch.core.common.io.stream.StreamInput;
-import org.opensearch.core.common.io.stream.StreamOutput;
-import org.opensearch.core.common.io.stream.Writeable;
-
-import java.io.IOException;
-import java.util.Locale;
-
-/**
- * Enum to hold all multitenant labels in workloads
- */
-public enum MultiTenantLabel implements Writeable {
-    // This label is basically used to define tenancy for multiple features e,g; Query Sandboxing, Query Insights
-    TENANT_LABEL("tenant_label");
-
-    private final String value;
-    MultiTenantLabel(String name) {
-        this.value = name;
-    }
-
-    public static MultiTenantLabel fromName(String name) {
-        switch (name.toLowerCase(Locale.ROOT)) {
-            // Other cases can be added for other keys in the ENUM
-            case "tenant_label":
-                return TENANT_LABEL;
-        }
-        throw new IllegalArgumentException("Illegal name + " + name);
-    }
-
-    public static MultiTenantLabel fromName(StreamInput in) throws IOException {
-        return fromName(in.readString());
-    }
-
-
-    /**
-     * Write this into the {@linkplain StreamOutput}.
-     *
-     * @param out
-     */
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        out.writeString(value);
-    }
-}