Skip to content

Commit b19d923

Browse files
authored
Re-add semantic_text.inner_hits cluster feature (#114180)
Re-add the `semantic_text.inner_hits` cluster feature to fix serverless test failures
1 parent c1f2f80 commit b19d923

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.elasticsearch.features.FeatureSpecification;
1111
import org.elasticsearch.features.NodeFeature;
1212
import org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper;
13+
import org.elasticsearch.xpack.inference.queries.SemanticQueryBuilder;
1314
import org.elasticsearch.xpack.inference.rank.random.RandomRankRetrieverBuilder;
1415
import org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder;
1516

@@ -25,7 +26,8 @@ public Set<NodeFeature> getFeatures() {
2526
return Set.of(
2627
TextSimilarityRankRetrieverBuilder.TEXT_SIMILARITY_RERANKER_RETRIEVER_SUPPORTED,
2728
RandomRankRetrieverBuilder.RANDOM_RERANKER_RETRIEVER_SUPPORTED,
28-
SemanticTextFieldMapper.SEMANTIC_TEXT_SEARCH_INFERENCE_ID
29+
SemanticTextFieldMapper.SEMANTIC_TEXT_SEARCH_INFERENCE_ID,
30+
SemanticQueryBuilder.SEMANTIC_TEXT_INNER_HITS
2931
);
3032
}
3133

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.elasticsearch.cluster.metadata.InferenceFieldMetadata;
1717
import org.elasticsearch.common.io.stream.StreamInput;
1818
import org.elasticsearch.common.io.stream.StreamOutput;
19+
import org.elasticsearch.features.NodeFeature;
1920
import org.elasticsearch.index.mapper.MappedFieldType;
2021
import org.elasticsearch.index.query.AbstractQueryBuilder;
2122
import org.elasticsearch.index.query.MatchNoneQueryBuilder;
@@ -49,6 +50,9 @@
4950
import static org.elasticsearch.xpack.core.ClientHelper.executeAsyncWithOrigin;
5051

5152
public class SemanticQueryBuilder extends AbstractQueryBuilder<SemanticQueryBuilder> {
53+
// **** THE semantic_text.inner_hits CLUSTER FEATURE IS DEFUNCT, NEVER USE IT ****
54+
public static final NodeFeature SEMANTIC_TEXT_INNER_HITS = new NodeFeature("semantic_text.inner_hits");
55+
5256
public static final String NAME = "semantic";
5357

5458
private static final ParseField FIELD_FIELD = new ParseField("field");

0 commit comments

Comments
 (0)