Make ccsMinimizeRoundtrips nullable

Author: Mikep86

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, true),
+                searchService.getRewriteContext(timeProvider, resolvedIndices, null, null),
                 rewriteListener
             );
         }

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

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

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

@@ -72,7 +72,7 @@ public class QueryRewriteContext {
     private final ResolvedIndices resolvedIndices;
     private final PointInTimeBuilder pit;
     private QueryRewriteInterceptor queryRewriteInterceptor;
-    private final boolean ccsMinimizeRoundtrips;
+    private final Boolean ccsMinimizeRoundtrips;
     private final boolean isExplain;
 
     public QueryRewriteContext(
@@ -92,7 +92,7 @@ public QueryRewriteContext(
         final ResolvedIndices resolvedIndices,
         final PointInTimeBuilder pit,
         final QueryRewriteInterceptor queryRewriteInterceptor,
-        final boolean ccsMinimizeRoundtrips,
+        final Boolean ccsMinimizeRoundtrips,
         final boolean isExplain
     ) {
 
@@ -135,7 +135,7 @@ public QueryRewriteContext(final XContentParserConfiguration parserConfiguration
             null,
             null,
             null,
-            true,
+            null,
             false
         );
     }
@@ -147,7 +147,7 @@ public QueryRewriteContext(
         final ResolvedIndices resolvedIndices,
         final PointInTimeBuilder pit,
         final QueryRewriteInterceptor queryRewriteInterceptor,
-        final boolean ccsMinimizeRoundtrips
+        final Boolean ccsMinimizeRoundtrips
     ) {
         this(parserConfiguration, client, nowInMillis, resolvedIndices, pit, queryRewriteInterceptor, ccsMinimizeRoundtrips, false);
     }
@@ -159,7 +159,7 @@ public QueryRewriteContext(
         final ResolvedIndices resolvedIndices,
         final PointInTimeBuilder pit,
         final QueryRewriteInterceptor queryRewriteInterceptor,
-        final boolean ccsMinimizeRoundtrips,
+        final Boolean ccsMinimizeRoundtrips,
         final boolean isExplain
     ) {
         this(
@@ -286,7 +286,7 @@ public void setMapUnmappedFieldAsString(boolean mapUnmappedFieldAsString) {
         this.mapUnmappedFieldAsString = mapUnmappedFieldAsString;
     }
 
-    public boolean isCcsMinimizeRoundtrips() {
+    public Boolean isCcsMinimizeRoundtrips() {
         return ccsMinimizeRoundtrips;
     }
 

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

@@ -1849,7 +1849,7 @@ public QueryRewriteContext getRewriteContext(
         LongSupplier nowInMillis,
         ResolvedIndices resolvedIndices,
         PointInTimeBuilder pit,
-        final boolean ccsMinimizeRoundtrips,
+        final Boolean ccsMinimizeRoundtrips,
         final boolean isExplain
     ) {
         return new QueryRewriteContext(

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

@@ -2131,7 +2131,7 @@ public QueryRewriteContext getRewriteContext(
         LongSupplier nowInMillis,
         ResolvedIndices resolvedIndices,
         PointInTimeBuilder pit,
-        final boolean ccsMinimizeRoundtrips
+        final Boolean ccsMinimizeRoundtrips
     ) {
         return getRewriteContext(nowInMillis, resolvedIndices, pit, ccsMinimizeRoundtrips, false);
     }
@@ -2143,7 +2143,7 @@ public QueryRewriteContext getRewriteContext(
         LongSupplier nowInMillis,
         ResolvedIndices resolvedIndices,
         PointInTimeBuilder pit,
-        final boolean ccsMinimizeRoundtrips,
+        final Boolean ccsMinimizeRoundtrips,
         final boolean isExplain
     ) {
         return indicesService.getRewriteContext(nowInMillis, resolvedIndices, pit, ccsMinimizeRoundtrips, isExplain);

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

@@ -1785,7 +1785,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
 
             SearchService searchService = mock(SearchService.class);
             when(searchService.getRewriteContext(any(), any(), any(), anyBoolean(), anyBoolean())).thenReturn(
-                new QueryRewriteContext(null, null, null, null, null, null, true)
+                new QueryRewriteContext(null, null, null, null, null, null, null)
             );
             ClusterService clusterService = new ClusterService(
                 settings,

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, true);
+        return services.searchService().getRewriteContext(System::currentTimeMillis, resolvedIndices, null, null);
     }
 
     private static Set<String> indexNames(LogicalPlan plan) {