Semantic text - CCS POC - DO NOT MERGE

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -365,6 +365,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ESQL_LOOKUP_JOIN_ON_MANY_FIELDS = def(9_139_0_00);
     public static final TransportVersion SIMULATE_INGEST_EFFECTIVE_MAPPING = def(9_140_0_00);
     public static final TransportVersion RESOLVE_INDEX_MODE_ADDED = def(9_141_0_00);
+    public static final TransportVersion SEMANTIC_QUERY_MULTIPLE_INFERENCE_IDS = def(9_142_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java

@@ -130,7 +130,7 @@ protected void doExecute(Task task, ValidateQueryRequest request, ActionListener
         } else {
             Rewriteable.rewriteAndFetch(
                 request.query(),
-                searchService.getRewriteContext(timeProvider, resolvedIndices, null),
+                searchService.getRewriteContext(timeProvider, resolvedIndices, null, null),
                 rewriteListener
             );
         }

server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java

@@ -103,7 +103,11 @@ protected void doExecute(Task task, ExplainRequest request, ActionListener<Expla
 
         assert request.query() != null;
         LongSupplier timeProvider = () -> request.nowInMillis;
-        Rewriteable.rewriteAndFetch(request.query(), searchService.getRewriteContext(timeProvider, resolvedIndices, null), rewriteListener);
+        Rewriteable.rewriteAndFetch(
+            request.query(),
+            searchService.getRewriteContext(timeProvider, resolvedIndices, null, null),
+            rewriteListener
+        );
     }
 
     @Override

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

@@ -552,6 +552,7 @@ public void onFailure(Exception e) {
                     timeProvider::absoluteStartMillis,
                     resolvedIndices,
                     original.pointInTimeBuilder(),
+                    shouldMinimizeRoundtrips(original),
                     isExplain
                 ),
                 rewriteListener
@@ -787,6 +788,7 @@ public void onFailure(Exception e) {
                 String clusterAlias = entry.getKey();
                 boolean skipUnavailable = remoteClusterService.isSkipUnavailable(clusterAlias);
                 OriginalIndices indices = entry.getValue();
+
                 SearchRequest ccsSearchRequest = SearchRequest.subSearchRequest(
                     parentTaskId,
                     searchRequest,

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

@@ -127,7 +127,7 @@ public void searchShards(Task task, SearchShardsRequest searchShardsRequest, Act
 
         Rewriteable.rewriteAndFetch(
             original,
-            searchService.getRewriteContext(timeProvider::absoluteStartMillis, resolvedIndices, null),
+            searchService.getRewriteContext(timeProvider::absoluteStartMillis, resolvedIndices, null, original.isCcsMinimizeRoundtrips()),
             listener.delegateFailureAndWrap((delegate, searchRequest) -> {
                 Index[] concreteIndices = resolvedIndices.getConcreteLocalIndices();
                 final Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressions(

server/src/main/java/org/elasticsearch/index/IndexService.java

@@ -836,6 +836,7 @@ public QueryRewriteContext newQueryRewriteContext(
             null,
             null,
             null,
+            null,
             false
         );
     }

server/src/main/java/org/elasticsearch/index/query/CoordinatorRewriteContext.java

@@ -120,6 +120,7 @@ public CoordinatorRewriteContext(
             null,
             null,
             null,
+            null,
             false
         );
         this.dateFieldRangeInfo = dateFieldRangeInfo;

server/src/main/java/org/elasticsearch/index/query/InterceptedQueryBuilderWrapper.java

@@ -98,8 +98,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o instanceof InterceptedQueryBuilderWrapper == false) return false;
-        return Objects.equals(queryBuilder, ((InterceptedQueryBuilderWrapper) o).queryBuilder);
+        if (o == null || getClass() != o.getClass()) return false;
+        InterceptedQueryBuilderWrapper that = (InterceptedQueryBuilderWrapper) o;
+        return Objects.equals(queryBuilder, that.queryBuilder);
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java

@@ -72,6 +72,7 @@ public class QueryRewriteContext {
     private final ResolvedIndices resolvedIndices;
     private final PointInTimeBuilder pit;
     private QueryRewriteInterceptor queryRewriteInterceptor;
+    private final Boolean ccsMinimizeRoundtrips;
     private final boolean isExplain;
 
     public QueryRewriteContext(
@@ -91,6 +92,7 @@ public QueryRewriteContext(
         final ResolvedIndices resolvedIndices,
         final PointInTimeBuilder pit,
         final QueryRewriteInterceptor queryRewriteInterceptor,
+        final Boolean ccsMinimizeRoundtrips,
         final boolean isExplain
     ) {
 
@@ -111,6 +113,7 @@ public QueryRewriteContext(
         this.resolvedIndices = resolvedIndices;
         this.pit = pit;
         this.queryRewriteInterceptor = queryRewriteInterceptor;
+        this.ccsMinimizeRoundtrips = ccsMinimizeRoundtrips;
         this.isExplain = isExplain;
     }
 
@@ -132,6 +135,7 @@ public QueryRewriteContext(final XContentParserConfiguration parserConfiguration
             null,
             null,
             null,
+            null,
             false
         );
     }
@@ -142,9 +146,10 @@ public QueryRewriteContext(
         final LongSupplier nowInMillis,
         final ResolvedIndices resolvedIndices,
         final PointInTimeBuilder pit,
-        final QueryRewriteInterceptor queryRewriteInterceptor
+        final QueryRewriteInterceptor queryRewriteInterceptor,
+        final Boolean ccsMinimizeRoundtrips
     ) {
-        this(parserConfiguration, client, nowInMillis, resolvedIndices, pit, queryRewriteInterceptor, false);
+        this(parserConfiguration, client, nowInMillis, resolvedIndices, pit, queryRewriteInterceptor, ccsMinimizeRoundtrips, false);
     }
 
     public QueryRewriteContext(
@@ -154,6 +159,7 @@ public QueryRewriteContext(
         final ResolvedIndices resolvedIndices,
         final PointInTimeBuilder pit,
         final QueryRewriteInterceptor queryRewriteInterceptor,
+        final Boolean ccsMinimizeRoundtrips,
         final boolean isExplain
     ) {
         this(
@@ -173,6 +179,7 @@ public QueryRewriteContext(
             resolvedIndices,
             pit,
             queryRewriteInterceptor,
+            ccsMinimizeRoundtrips,
             isExplain
         );
     }
@@ -279,6 +286,10 @@ public void setMapUnmappedFieldAsString(boolean mapUnmappedFieldAsString) {
         this.mapUnmappedFieldAsString = mapUnmappedFieldAsString;
     }
 
+    public Boolean isCcsMinimizeRoundtrips() {
+        return ccsMinimizeRoundtrips;
+    }
+
     public boolean isExplain() {
         return this.isExplain;
     }

server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java

@@ -276,6 +276,7 @@ private SearchExecutionContext(
             null,
             null,
             null,
+            null,
             false
         );
         this.shardId = shardId;

server/src/main/java/org/elasticsearch/indices/IndicesService.java

@@ -1849,9 +1849,19 @@ public QueryRewriteContext getRewriteContext(
         LongSupplier nowInMillis,
         ResolvedIndices resolvedIndices,
         PointInTimeBuilder pit,
+        final Boolean ccsMinimizeRoundtrips,
         final boolean isExplain
     ) {
-        return new QueryRewriteContext(parserConfig, client, nowInMillis, resolvedIndices, pit, queryRewriteInterceptor, isExplain);
+        return new QueryRewriteContext(
+            parserConfig,
+            client,
+            nowInMillis,
+            resolvedIndices,
+            pit,
+            queryRewriteInterceptor,
+            ccsMinimizeRoundtrips,
+            isExplain
+        );
     }
 
     public DataRewriteContext getDataRewriteContext(LongSupplier nowInMillis) {

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

@@ -2127,8 +2127,13 @@ private void rewriteAndFetchShardRequest(IndexShard shard, ShardSearchRequest re
     /**
      * Returns a new {@link QueryRewriteContext} with the given {@code now} provider
      */
-    public QueryRewriteContext getRewriteContext(LongSupplier nowInMillis, ResolvedIndices resolvedIndices, PointInTimeBuilder pit) {
-        return getRewriteContext(nowInMillis, resolvedIndices, pit, false);
+    public QueryRewriteContext getRewriteContext(
+        LongSupplier nowInMillis,
+        ResolvedIndices resolvedIndices,
+        PointInTimeBuilder pit,
+        final Boolean ccsMinimizeRoundtrips
+    ) {
+        return getRewriteContext(nowInMillis, resolvedIndices, pit, ccsMinimizeRoundtrips, false);
     }
 
     /**
@@ -2138,9 +2143,10 @@ public QueryRewriteContext getRewriteContext(
         LongSupplier nowInMillis,
         ResolvedIndices resolvedIndices,
         PointInTimeBuilder pit,
+        final Boolean ccsMinimizeRoundtrips,
         final boolean isExplain
     ) {
-        return indicesService.getRewriteContext(nowInMillis, resolvedIndices, pit, isExplain);
+        return indicesService.getRewriteContext(nowInMillis, resolvedIndices, pit, ccsMinimizeRoundtrips, isExplain);
     }
 
     public CoordinatorRewriteContextProvider getCoordinatorRewriteContextProvider(LongSupplier nowInMillis) {

server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java

@@ -1784,8 +1784,8 @@ protected void doWriteTo(StreamOutput out) throws IOException {
             NodeClient client = new NodeClient(settings, threadPool, TestProjectResolvers.alwaysThrow());
 
             SearchService searchService = mock(SearchService.class);
-            when(searchService.getRewriteContext(any(), any(), any(), anyBoolean())).thenReturn(
-                new QueryRewriteContext(null, null, null, null, null, null)
+            when(searchService.getRewriteContext(any(), any(), any(), anyBoolean(), anyBoolean())).thenReturn(
+                new QueryRewriteContext(null, null, null, null, null, null, null)
             );
             ClusterService clusterService = new ClusterService(
                 settings,

server/src/test/java/org/elasticsearch/index/query/QueryRewriteContextTests.java

@@ -54,6 +54,7 @@ public void testGetTierPreference() {
                 null,
                 null,
                 null,
+                null,
                 false
             );
 
@@ -83,6 +84,7 @@ public void testGetTierPreference() {
                 null,
                 null,
                 null,
+                null,
                 false
             );
 

test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java

@@ -637,6 +637,7 @@ QueryRewriteContext createQueryRewriteContext() {
                 createMockResolvedIndices(),
                 null,
                 createMockQueryRewriteInterceptor(),
+                null,
                 false
             );
         }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/QueryBuilderResolver.java

@@ -61,7 +61,7 @@ private static QueryRewriteContext queryRewriteContext(TransportActionServices s
             System.currentTimeMillis()
         );
 
-        return services.searchService().getRewriteContext(System::currentTimeMillis, resolvedIndices, null);
+        return services.searchService().getRewriteContext(System::currentTimeMillis, resolvedIndices, null, null);
     }
 
     private static Set<String> indexNames(LogicalPlan plan) {