Add match support for semantic_text fields

docs/changelog/117839.yaml

@@ -0,0 +1,5 @@
+pr: 117839
+summary: Add match support for `semantic_text` fields
+area: "Search"
+type: enhancement
+issues: []

server/src/main/java/module-info.java

@@ -479,5 +479,5 @@
  exports org.elasticsearch.lucene.spatial;
  exports org.elasticsearch.inference.configuration;
  exports org.elasticsearch.monitor.metrics;
-
+ exports org.elasticsearch.plugins.internal.rewriter to org.elasticsearch.inference;
 }

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

@@ -140,6 +140,7 @@ static TransportVersion def(int id) {
  public static final TransportVersion NEW_REFRESH_CLUSTER_BLOCK = def(8_803_00_0);
  public static final TransportVersion RETRIES_AND_OPERATIONS_IN_BLOBSTORE_STATS = def(8_804_00_0);
  public static final TransportVersion ADD_DATA_STREAM_OPTIONS_TO_TEMPLATES = def(8_805_00_0);
+ public static final TransportVersion SEMANTIC_QUERY_LENIENT = def(8_806_00_0);
 
  /*
  * STOP! READ THIS FIRST! No, really,

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

@@ -58,6 +58,7 @@
 import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
 import org.elasticsearch.indices.recovery.RecoveryState;
 import org.elasticsearch.plugins.IndexStorePlugin;
+import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -478,7 +479,8 @@ public IndexService newIndexService(
  IdFieldMapper idFieldMapper,
  ValuesSourceRegistry valuesSourceRegistry,
  IndexStorePlugin.IndexFoldersDeletionListener indexFoldersDeletionListener,
- Map<String, IndexStorePlugin.SnapshotCommitSupplier> snapshotCommitSuppliers
+ Map<String, IndexStorePlugin.SnapshotCommitSupplier> snapshotCommitSuppliers,
+ QueryRewriteInterceptor queryRewriteInterceptor
  ) throws IOException {
  final IndexEventListener eventListener = freeze();
  Function<IndexService, CheckedFunction<DirectoryReader, DirectoryReader, IOException>> readerWrapperFactory = indexReaderWrapper
@@ -540,7 +542,8 @@ public IndexService newIndexService(
  indexFoldersDeletionListener,
  snapshotCommitSupplier,
  indexCommitListener.get(),
- mapperMetrics
+ mapperMetrics,
+ queryRewriteInterceptor
  );
  success = true;
  return indexService;

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

@@ -85,6 +85,7 @@
 import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
 import org.elasticsearch.indices.recovery.RecoveryState;
 import org.elasticsearch.plugins.IndexStorePlugin;
+import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -162,6 +163,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust
  private final Supplier<Sort> indexSortSupplier;
  private final ValuesSourceRegistry valuesSourceRegistry;
  private final MapperMetrics mapperMetrics;
+ private final QueryRewriteInterceptor queryRewriteInterceptor;
 
  @SuppressWarnings("this-escape")
  public IndexService(
@@ -196,7 +198,8 @@ public IndexService(
  IndexStorePlugin.IndexFoldersDeletionListener indexFoldersDeletionListener,
  IndexStorePlugin.SnapshotCommitSupplier snapshotCommitSupplier,
  Engine.IndexCommitListener indexCommitListener,
- MapperMetrics mapperMetrics
+ MapperMetrics mapperMetrics,
+ QueryRewriteInterceptor queryRewriteInterceptor
  ) {
  super(indexSettings);
  assert indexCreationContext != IndexCreationContext.RELOAD_ANALYZERS
@@ -271,6 +274,7 @@ public IndexService(
  this.indexingOperationListeners = Collections.unmodifiableList(indexingOperationListeners);
  this.indexCommitListener = indexCommitListener;
  this.mapperMetrics = mapperMetrics;
+ this.queryRewriteInterceptor = queryRewriteInterceptor;
  try (var ignored = threadPool.getThreadContext().clearTraceContext()) {
  // kick off async ops for the first shard in this index
  this.refreshTask = new AsyncRefreshTask(this);
@@ -802,6 +806,7 @@ public QueryRewriteContext newQueryRewriteContext(
  allowExpensiveQueries,
  scriptService,
  null,
+ null,
  null
  );
  }

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

@@ -21,6 +21,7 @@
 import org.elasticsearch.common.lucene.BytesRefs;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.SuggestingErrorOnUnknown;
+import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
 import org.elasticsearch.xcontent.AbstractObjectParser;
 import org.elasticsearch.xcontent.FilterXContentParser;
 import org.elasticsearch.xcontent.FilterXContentParserWrapper;
@@ -278,6 +279,14 @@ protected static List<QueryBuilder> readQueries(StreamInput in) throws IOExcepti
 
  @Override
  public final QueryBuilder rewrite(QueryRewriteContext queryRewriteContext) throws IOException {
+ QueryRewriteInterceptor queryRewriteInterceptor = queryRewriteContext.getQueryRewriteInterceptor();
+ if (queryRewriteInterceptor != null) {
+ var rewritten = queryRewriteInterceptor.interceptAndRewrite(queryRewriteContext, this);
+ if (rewritten != this) {
+ return new InterceptedQueryBuilderWrapper(rewritten);
+ }
+ }
+
  QueryBuilder rewritten = doRewrite(queryRewriteContext);
  if (rewritten == this) {
  return rewritten;

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

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

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

@@ -66,6 +66,9 @@ public InnerHitBuilder innerHitBuilder() {
  public static void extractInnerHits(QueryBuilder query, Map<String, InnerHitContextBuilder> innerHitBuilders) {
  if (query instanceof AbstractQueryBuilder) {
  ((AbstractQueryBuilder<?>) query).extractInnerHitBuilders(innerHitBuilders);
+ } else if (query instanceof InterceptedQueryBuilderWrapper) {
+ // Unwrap an intercepted query here
+ extractInnerHits(((InterceptedQueryBuilderWrapper) query).queryBuilder, innerHitBuilders);
  } else {
  throw new IllegalStateException(
  "provided query builder [" + query.getClass() + "] class should inherit from AbstractQueryBuilder, but it doesn't"

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.index.query;
+
+import org.apache.lucene.search.Query;
+import org.elasticsearch.TransportVersion;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
+import org.elasticsearch.xcontent.XContentBuilder;
+
+import java.io.IOException;
+import java.util.Objects;
+
+/**
+ * Wrapper for instances of {@link QueryBuilder} that have been intercepted using the {@link QueryRewriteInterceptor} to
+ * break out of the rewrite phase. These instances are unwrapped on serialization.
+ */
+class InterceptedQueryBuilderWrapper implements QueryBuilder {
+
+ protected final QueryBuilder queryBuilder;
+
+ InterceptedQueryBuilderWrapper(QueryBuilder queryBuilder) {
+ super();
+ this.queryBuilder = queryBuilder;
+ }
+
+ @Override
+ public QueryBuilder rewrite(QueryRewriteContext queryRewriteContext) throws IOException {
+ QueryRewriteInterceptor queryRewriteInterceptor = queryRewriteContext.getQueryRewriteInterceptor();
+ try {
+ queryRewriteContext.setQueryRewriteInterceptor(null);
+ QueryBuilder rewritten = queryBuilder.rewrite(queryRewriteContext);
+ if (rewritten != queryBuilder) {
+ return new InterceptedQueryBuilderWrapper(rewritten);
+ }
+ return this;
+ } finally {
+ queryRewriteContext.setQueryRewriteInterceptor(queryRewriteInterceptor);
+ }
+ }
+
+ @Override
+ public String getWriteableName() {
+ return queryBuilder.getWriteableName();
+ }
+
+ @Override
+ public TransportVersion getMinimalSupportedVersion() {
+ return queryBuilder.getMinimalSupportedVersion();
+ }
+
+ @Override
+ public Query toQuery(SearchExecutionContext context) throws IOException {
+ return queryBuilder.toQuery(context);
+ }
+
+ @Override
+ public QueryBuilder queryName(String queryName) {
+ return queryBuilder.queryName(queryName);
+ }
+
+ @Override
+ public String queryName() {
+ return queryBuilder.queryName();
+ }
+
+ @Override
+ public float boost() {
+ return queryBuilder.boost();
+ }
+
+ @Override
+ public QueryBuilder boost(float boost) {
+ return queryBuilder.boost(boost);
+ }
+
+ @Override
+ public String getName() {
+ return queryBuilder.getName();
+ }
+
+ @Override
+ public void writeTo(StreamOutput out) throws IOException {
+ queryBuilder.writeTo(out);
+ }
+
+ @Override
+ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+ return queryBuilder.toXContent(builder, params);
+ }
+
+ @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);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(queryBuilder);
+ }
+}

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

@@ -28,6 +28,7 @@
 import org.elasticsearch.index.mapper.MappingLookup;
 import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.index.mapper.TextFieldMapper;
+import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
 import org.elasticsearch.script.ScriptCompiler;
 import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
 import org.elasticsearch.search.builder.PointInTimeBuilder;
@@ -70,6 +71,7 @@ public class QueryRewriteContext {
  protected Predicate<String> allowedFields;
  private final ResolvedIndices resolvedIndices;
  private final PointInTimeBuilder pit;
+ private QueryRewriteInterceptor queryRewriteInterceptor;
 
  public QueryRewriteContext(
  final XContentParserConfiguration parserConfiguration,
@@ -86,7 +88,8 @@ public QueryRewriteContext(
  final BooleanSupplier allowExpensiveQueries,
  final ScriptCompiler scriptService,
  final ResolvedIndices resolvedIndices,
- final PointInTimeBuilder pit
+ final PointInTimeBuilder pit,
+ final QueryRewriteInterceptor queryRewriteInterceptor
  ) {
 
  this.parserConfiguration = parserConfiguration;
@@ -105,6 +108,7 @@ public QueryRewriteContext(
  this.scriptService = scriptService;
  this.resolvedIndices = resolvedIndices;
  this.pit = pit;
+ this.queryRewriteInterceptor = queryRewriteInterceptor;
  }
 
  public QueryRewriteContext(final XContentParserConfiguration parserConfiguration, final Client client, final LongSupplier nowInMillis) {
@@ -123,6 +127,7 @@ public QueryRewriteContext(final XContentParserConfiguration parserConfiguration
  null,
  null,
  null,
+ null,
  null
  );
  }
@@ -132,7 +137,8 @@ public QueryRewriteContext(
  final Client client,
  final LongSupplier nowInMillis,
  final ResolvedIndices resolvedIndices,
- final PointInTimeBuilder pit
+ final PointInTimeBuilder pit,
+ final QueryRewriteInterceptor queryRewriteInterceptor
  ) {
  this(
  parserConfiguration,
@@ -149,7 +155,8 @@ public QueryRewriteContext(
  null,
  null,
  resolvedIndices,
- pit
+ pit,
+ queryRewriteInterceptor
  );
  }
 
@@ -428,4 +435,13 @@ public String getTierPreference() {
  // It was decided we should only test the first of these potentially multiple preferences.
  return value.split(",")[0].trim();
  }
+
+ public QueryRewriteInterceptor getQueryRewriteInterceptor() {
+ return queryRewriteInterceptor;
+ }
+
+ public void setQueryRewriteInterceptor(QueryRewriteInterceptor queryRewriteInterceptor) {
+ this.queryRewriteInterceptor = queryRewriteInterceptor;
+ }
+
 }

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

@@ -271,6 +271,7 @@ private SearchExecutionContext(
  allowExpensiveQueries,
  scriptService,
  null,
+ null,
  null
  );
  this.shardId = shardId;

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

@@ -135,6 +135,7 @@
 import org.elasticsearch.plugins.FieldPredicate;
 import org.elasticsearch.plugins.IndexStorePlugin;
 import org.elasticsearch.plugins.PluginsService;
+import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
 import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
@@ -262,6 +263,7 @@ public class IndicesService extends AbstractLifecycleComponent
  private final MapperMetrics mapperMetrics;
  private final PostRecoveryMerger postRecoveryMerger;
  private final List<SearchOperationListener> searchOperationListeners;
+ private final QueryRewriteInterceptor queryRewriteInterceptor;
 
  @Override
  protected void doStart() {
@@ -330,6 +332,7 @@ public void onRemoval(ShardId shardId, String fieldName, boolean wasEvicted, lon
  this.indexFoldersDeletionListeners = new CompositeIndexFoldersDeletionListener(builder.indexFoldersDeletionListeners);
  this.snapshotCommitSuppliers = builder.snapshotCommitSuppliers;
  this.requestCacheKeyDifferentiator = builder.requestCacheKeyDifferentiator;
+ this.queryRewriteInterceptor = builder.queryRewriteInterceptor;
  this.mapperMetrics = builder.mapperMetrics;
  // doClose() is called when shutting down a node, yet there might still be ongoing requests
  // that we need to wait for before closing some resources such as the caches. In order to
@@ -779,7 +782,8 @@ private synchronized IndexService createIndexService(
  idFieldMappers.apply(idxSettings.getMode()),
  valuesSourceRegistry,
  indexFoldersDeletionListeners,
- snapshotCommitSuppliers
+ snapshotCommitSuppliers,
+ queryRewriteInterceptor
  );
  }
 
@@ -1766,7 +1770,7 @@ public AliasFilter buildAliasFilter(ClusterState state, String index, Set<Resolv
  * Returns a new {@link QueryRewriteContext} with the given {@code now} provider
  */
  public QueryRewriteContext getRewriteContext(LongSupplier nowInMillis, ResolvedIndices resolvedIndices, PointInTimeBuilder pit) {
- return new QueryRewriteContext(parserConfig, client, nowInMillis, resolvedIndices, pit);
+ return new QueryRewriteContext(parserConfig, client, nowInMillis, resolvedIndices, pit, queryRewriteInterceptor);
  }
 
  public DataRewriteContext getDataRewriteContext(LongSupplier nowInMillis) {