Use QueryCoordinatorContext for the rewrite in validate API. (#18272)

Signed-off-by: Bo Zhang <[email protected]>
Signed-off-by: Sarat Vemulapalli <[email protected]>
Co-authored-by: Sarat Vemulapalli <[email protected]>

Author: bzhangam

CHANGELOG.md

@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Support create mode in pull-based ingestion and add retries for transient failures ([#18250](https://github.com/opensearch-project/OpenSearch/pull/18250)))
 - Decouple the init of Crypto Plugin and KeyProvider in CryptoRegistry ([18270](https://github.com/opensearch-project/OpenSearch/pull18270)))
 - Support cluster write block in pull-based ingestion ([#18280](https://github.com/opensearch-project/OpenSearch/pull/18280)))
+- Use QueryCoordinatorContext for the rewrite in validate API. ([#18272](https://github.com/opensearch-project/OpenSearch/pull/18272))
 
 ### Changed
 

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

@@ -136,7 +136,7 @@ protected void doExecute(Task task, ValidateQueryRequest request, ActionListener
         if (request.query() == null) {
             rewriteListener.onResponse(request.query());
         } else {
-            Rewriteable.rewriteAndFetch(request.query(), searchService.getValidationRewriteContext(timeProvider), rewriteListener);
+            Rewriteable.rewriteAndFetch(request.query(), searchService.getValidationRewriteContext(timeProvider, request), rewriteListener);
         }
     }
 

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

@@ -1783,17 +1783,17 @@ private void rewriteAndFetchShardRequest(IndexShard shard, ShardSearchRequest re
     }
 
     /**
-     * Returns a new {@link QueryRewriteContext} with the given {@code now} provider
+     * Returns a new {@link QueryCoordinatorContext} with the given {@code now} provider and {@link IndicesRequest searchRequest}
      */
     public QueryRewriteContext getRewriteContext(LongSupplier nowInMillis, IndicesRequest searchRequest) {
         return new QueryCoordinatorContext(indicesService.getRewriteContext(nowInMillis), searchRequest);
     }
 
     /**
-     * Returns a new {@link QueryRewriteContext} for query validation with the given {@code now} provider
+     * Returns a new {@link QueryCoordinatorContext} with the given {@code now} provider and {@link IndicesRequest searchRequest}
      */
-    public QueryRewriteContext getValidationRewriteContext(LongSupplier nowInMillis) {
-        return indicesService.getValidationRewriteContext(nowInMillis);
+    public QueryRewriteContext getValidationRewriteContext(LongSupplier nowInMillis, IndicesRequest searchRequest) {
+        return new QueryCoordinatorContext(indicesService.getValidationRewriteContext(nowInMillis), searchRequest);
     }
 
     public IndicesService getIndicesService() {