[POC] Multi Match Implementation to Support semantic_text

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

@@ -216,6 +216,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_1 = def(8_841_0_65);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_2 = def(8_841_0_66);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_3 = def(8_841_0_67);
+    public static final TransportVersion MULTI_MATCH_SEMANTIC_TEXT_SUPPORT_8_19 = def(8_841_0_68);
     public static final TransportVersion V_9_0_0 = def(9_000_0_09);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);
@@ -365,6 +366,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion SIMULATE_INGEST_MAPPING_MERGE_TYPE = def(9_138_0_00);
     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 MULTI_MATCH_SEMANTIC_TEXT_SUPPORT = def(9_141_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

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

@@ -52,6 +52,7 @@ public final class MultiMatchQueryBuilder extends AbstractQueryBuilder<MultiMatc
     public static final int DEFAULT_MAX_EXPANSIONS = FuzzyQuery.defaultMaxExpansions;
     public static final ZeroTermsQueryOption DEFAULT_ZERO_TERMS_QUERY = MatchQueryParser.DEFAULT_ZERO_TERMS_QUERY;
     public static final boolean DEFAULT_FUZZY_TRANSPOSITIONS = FuzzyQuery.defaultTranspositions;
+    private boolean resolveInferenceFieldWildcards = true;
 
     public static final ParseField BOOST_FIELD = new ParseField("boost");
     public static final ParseField SLOP_FIELD = new ParseField("slop");
@@ -228,6 +229,12 @@ public MultiMatchQueryBuilder(StreamInput in) throws IOException {
         zeroTermsQuery = ZeroTermsQueryOption.readFromStream(in);
         autoGenerateSynonymsPhraseQuery = in.readBoolean();
         fuzzyTranspositions = in.readBoolean();
+        if (in.getTransportVersion().isPatchFrom(TransportVersions.MULTI_MATCH_SEMANTIC_TEXT_SUPPORT_8_19)
+            || in.getTransportVersion().onOrAfter(TransportVersions.MULTI_MATCH_SEMANTIC_TEXT_SUPPORT)) {
+            resolveInferenceFieldWildcards = in.readBoolean();
+        } else {
+            resolveInferenceFieldWildcards = false;
+        }
     }
 
     @Override
@@ -251,6 +258,10 @@ protected void doWriteTo(StreamOutput out) throws IOException {
         zeroTermsQuery.writeTo(out);
         out.writeBoolean(autoGenerateSynonymsPhraseQuery);
         out.writeBoolean(fuzzyTranspositions);
+        if (out.getTransportVersion().isPatchFrom(TransportVersions.MULTI_MATCH_SEMANTIC_TEXT_SUPPORT_8_19)
+            || out.getTransportVersion().onOrAfter(TransportVersions.MULTI_MATCH_SEMANTIC_TEXT_SUPPORT)) {
+            out.writeBoolean(resolveInferenceFieldWildcards);
+        }
     }
 
     public Object value() {
@@ -513,6 +524,15 @@ public MultiMatchQueryBuilder fuzzyTranspositions(boolean fuzzyTranspositions) {
         return this;
     }
 
+    public boolean resolveInferenceFieldWildcards() {
+        return resolveInferenceFieldWildcards;
+    }
+
+    public MultiMatchQueryBuilder resolveInferenceFieldWildcards(boolean resolveInferenceFieldWildcards) {
+        this.resolveInferenceFieldWildcards = resolveInferenceFieldWildcards;
+        return this;
+    }
+
     @Override
     public void doXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject(NAME);
@@ -797,7 +817,8 @@ protected int doHashCode() {
             lenient,
             zeroTermsQuery,
             autoGenerateSynonymsPhraseQuery,
-            fuzzyTranspositions
+            fuzzyTranspositions,
+            resolveInferenceFieldWildcards
         );
     }
 
@@ -818,7 +839,8 @@ protected boolean doEquals(MultiMatchQueryBuilder other) {
             && Objects.equals(lenient, other.lenient)
             && Objects.equals(zeroTermsQuery, other.zeroTermsQuery)
             && Objects.equals(autoGenerateSynonymsPhraseQuery, other.autoGenerateSynonymsPhraseQuery)
-            && Objects.equals(fuzzyTranspositions, other.fuzzyTranspositions);
+            && Objects.equals(fuzzyTranspositions, other.fuzzyTranspositions)
+            && Objects.equals(resolveInferenceFieldWildcards, other.resolveInferenceFieldWildcards);
     }
 
     @Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceFeatures.java

@@ -24,6 +24,7 @@
 import static org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor.SEMANTIC_KNN_FILTER_FIX;
 import static org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor.SEMANTIC_KNN_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
 import static org.elasticsearch.xpack.inference.queries.SemanticMatchQueryRewriteInterceptor.SEMANTIC_MATCH_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
+import static org.elasticsearch.xpack.inference.queries.SemanticMultiMatchQueryRewriteInterceptor.SEMANTIC_MULTI_MATCH_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
 import static org.elasticsearch.xpack.inference.queries.SemanticSparseVectorQueryRewriteInterceptor.SEMANTIC_SPARSE_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
 import static org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder.RERANK_SNIPPETS;
 import static org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder.TEXT_SIMILARITY_RERANKER_SNIPPETS;
@@ -61,6 +62,7 @@ public Set<NodeFeature> getTestFeatures() {
                 SemanticTextFieldMapper.SEMANTIC_TEXT_SKIP_INFERENCE_FIELDS,
                 SEMANTIC_TEXT_HIGHLIGHTER,
                 SEMANTIC_MATCH_QUERY_REWRITE_INTERCEPTION_SUPPORTED,
+                SEMANTIC_MULTI_MATCH_QUERY_REWRITE_INTERCEPTION_SUPPORTED,
                 SEMANTIC_SPARSE_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED,
                 SemanticInferenceMetadataFieldsMapper.EXPLICIT_NULL_FIXES,
                 SEMANTIC_KNN_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED,

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java

@@ -95,6 +95,7 @@
 import org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper;
 import org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor;
 import org.elasticsearch.xpack.inference.queries.SemanticMatchQueryRewriteInterceptor;
+import org.elasticsearch.xpack.inference.queries.SemanticMultiMatchQueryRewriteInterceptor;
 import org.elasticsearch.xpack.inference.queries.SemanticQueryBuilder;
 import org.elasticsearch.xpack.inference.queries.SemanticSparseVectorQueryRewriteInterceptor;
 import org.elasticsearch.xpack.inference.rank.random.RandomRankBuilder;
@@ -581,6 +582,7 @@ public List<QueryRewriteInterceptor> getQueryRewriteInterceptors() {
         return List.of(
             new SemanticKnnVectorQueryRewriteInterceptor(),
             new SemanticMatchQueryRewriteInterceptor(),
+            new SemanticMultiMatchQueryRewriteInterceptor(),
             new SemanticSparseVectorQueryRewriteInterceptor()
         );
     }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticKnnVectorQueryRewriteInterceptor.java

@@ -47,6 +47,11 @@ protected String getQuery(QueryBuilder queryBuilder) {
         return queryVectorBuilder != null ? queryVectorBuilder.getModelText() : null;
     }
 
+    @Override
+    protected boolean shouldResolveInferenceFieldWildcards(QueryBuilder queryBuilder) {
+        return false;
+    }
+
     @Override
     protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation) {
         assert (queryBuilder instanceof KnnVectorQueryBuilder);

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticMatchQueryRewriteInterceptor.java

@@ -34,9 +34,14 @@ protected String getQuery(QueryBuilder queryBuilder) {
         return (String) matchQueryBuilder.value();
     }
 
+    @Override
+    protected boolean shouldResolveInferenceFieldWildcards(QueryBuilder queryBuilder) {
+        return false;
+    }
+
     @Override
     protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation) {
-        SemanticQueryBuilder semanticQueryBuilder = new SemanticQueryBuilder(indexInformation.fieldName(), getQuery(queryBuilder), false);
+        SemanticQueryBuilder semanticQueryBuilder = new SemanticQueryBuilder(getFieldName(queryBuilder), getQuery(queryBuilder), false);
         semanticQueryBuilder.boost(queryBuilder.boost());
         semanticQueryBuilder.queryName(queryBuilder.queryName());
         return semanticQueryBuilder;