Skip to content

Commit 232879b

Browse files
adding node feature for yaml tests
1 parent 56fb75c commit 232879b

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
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
@@ -15,6 +15,7 @@
1515

1616
import java.util.Set;
1717

18+
import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.SEMANTIC_TEXT_SUB_FIELDS_EXCLUDE_FROM_FIELD_CAPS;
1819
import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.SEMANTIC_TEXT_SUPPORT_CHUNKING_CONFIG;
1920
import static org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor.SEMANTIC_KNN_FILTER_FIX;
2021
import static org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor.SEMANTIC_KNN_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
@@ -57,7 +58,8 @@ public Set<NodeFeature> getTestFeatures() {
5758
SemanticTextFieldMapper.SEMANTIC_TEXT_BIT_VECTOR_SUPPORT,
5859
SemanticTextFieldMapper.SEMANTIC_TEXT_HANDLE_EMPTY_INPUT,
5960
TEST_RULE_RETRIEVER_WITH_INDICES_THAT_DONT_RETURN_RANK_DOCS,
60-
SEMANTIC_TEXT_SUPPORT_CHUNKING_CONFIG
61+
SEMANTIC_TEXT_SUPPORT_CHUNKING_CONFIG,
62+
SEMANTIC_TEXT_SUB_FIELDS_EXCLUDE_FROM_FIELD_CAPS
6163
);
6264
}
6365
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ public class SemanticTextFieldMapper extends FieldMapper implements InferenceFie
132132
public static final NodeFeature SEMANTIC_TEXT_SKIP_INFERENCE_FIELDS = new NodeFeature("semantic_text.skip_inference_fields");
133133
public static final NodeFeature SEMANTIC_TEXT_BIT_VECTOR_SUPPORT = new NodeFeature("semantic_text.bit_vector_support");
134134
public static final NodeFeature SEMANTIC_TEXT_SUPPORT_CHUNKING_CONFIG = new NodeFeature("semantic_text.support_chunking_config");
135+
public static final NodeFeature SEMANTIC_TEXT_SUB_FIELDS_EXCLUDE_FROM_FIELD_CAPS = new NodeFeature(
136+
"semantic_text.exclude_sub_fields_from_field_caps"
137+
);
135138

136139
public static final String CONTENT_TYPE = "semantic_text";
137140
public static final String DEFAULT_ELSER_2_INFERENCE_ID = DEFAULT_ELSER_ID;

x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/10_semantic_text_field_mapping.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ setup:
363363
---
364364
"Field caps exclude chunks and embedding fields":
365365
- requires:
366-
cluster_features: "gte_v8.16.0"
367-
reason: field_caps support for semantic_text added in 8.16.0
366+
cluster_features: "semantic_text.exclude_sub_fields_from_field_caps"
367+
reason: field caps api exclude semantic_text subfields from 9.1.0
368368

369369
- do:
370370
field_caps:

x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/10_semantic_text_field_mapping_bwc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ setup:
310310
---
311311
"Field caps exclude chunks embedding and text fields":
312312
- requires:
313-
cluster_features: "gte_v8.16.0"
314-
reason: field_caps support for semantic_text added in 8.16.0
313+
cluster_features: "semantic_text.exclude_sub_fields_from_field_caps"
314+
reason: field caps api exclude semantic_text subfields from 9.1.0
315315

316316
- do:
317317
field_caps:

0 commit comments

Comments
 (0)