Handle search with routing

Author: lkts

server/src/main/java/org/elasticsearch/cluster/routing/IndexRouting.java

@@ -269,7 +269,7 @@ protected int shardId(String id, @Nullable String routing) {
 
         @Override
         public void collectSearchShards(String routing, IntConsumer consumer) {
-            consumer.accept(hashToShardId(effectiveRoutingToHash(routing)));
+            consumer.accept(rerouteReadsIfResharding(hashToShardId(effectiveRoutingToHash(routing))));
         }
     }
 
@@ -297,7 +297,7 @@ protected int shardId(String id, @Nullable String routing) {
         public void collectSearchShards(String routing, IntConsumer consumer) {
             int hash = effectiveRoutingToHash(routing);
             for (int i = 0; i < routingPartitionSize; i++) {
-                consumer.accept(hashToShardId(hash + i));
+                consumer.accept(rerouteReadsIfResharding(hashToShardId(hash + i)));
             }
         }
     }

server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java

@@ -116,7 +116,7 @@ public List<ShardIterator> searchShards(
     }
 
     public Iterator<IndexShardRoutingTable> allWritableShards(ProjectState projectState, String index) {
-        return allShardsReadyForRefresh(projectState, index);
+        return allShardsReadyForWrites(projectState, index);
     }
 
     public static ShardIterator getShards(RoutingTable routingTable, ShardId shardId) {
@@ -179,10 +179,10 @@ private static Iterator<IndexShardRoutingTable> allShardsReadyForSearch(ProjectS
     }
 
     /**
-     * Returns an iterator of shards of the index that are ready to execute refresh requests.
+     * Returns an iterator of shards of the index that are ready to execute write requests.
      * A shard may not be ready to execute these operations during processes like resharding.
      */
-    private static Iterator<IndexShardRoutingTable> allShardsReadyForRefresh(ProjectState projectState, String index) {
+    private static Iterator<IndexShardRoutingTable> allShardsReadyForWrites(ProjectState projectState, String index) {
         return allShardsExceptSplitTargetsInStateBefore(projectState, index, IndexReshardingState.Split.TargetShardState.HANDOFF);
     }
 

server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java

@@ -51,7 +51,6 @@
 import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.index.search.NestedHelper;
 import org.elasticsearch.index.shard.IndexShard;
-import org.elasticsearch.index.shard.ShardSplittingQuery;
 import org.elasticsearch.search.aggregations.SearchContextAggregations;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -472,10 +471,6 @@ public Query buildFilteredQuery(Query query) {
             }
         }
 
-        var q = Queries.not(
-            new ShardSplittingQuery(indexService.getMetadata(), shardTarget.getShardId().getId(), nestedLookup != NestedLookup.EMPTY)
-        );
-
         if (filters.isEmpty()) {
             return query;
         } else {