Skip to content

Commit 2816ef5

Browse files
authored
[9.2] fix: add missing vector_similarity_support in InferenceFeatures (elastic#138644) (elastic#138688)
* Also temporarily disable MixedClusterClientYamlTestSuiteIT involving subobjects:auto
1 parent 6dfddc4 commit 2816ef5

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

docs/changelog/138644.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138644
2+
summary: "Fix: add missing `vector_similarity_support` in InferenceFeatures"
3+
area: Search
4+
type: bug
5+
issues: []

muted-tests.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,27 @@ tests:
540540
- class: org.elasticsearch.versioning.ConcurrentSeqNoVersioningIT
541541
method: testSeqNoCASLinearizability
542542
issue: https://github.com/elastic/elasticsearch/issues/117249
543+
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
544+
issue: https://github.com/elastic/elasticsearch/issues/138649
545+
method: test {p0=index/92_metrics_auto_subobjects/Metrics object indexing}
546+
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
547+
issue: https://github.com/elastic/elasticsearch/issues/138649
548+
method: test {p0=index/92_metrics_auto_subobjects/Root without subobjects with synthetic source}
549+
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
550+
issue: https://github.com/elastic/elasticsearch/issues/138649
551+
method: test {p0=index/92_metrics_auto_subobjects/Metrics object indexing with synthetic source}
552+
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
553+
issue: https://github.com/elastic/elasticsearch/issues/138649
554+
method: "test {p0=indices.put_index_template/15_composition/Composable index templates that include subobjects: auto at root}"
555+
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
556+
issue: https://github.com/elastic/elasticsearch/issues/138649
557+
method: "test {p0=search/330_fetch_fields/Test with subobjects: auto}"
558+
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
559+
issue: https://github.com/elastic/elasticsearch/issues/138649
560+
method: "test {p0=indices.put_index_template/15_composition/Composable index templates that include subobjects: auto on arbitrary field}"
561+
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
562+
issue: https://github.com/elastic/elasticsearch/issues/138649
563+
method: test {p0=index/92_metrics_auto_subobjects/Root with metrics}
543564

544565
# Examples:
545566
#

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ public class InferenceFeatures implements FeatureSpecification {
4040
private static final NodeFeature SEMANTIC_TEXT_HIGHLIGHTER_DISKBBQ_SIMILARITY_SUPPORT = new NodeFeature(
4141
"semantic_text.highlighter.bbq_and_similarity_support"
4242
);
43+
private static final NodeFeature SEMANTIC_TEXT_HIGHLIGHTER_VECTOR_SIMILARITY_SUPPORT = new NodeFeature(
44+
"semantic_text.highlighter.vector_similarity_support"
45+
);
4346
private static final NodeFeature TEST_RERANKING_SERVICE_PARSE_TEXT_AS_SCORE = new NodeFeature(
4447
"test_reranking_service.parse_text_as_score"
4548
);
@@ -97,6 +100,7 @@ public Set<NodeFeature> getTestFeatures() {
97100
SEMANTIC_TEXT_SPARSE_VECTOR_INDEX_OPTIONS,
98101
SEMANTIC_TEXT_FIELDS_CHUNKS_FORMAT,
99102
SEMANTIC_TEXT_HIGHLIGHTER_DISKBBQ_SIMILARITY_SUPPORT,
103+
SEMANTIC_TEXT_HIGHLIGHTER_VECTOR_SIMILARITY_SUPPORT,
100104
SemanticQueryBuilder.SEMANTIC_QUERY_MULTIPLE_INFERENCE_IDS,
101105
SemanticQueryBuilder.SEMANTIC_QUERY_FILTER_FIELD_CAPS_FIX,
102106
InterceptedInferenceQueryBuilder.NEW_SEMANTIC_QUERY_INTERCEPTORS,

0 commit comments

Comments
 (0)