PR feedback: rename acquireSearcherSupplier

Call the variant that takes a splitShardCountSummary acquireExternalSearcherSupplier.

Author: bcully

server/src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -1713,7 +1713,14 @@ public Engine.SearcherSupplier acquireSearcherSupplier() {
         return acquireSearcherSupplier(Engine.SearcherScope.EXTERNAL);
     }
 
-    public Engine.SearcherSupplier acquireSearcherSupplier(SplitShardCountSummary splitShardCountSummary) {
+    /**
+     * Acquires a point-in-time reader that can be used to create {@link Engine.Searcher}s on demand.
+     * The supplier is aware of shard splits and will filter documents that have been moved to other shards
+     * according to the provided {@link SplitShardCountSummary}.
+     * @param splitShardCountSummary a summary of the shard routing state seen when the search request was created
+     * @return a searcher supplier
+     */
+    public Engine.SearcherSupplier acquireExternalSearcherSupplier(SplitShardCountSummary splitShardCountSummary) {
         return acquireSearcherSupplier(Engine.SearcherScope.EXTERNAL, splitShardCountSummary);
     }
 

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

@@ -1272,7 +1272,7 @@ final ReaderContext createOrGetReaderContext(ShardSearchRequest request) {
                 // calculated from the ids of the underlying segments of an index commit
                 final IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex());
                 final IndexShard shard = indexService.getShard(request.shardId().id());
-                final Engine.SearcherSupplier searcherSupplier = shard.acquireSearcherSupplier(request.getSplitShardCountSummary());
+                final Engine.SearcherSupplier searcherSupplier = shard.acquireExternalSearcherSupplier(request.getSplitShardCountSummary());
                 if (contextId.sameSearcherIdsAs(searcherSupplier.getSearcherId()) == false) {
                     searcherSupplier.close();
                     throw e;
@@ -1300,7 +1300,7 @@ final ReaderContext createOrGetReaderContext(ShardSearchRequest request) {
             request,
             indexService,
             shard,
-            shard.acquireSearcherSupplier(request.getSplitShardCountSummary()),
+            shard.acquireExternalSearcherSupplier(request.getSplitShardCountSummary()),
             keepAliveInMillis
         );
     }
@@ -1454,7 +1454,7 @@ protected SearchContext createContext(
     public SearchContext createSearchContext(ShardSearchRequest request, TimeValue timeout) throws IOException {
         final IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex());
         final IndexShard indexShard = indexService.getShard(request.shardId().getId());
-        final Engine.SearcherSupplier reader = indexShard.acquireSearcherSupplier(request.getSplitShardCountSummary());
+        final Engine.SearcherSupplier reader = indexShard.acquireExternalSearcherSupplier(request.getSplitShardCountSummary());
         final ShardSearchContextId id = new ShardSearchContextId(sessionId, idGenerator.incrementAndGet(), reader.getSearcherId());
         try (ReaderContext readerContext = new ReaderContext(id, indexService, indexShard, reader, -1L, true)) {
             // Use ResultsType.QUERY so that the created search context can execute queries correctly.