Add plumbing to check cluster features in SearchSourceBuilder

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustachePlugin.java

@@ -67,7 +67,7 @@ public List<RestHandler> getRestHandlers(
  Predicate<NodeFeature> clusterSupportsFeature
  ) {
  return Arrays.asList(
- new RestSearchTemplateAction(namedWriteableRegistry),
+ new RestSearchTemplateAction(namedWriteableRegistry, clusterSupportsFeature),
  new RestMultiSearchTemplateAction(settings),
  new RestRenderSearchTemplateAction()
  );

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestSearchTemplateAction.java

@@ -12,6 +12,7 @@
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.core.RestApiVersion;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.Scope;
@@ -23,6 +24,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
@@ -35,9 +37,11 @@ public class RestSearchTemplateAction extends BaseRestHandler {
  private static final Set<String> RESPONSE_PARAMS = Set.of(TYPED_KEYS_PARAM, RestSearchAction.TOTAL_HITS_AS_INT_PARAM);
 
  private final NamedWriteableRegistry namedWriteableRegistry;
+ private final Predicate<NodeFeature> clusterSupportsFeature;
 
- public RestSearchTemplateAction(NamedWriteableRegistry namedWriteableRegistry) {
+ public RestSearchTemplateAction(NamedWriteableRegistry namedWriteableRegistry, Predicate<NodeFeature> clusterSupportsFeature) {
  this.namedWriteableRegistry = namedWriteableRegistry;
+ this.clusterSupportsFeature = clusterSupportsFeature;
  }
 
  @Override
@@ -70,6 +74,7 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client
  request,
  null,
  namedWriteableRegistry,
+ clusterSupportsFeature,
  size -> searchRequest.source().size(size)
  );
 

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportMultiSearchTemplateAction.java

@@ -18,8 +18,12 @@
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.client.internal.node.NodeClient;
+import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
+import org.elasticsearch.features.FeatureService;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.transport.TransportService;
@@ -29,6 +33,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Predicate;
 
 import static org.elasticsearch.script.mustache.TransportSearchTemplateAction.convert;
 
@@ -38,6 +43,7 @@ public class TransportMultiSearchTemplateAction extends HandledTransportAction<M
 
  private final ScriptService scriptService;
  private final NamedXContentRegistry xContentRegistry;
+ private final Predicate<NodeFeature> clusterSupportsFeature;
  private final NodeClient client;
  private final SearchUsageHolder searchUsageHolder;
 
@@ -48,7 +54,9 @@ public TransportMultiSearchTemplateAction(
  ScriptService scriptService,
  NamedXContentRegistry xContentRegistry,
  NodeClient client,
- UsageService usageService
+ UsageService usageService,
+ ClusterService clusterService,
+ FeatureService featureService
  ) {
  super(
  MustachePlugin.MULTI_SEARCH_TEMPLATE_ACTION.name(),
@@ -59,6 +67,10 @@ public TransportMultiSearchTemplateAction(
  );
  this.scriptService = scriptService;
  this.xContentRegistry = xContentRegistry;
+ this.clusterSupportsFeature = f -> {
+ ClusterState state = clusterService.state();
+ return state.clusterRecovered() && featureService.clusterHasFeature(state, f);
+ };
  this.client = client;
  this.searchUsageHolder = usageService.getSearchUsageHolder();
  }
@@ -78,7 +90,14 @@ protected void doExecute(Task task, MultiSearchTemplateRequest request, ActionLi
  SearchTemplateResponse searchTemplateResponse = new SearchTemplateResponse();
  SearchRequest searchRequest;
  try {
- searchRequest = convert(searchTemplateRequest, searchTemplateResponse, scriptService, xContentRegistry, searchUsageHolder);
+ searchRequest = convert(
+ searchTemplateRequest,
+ searchTemplateResponse,
+ scriptService,
+ xContentRegistry,
+ clusterSupportsFeature,
+ searchUsageHolder
+ );
  } catch (Exception e) {
  searchTemplateResponse.decRef();
  items[i] = new MultiSearchTemplateResponse.Item(null, e);

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java

@@ -13,10 +13,14 @@
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.client.internal.node.NodeClient;
+import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
+import org.elasticsearch.features.FeatureService;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.rest.action.search.RestSearchAction;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
@@ -36,13 +40,15 @@
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.function.Predicate;
 
 public class TransportSearchTemplateAction extends HandledTransportAction<SearchTemplateRequest, SearchTemplateResponse> {
 
  private static final String TEMPLATE_LANG = MustacheScriptEngine.NAME;
 
  private final ScriptService scriptService;
  private final NamedXContentRegistry xContentRegistry;
+ private final Predicate<NodeFeature> clusterSupportsFeature;
  private final NodeClient client;
  private final SearchUsageHolder searchUsageHolder;
 
@@ -53,7 +59,9 @@ public TransportSearchTemplateAction(
  ScriptService scriptService,
  NamedXContentRegistry xContentRegistry,
  NodeClient client,
- UsageService usageService
+ UsageService usageService,
+ ClusterService clusterService,
+ FeatureService featureService
  ) {
  super(
  MustachePlugin.SEARCH_TEMPLATE_ACTION.name(),
@@ -64,6 +72,10 @@ public TransportSearchTemplateAction(
  );
  this.scriptService = scriptService;
  this.xContentRegistry = xContentRegistry;
+ this.clusterSupportsFeature = f -> {
+ ClusterState state = clusterService.state();
+ return state.clusterRecovered() && featureService.clusterHasFeature(state, f);
+ };
  this.client = client;
  this.searchUsageHolder = usageService.getSearchUsageHolder();
  }
@@ -73,7 +85,14 @@ protected void doExecute(Task task, SearchTemplateRequest request, ActionListene
  final SearchTemplateResponse response = new SearchTemplateResponse();
  boolean success = false;
  try {
- SearchRequest searchRequest = convert(request, response, scriptService, xContentRegistry, searchUsageHolder);
+ SearchRequest searchRequest = convert(
+ request,
+ response,
+ scriptService,
+ xContentRegistry,
+ clusterSupportsFeature,
+ searchUsageHolder
+ );
  if (searchRequest != null) {
  client.search(searchRequest, listener.delegateResponse((l, e) -> {
  response.decRef();
@@ -102,6 +121,7 @@ static SearchRequest convert(
  SearchTemplateResponse response,
  ScriptService scriptService,
  NamedXContentRegistry xContentRegistry,
+ Predicate<NodeFeature> clusterSupportsFeature,
  SearchUsageHolder searchUsageHolder
  ) throws IOException {
  Script script = new Script(
@@ -121,7 +141,7 @@ static SearchRequest convert(
  XContentParserConfiguration parserConfig = XContentParserConfiguration.EMPTY.withRegistry(xContentRegistry)
  .withDeprecationHandler(LoggingDeprecationHandler.INSTANCE);
  try (XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(parserConfig, source)) {
- builder.parseXContent(parser, false, searchUsageHolder);
+ builder.parseXContent(parser, false, searchUsageHolder, clusterSupportsFeature);
  }
 
  if (searchTemplateRequest.isSimulate()) {

modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/RestSearchTemplateActionTests.java

@@ -28,7 +28,7 @@ public final class RestSearchTemplateActionTests extends RestActionTestCase {
 
  @Before
  public void setUpAction() {
- controller().registerHandler(new RestSearchTemplateAction(mock(NamedWriteableRegistry.class)));
+ controller().registerHandler(new RestSearchTemplateAction(mock(NamedWriteableRegistry.class), nf -> false));
  verifyingClient.setExecuteVerifier((actionType, request) -> mock(SearchTemplateResponse.class));
  verifyingClient.setExecuteLocallyVerifier((actionType, request) -> mock(SearchTemplateResponse.class));
  }

modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalPlugin.java

@@ -53,7 +53,7 @@ public List<RestHandler> getRestHandlers(
  Supplier<DiscoveryNodes> nodesInCluster,
  Predicate<NodeFeature> clusterSupportsFeature
  ) {
- return Collections.singletonList(new RestRankEvalAction());
+ return Collections.singletonList(new RestRankEvalAction(clusterSupportsFeature));
  }
 
  @Override

modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalSpec.java

@@ -14,6 +14,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.XContentParserUtils;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.xcontent.ConstructingObjectParser;
 import org.elasticsearch.xcontent.ParseField;
@@ -30,6 +31,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
+import java.util.function.Predicate;
 
 /**
  * Specification of the ranking evaluation request.<br>
@@ -132,13 +134,13 @@ public void setMaxConcurrentSearches(int maxConcurrentSearches) {
  private static final ParseField REQUESTS_FIELD = new ParseField("requests");
  private static final ParseField MAX_CONCURRENT_SEARCHES_FIELD = new ParseField("max_concurrent_searches");
  @SuppressWarnings("unchecked")
- private static final ConstructingObjectParser<RankEvalSpec, Void> PARSER = new ConstructingObjectParser<>(
+ private static final ConstructingObjectParser<RankEvalSpec, Predicate<NodeFeature>> PARSER = new ConstructingObjectParser<>(
  "rank_eval",
  a -> new RankEvalSpec((List<RatedRequest>) a[0], (EvaluationMetric) a[1], (Collection<ScriptWithId>) a[2])
  );
 
  static {
- PARSER.declareObjectArray(ConstructingObjectParser.constructorArg(), (p, c) -> RatedRequest.fromXContent(p), REQUESTS_FIELD);
+ PARSER.declareObjectArray(ConstructingObjectParser.constructorArg(), (p, c) -> RatedRequest.fromXContent(p, c), REQUESTS_FIELD);
  PARSER.declareObject(ConstructingObjectParser.constructorArg(), (p, c) -> parseMetric(p), METRIC_FIELD);
  PARSER.declareObjectArray(
  ConstructingObjectParser.optionalConstructorArg(),
@@ -156,8 +158,8 @@ private static EvaluationMetric parseMetric(XContentParser parser) throws IOExce
  return metric;
  }
 
- public static RankEvalSpec parse(XContentParser parser) {
- return PARSER.apply(parser, null);
+ public static RankEvalSpec parse(XContentParser parser, Predicate<NodeFeature> clusterSupportsFeature) {
+ return PARSER.apply(parser, clusterSupportsFeature);
  }
 
  static class ScriptWithId {

modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java

@@ -13,6 +13,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.index.rankeval.RatedDocument.DocumentKey;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.xcontent.ConstructingObjectParser;
@@ -31,6 +32,7 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Predicate;
 
 /**
  * Definition of a particular query in the ranking evaluation request.<br>
@@ -246,7 +248,7 @@ public void addSummaryFields(List<String> summaryFieldsToAdd) {
  private static final ParseField TEMPLATE_ID_FIELD = new ParseField("template_id");
 
  @SuppressWarnings("unchecked")
- private static final ConstructingObjectParser<RatedRequest, Void> PARSER = new ConstructingObjectParser<>(
+ private static final ConstructingObjectParser<RatedRequest, Predicate<NodeFeature>> PARSER = new ConstructingObjectParser<>(
  "request",
  a -> new RatedRequest(
  (String) a[0],
@@ -262,7 +264,7 @@ public void addSummaryFields(List<String> summaryFieldsToAdd) {
  PARSER.declareObjectArray(ConstructingObjectParser.constructorArg(), (p, c) -> RatedDocument.fromXContent(p), RATINGS_FIELD);
  PARSER.declareObject(
  ConstructingObjectParser.optionalConstructorArg(),
- (p, c) -> new SearchSourceBuilder().parseXContent(p, false),
+ (p, c) -> new SearchSourceBuilder().parseXContent(p, false, c),
  REQUEST_FIELD
  );
  PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(), (p, c) -> p.map(), PARAMS_FIELD);
@@ -273,8 +275,8 @@ public void addSummaryFields(List<String> summaryFieldsToAdd) {
  /**
  * parse from rest representation
  */
- public static RatedRequest fromXContent(XContentParser parser) {
- return PARSER.apply(parser, null);
+ public static RatedRequest fromXContent(XContentParser parser, Predicate<NodeFeature> clusterSupportsFeature) {
+ return PARSER.apply(parser, clusterSupportsFeature);
  }
 
  @Override

modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RestRankEvalAction.java

@@ -12,6 +12,7 @@
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.Scope;
@@ -21,6 +22,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.function.Predicate;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
@@ -82,6 +84,12 @@ public class RestRankEvalAction extends BaseRestHandler {
 
  public static final String ENDPOINT = "_rank_eval";
 
+ private Predicate<NodeFeature> clusterSupportsFeature;
+
+ public RestRankEvalAction(Predicate<NodeFeature> clusterSupportsFeature) {
+ this.clusterSupportsFeature = clusterSupportsFeature;
+ }
+
  @Override
  public List<Route> routes() {
  return List.of(
@@ -96,7 +104,7 @@ public List<Route> routes() {
  protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
  RankEvalRequest rankEvalRequest = new RankEvalRequest();
  try (XContentParser parser = request.contentOrSourceParamParser()) {
- parseRankEvalRequest(rankEvalRequest, request, parser);
+ parseRankEvalRequest(rankEvalRequest, request, parser, clusterSupportsFeature);
  }
  return channel -> client.executeLocally(
  RankEvalPlugin.ACTION,
@@ -105,13 +113,18 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
  );
  }
 
- private static void parseRankEvalRequest(RankEvalRequest rankEvalRequest, RestRequest request, XContentParser parser) {
+ private static void parseRankEvalRequest(
+ RankEvalRequest rankEvalRequest,
+ RestRequest request,
+ XContentParser parser,
+ Predicate<NodeFeature> clusterSupportsFeature
+ ) {
  rankEvalRequest.indices(Strings.splitStringByCommaToArray(request.param("index")));
  rankEvalRequest.indicesOptions(IndicesOptions.fromRequest(request, rankEvalRequest.indicesOptions()));
  if (request.hasParam("search_type")) {
  rankEvalRequest.searchType(SearchType.fromString(request.param("search_type")));
  }
- RankEvalSpec spec = RankEvalSpec.parse(parser);
+ RankEvalSpec spec = RankEvalSpec.parse(parser, clusterSupportsFeature);
  rankEvalRequest.setRankEvalSpec(spec);
  }