Implementation of TransportIndicesResolvingAction removed from TransportMultiGetAction, TransportMultiSearchAction, TransportMultiTermVectorsAction.

Author: lukasz-soszynski-eliatra

server/src/main/java/org/opensearch/action/OriginalIndices.java

@@ -39,8 +39,6 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
 
 /**
  * Used to keep track of original indices within internal (e.g. shard level) requests
@@ -94,20 +92,4 @@ public static void writeOriginalIndices(OriginalIndices originalIndices, StreamO
     public String toString() {
         return "OriginalIndices{" + "indices=" + Arrays.toString(indices) + ", indicesOptions=" + indicesOptions + '}';
     }
-
-    public OriginalIndices mergeWith(OriginalIndices value) {
-        if(value == null) {
-            return this;
-        }
-        Set<String> set = new LinkedHashSet<>();
-        if (this.indices != null) {
-            java.util.Collections.addAll(set, this.indices);
-        }
-        if (value.indices != null) {
-            java.util.Collections.addAll(set, value.indices);
-        }
-        String[] newIndices = set.toArray(new String[0]);
-        IndicesOptions newOptions = this.indicesOptions.mergeWith(value.indicesOptions);
-        return new OriginalIndices(newIndices, newOptions);
-    }
 }

server/src/main/java/org/opensearch/action/get/TransportMultiGetAction.java

@@ -35,12 +35,10 @@
 import org.opensearch.action.RoutingMissingException;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.block.ClusterBlockLevel;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.metadata.Metadata;
-import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.cluster.routing.Preference;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
@@ -50,9 +48,7 @@
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -61,7 +57,7 @@
  *
  * @opensearch.internal
  */
-public class TransportMultiGetAction extends HandledTransportAction<MultiGetRequest, MultiGetResponse> implements TransportIndicesResolvingAction<MultiGetRequest> {
+public class TransportMultiGetAction extends HandledTransportAction<MultiGetRequest, MultiGetResponse> {
 
     private final ClusterService clusterService;
     private final TransportShardMultiGetAction shardAction;
@@ -178,24 +174,4 @@ private void finishHim() {
     private static MultiGetItemResponse newItemFailure(String index, String id, Exception exception) {
         return new MultiGetItemResponse(null, new MultiGetResponse.Failure(index, id, exception));
     }
-
-    @Override
-    public ResolvedIndices resolveIndices(MultiGetRequest request) {
-        // TODO do we need these preconditions?
-        ClusterState clusterState = clusterService.state();
-        clusterState.blocks().globalBlockedRaiseException(ClusterBlockLevel.READ);
-
-        List<String> indices = new ArrayList<>();
-
-        for (MultiGetRequest.Item item : request.items) {
-            try {
-                String concreteSingleIndex = indexNameExpressionResolver.concreteSingleIndex(clusterState, item).getName();
-                indices.add(concreteSingleIndex);
-            } catch (Exception e) {
-                // Multi get should not fail if one request is invalid
-            }
-
-        }
-        return ResolvedIndices.of(indices);
-    }
 }

server/src/main/java/org/opensearch/action/search/TransportMultiSearchAction.java

@@ -34,10 +34,8 @@
 
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.block.ClusterBlockLevel;
-import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.settings.Settings;
@@ -53,9 +51,6 @@
 import org.opensearch.transport.TransportService;
 import org.opensearch.transport.client.node.NodeClient;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
@@ -67,15 +62,13 @@
  *
  * @opensearch.internal
  */
-public class TransportMultiSearchAction extends HandledTransportAction<MultiSearchRequest, MultiSearchResponse> implements
-    TransportIndicesResolvingAction<MultiSearchRequest> {
+public class TransportMultiSearchAction extends HandledTransportAction<MultiSearchRequest, MultiSearchResponse> {
 
     private final int allocatedProcessors;
     private final ThreadPool threadPool;
     private final ClusterService clusterService;
     private final LongSupplier relativeTimeProvider;
     private final NodeClient client;
-    private final TransportSearchAction transportSearchAction;
 
     @Inject
     public TransportMultiSearchAction(
@@ -84,16 +77,14 @@ public TransportMultiSearchAction(
         TransportService transportService,
         ClusterService clusterService,
         ActionFilters actionFilters,
-        NodeClient client,
-        TransportSearchAction transportSearchAction
+        NodeClient client
     ) {
         super(MultiSearchAction.NAME, transportService, actionFilters, (Writeable.Reader<MultiSearchRequest>) MultiSearchRequest::new);
         this.threadPool = threadPool;
         this.clusterService = clusterService;
         this.allocatedProcessors = OpenSearchExecutors.allocatedProcessors(settings);
         this.relativeTimeProvider = System::nanoTime;
         this.client = client;
-        this.transportSearchAction = transportSearchAction;
     }
 
     TransportMultiSearchAction(
@@ -103,16 +94,14 @@ public TransportMultiSearchAction(
         ClusterService clusterService,
         int allocatedProcessors,
         LongSupplier relativeTimeProvider,
-        NodeClient client,
-        TransportSearchAction transportSearchAction
+        NodeClient client
     ) {
         super(MultiSearchAction.NAME, transportService, actionFilters, (Writeable.Reader<MultiSearchRequest>) MultiSearchRequest::new);
         this.threadPool = threadPool;
         this.clusterService = clusterService;
         this.allocatedProcessors = allocatedProcessors;
         this.relativeTimeProvider = relativeTimeProvider;
         this.client = client;
-        this.transportSearchAction = transportSearchAction;
     }
 
     @Override
@@ -255,17 +244,6 @@ private boolean isCancelled(TaskId taskId) {
         return false;
     }
 
-    @Override
-    public ResolvedIndices resolveIndices(MultiSearchRequest request) {
-        List<SearchRequest> requests = request.requests();
-        List<ResolvedIndices> resolvedIndicesList = new ArrayList<>();
-        for(SearchRequest searchRequest : requests) {
-            ResolvedIndices resolvedIndices = transportSearchAction.resolveIndices(searchRequest);
-            resolvedIndicesList.add(resolvedIndices);
-        }
-        return resolvedIndicesList.stream().reduce(ResolvedIndices.of(Collections.emptySet()), ResolvedIndices::add);
-    }
-
     /**
      * Slots a search request
      *

server/src/main/java/org/opensearch/action/support/IndicesOptions.java

@@ -654,14 +654,6 @@ public static IndicesOptions lenientExpandHidden() {
         return LENIENT_EXPAND_OPEN_CLOSED_HIDDEN;
     }
 
-    public IndicesOptions mergeWith(IndicesOptions indicesOptions) {
-        EnumSet<Option> newOptions = EnumSet.copyOf(this.options);
-        EnumSet<WildcardStates> newExpandWildcards = EnumSet.copyOf(this.expandWildcards);
-        newOptions.addAll(indicesOptions.options);
-        newExpandWildcards.addAll(indicesOptions.expandWildcards);
-        return new IndicesOptions(newOptions, newExpandWildcards);
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {

server/src/main/java/org/opensearch/action/termvectors/TransportMultiTermVectorsAction.java

@@ -35,11 +35,9 @@
 import org.opensearch.action.RoutingMissingException;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.block.ClusterBlockLevel;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
-import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.util.concurrent.AtomicArray;
@@ -49,9 +47,7 @@
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -60,8 +56,7 @@
  *
  * @opensearch.internal
  */
-public class TransportMultiTermVectorsAction extends HandledTransportAction<MultiTermVectorsRequest, MultiTermVectorsResponse> implements
-    TransportIndicesResolvingAction<MultiTermVectorsRequest> {
+public class TransportMultiTermVectorsAction extends HandledTransportAction<MultiTermVectorsRequest, MultiTermVectorsResponse> {
 
     private final ClusterService clusterService;
     private final TransportShardMultiTermsVectorAction shardAction;
@@ -191,27 +186,4 @@ private void finishHim() {
             });
         }
     }
-
-    @Override
-    public ResolvedIndices resolveIndices(MultiTermVectorsRequest request) {
-        ClusterState clusterState = clusterService.state();
-        clusterState.blocks().globalBlockedRaiseException(ClusterBlockLevel.READ);
-        List<String> indices = new ArrayList<>();
-
-
-        Map<ShardId, MultiTermVectorsShardRequest> shardRequests = new HashMap<>();
-        for (int i = 0; i < request.requests.size(); i++) {
-            TermVectorsRequest termVectorsRequest = request.requests.get(i);
-            String routing = clusterState.metadata().resolveIndexRouting(termVectorsRequest.routing(), termVectorsRequest.index());
-            if (!clusterState.metadata().hasConcreteIndex(termVectorsRequest.index())) {
-                continue;
-            }
-            String concreteSingleIndex = indexNameExpressionResolver.concreteSingleIndex(clusterState, termVectorsRequest).getName();
-            if (routing == null && clusterState.getMetadata().routingRequired(concreteSingleIndex)) {
-                continue;
-            }
-            indices.add(concreteSingleIndex);
-        }
-        return ResolvedIndices.of(indices);
-    }
 }

server/src/main/java/org/opensearch/cluster/metadata/ResolvedIndices.java

@@ -71,9 +71,7 @@ public static ResolvedIndices ofNonNull(String... indices) {
         return new ResolvedIndices(new Local(Collections.unmodifiableSet(indexSet), null, false), Collections.emptyMap());
     }
 
-    private static final Local LOCAL_ALL = new Local(Set.of(Metadata.ALL), null, true);
-    private static final ResolvedIndices ALL = new ResolvedIndices(LOCAL_ALL, Collections.emptyMap());
-
+    private static final ResolvedIndices ALL = new ResolvedIndices(new Local(Set.of(Metadata.ALL), null, true), Collections.emptyMap());
 
     private final Local local;
     private final Map<String, OriginalIndices> remote;
@@ -83,37 +81,6 @@ private ResolvedIndices(Local local, Map<String, OriginalIndices> remote) {
         this.remote = remote;
     }
 
-    private ResolvedIndices addLocal(Local local) {
-        if(local == null || local().isEmpty()) {
-            return this;
-        }
-        return new ResolvedIndices(this.local.addLocal(local), this.remote);
-    }
-
-    private ResolvedIndices addRemote(Map<String, OriginalIndices> remote) {
-        if(remote == null || remote.isEmpty()) {
-            return this;
-        }
-        Map<String, OriginalIndices> newRemote = new HashMap<>(this.remote);
-        for(Map.Entry<String, OriginalIndices> entry : remote.entrySet()) {
-            if (newRemote.containsKey(entry.getKey())) {
-                OriginalIndices originalIndices = newRemote.get(entry.getKey());
-                OriginalIndices newOriginalIndices = originalIndices.mergeWith(entry.getValue());
-                newRemote.put(entry.getKey(), newOriginalIndices);
-            } else {
-                newRemote.put(entry.getKey(), entry.getValue());
-            }
-        }
-        return new ResolvedIndices(this.local, Collections.unmodifiableMap(newRemote));
-    }
-
-    public ResolvedIndices add(ResolvedIndices other) {
-        if (other == null || other.isEmpty()) {
-            return this;
-        }
-        return this.addLocal(other.local).addRemote(other.remote);
-    }
-
     public Local local() {
         return this.local;
     }
@@ -182,19 +149,6 @@ public boolean contains(String index) {
                 return this.names.contains(index);
             }
         }
-
-        public Local addLocal(Local local) {
-            if(this.isAll) {
-                return this;
-            }
-            if(local.isAll) {
-                return local;
-            }
-            Set<String> namesSum = new HashSet<>(this.names);
-            namesSum.addAll(local.names);
-            OriginalIndices newOriginalIndices = this.originalIndices == null ? local.originalIndices : this.originalIndices.mergeWith(local.originalIndices);
-            return new Local(Collections.unmodifiableSet(namesSum), newOriginalIndices, isAll);
-        }
     }
 
 }