Revert "Adding re-writing of PIT id"

This reverts commit 68280cf.

Author: cbuescher

server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java

@@ -13,7 +13,6 @@
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
-import org.elasticsearch.TransportVersion;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.NoShardAvailableActionException;
 import org.elasticsearch.action.OriginalIndices;
@@ -94,7 +93,6 @@ abstract class AbstractSearchAsyncAction<Result extends SearchPhaseResult> exten
     private final Map<String, PendingExecutions> pendingExecutionsPerNode;
     private final AtomicBoolean requestCancelled = new AtomicBoolean();
     private final int skippedCount;
-    private final TransportVersion clusterMinTransportVersion;
 
     // protected for tests
     protected final SubscribableListener<Void> doneFuture = new SubscribableListener<>();
@@ -151,7 +149,6 @@ abstract class AbstractSearchAsyncAction<Result extends SearchPhaseResult> exten
         this.nodeIdToConnection = nodeIdToConnection;
         this.concreteIndexBoosts = concreteIndexBoosts;
         this.clusterStateVersion = clusterState.version();
-        this.clusterMinTransportVersion = clusterState.getMinTransportVersion();
         this.aliasFilter = aliasFilter;
         this.results = resultConsumer;
         // register the release of the query consumer to free up the circuit breaker memory
@@ -612,7 +609,7 @@ public void sendSearchResponse(SearchResponseSections internalSearchResponse, At
     protected BytesReference buildSearchContextId(ShardSearchFailure[] failures) {
         var source = request.source();
         return source != null && source.pointInTimeBuilder() != null && source.pointInTimeBuilder().singleSession() == false
-            ? SearchContextId.encode(results.getAtomicArray().asList(), aliasFilter, clusterMinTransportVersion, failures)
+            ? source.pointInTimeBuilder().getEncodedId()
             : null;
     }
 

server/src/main/java/org/elasticsearch/action/search/PITHelper.java

@@ -22,7 +22,7 @@
 
 public class PITHelper {
 
-    public static SearchContextId decodePITId(String id) throws IOException {
+    public static SearchContextId decodePITId(String id) {
         return decodePITId(new BytesArray(Base64.getUrlDecoder().decode(id)));
     }
 

server/src/main/java/org/elasticsearch/action/search/SearchContextId.java

@@ -40,7 +40,7 @@ public final class SearchContextId {
     private final Map<String, AliasFilter> aliasFilter;
     private final transient Set<ShardSearchContextId> contextIds;
 
-    public SearchContextId(Map<ShardId, SearchContextIdForNode> shards, Map<String, AliasFilter> aliasFilter) {
+    SearchContextId(Map<ShardId, SearchContextIdForNode> shards, Map<String, AliasFilter> aliasFilter) {
         this.shards = shards;
         this.aliasFilter = aliasFilter;
         this.contextIds = shards.values().stream().map(SearchContextIdForNode::getSearchContextId).collect(Collectors.toSet());
@@ -58,8 +58,8 @@ public boolean contains(ShardSearchContextId contextId) {
         return contextIds.contains(contextId);
     }
 
-    public static <SPR extends SearchPhaseResult> BytesReference encode(
-        List<SPR> searchPhaseResults,
+    public static BytesReference encode(
+        List<SearchPhaseResult> searchPhaseResults,
         Map<String, AliasFilter> aliasFilter,
         TransportVersion version,
         ShardSearchFailure[] shardFailures

server/src/main/java/org/elasticsearch/action/search/SearchContextIdForNode.java

@@ -31,7 +31,7 @@ public final class SearchContextIdForNode implements Writeable {
      * @param node The target node where the search context ID is defined, or {@code null} if the shard is missing or unavailable.
      * @param searchContextId The {@link ShardSearchContextId}, or {@code null} if the shard is missing or unavailable.
      */
-    public SearchContextIdForNode(@Nullable String clusterAlias, @Nullable String node, @Nullable ShardSearchContextId searchContextId) {
+    SearchContextIdForNode(@Nullable String clusterAlias, @Nullable String node, @Nullable ShardSearchContextId searchContextId) {
         this.node = node;
         this.clusterAlias = clusterAlias;
         this.searchContextId = searchContextId;

server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

@@ -1233,7 +1233,8 @@ static List<SearchShardIterator> getRemoteShardsIteratorFromPointInTime(
                     // Otherwise, we add the shard iterator without a target node, allowing a partial search failure to
                     // be thrown when a search phase attempts to access it.
                     targetNodes.add(perNode.getNode());
-                    // TODO we will need to adapt something here as well I think
+                    // TODO this looks like its on the cross-cluster search path, we will need to adapt the retry mechanism here as well I
+                    // think
                     if (perNode.getSearchContextId().getSearcherId() != null) {
                         for (String node : group.allocatedNodes()) {
                             if (node.equals(perNode.getNode()) == false) {

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

@@ -1259,7 +1259,9 @@ final ReaderContext createOrGetReaderContext(ShardSearchRequest request) {
                 if (searcherId == null) {
                     throw e;
                 }
-                // TODO this retries on context with same searcher id, currently offered in FrozenEngine and ReadonlyEngine
+                // TODO here we retry creating contexts on the same node if we can get a Searchwe with same searcher id as the original
+                // PIT context. That seems to currently only be working for FrozenEngine and ReadonlyEngine where the commitId is used
+                // as a searcher id
                 final IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex());
                 final IndexShard shard = indexService.getShard(request.shardId().id());
                 final Engine.SearcherSupplier searcherSupplier = shard.acquireSearcherSupplier();