Skip to content

Commit becd5c6

Browse files
committed
move search capability to test node feature
1 parent c4cb7e5 commit becd5c6

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/200_dense_vector_docvalue_fields.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,8 @@ setup:
163163
---
164164
"Dense vector cosine docvalue_fields with sparse documents after force merge":
165165
- requires:
166-
capabilities:
167-
- method: POST
168-
path: /_search
169-
capabilities: [ fix_dense_vector_wrong_fields ]
170-
test_runner_features: [ capabilities, close_to ]
171-
reason: "Support for dense vector doc value fields capability required"
166+
cluster_features: [ "mapper.fix_dense_vector_wrong_fields" ]
167+
reason: Support for dense vector doc value fields capability required
172168
- do:
173169
indices.create:
174170
index: test_cosine

server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public class MapperFeatures implements FeatureSpecification {
6262
static final NodeFeature EXCLUDE_VECTORS_DOCVALUE_BUGFIX = new NodeFeature("mapper.exclude_vectors_docvalue_bugfix");
6363
static final NodeFeature BASE64_DENSE_VECTORS = new NodeFeature("mapper.base64_dense_vectors");
6464
public static final NodeFeature GENERIC_VECTOR_FORMAT = new NodeFeature("mapper.vectors.generic_vector_format");
65+
public static final NodeFeature FIX_DENSE_VECTOR_WRONG_FIELDS = new NodeFeature("mapper.fix_dense_vector_wrong_fields");
6566

6667
@Override
6768
public Set<NodeFeature> getTestFeatures() {
@@ -104,7 +105,8 @@ public Set<NodeFeature> getTestFeatures() {
104105
PROVIDE_INDEX_SORT_SETTING_DEFAULTS,
105106
INDEX_MAPPING_IGNORE_DYNAMIC_BEYOND_FIELD_NAME_LIMIT,
106107
EXCLUDE_VECTORS_DOCVALUE_BUGFIX,
107-
BASE64_DENSE_VECTORS
108+
BASE64_DENSE_VECTORS,
109+
FIX_DENSE_VECTOR_WRONG_FIELDS
108110
);
109111
if (ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled()) {
110112
features = new HashSet<>(features);

server/src/main/java/org/elasticsearch/rest/action/search/SearchCapabilities.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ private SearchCapabilities() {}
6262
private static final String CLUSTER_STATS_EXTENDED_USAGE = "extended-search-usage-stats";
6363
private static final String REJECT_INVALID_REVERSE_NESTING = "reject_invalid_reverse_nesting";
6464

65-
private static final String FIX_DENSE_VECTOR_WRONG_FIELDS = "fix_dense_vector_wrong_fields";
66-
6765
public static final Set<String> CAPABILITIES;
6866
static {
6967
HashSet<String> capabilities = new HashSet<>();
@@ -94,7 +92,6 @@ private SearchCapabilities() {}
9492
capabilities.add(EXCLUDE_SOURCE_VECTORS_SETTING);
9593
capabilities.add(CLUSTER_STATS_EXTENDED_USAGE);
9694
capabilities.add(REJECT_INVALID_REVERSE_NESTING);
97-
capabilities.add(FIX_DENSE_VECTOR_WRONG_FIELDS);
9895
CAPABILITIES = Set.copyOf(capabilities);
9996
}
10097
}

0 commit comments

Comments
 (0)