Skip to content

Commit bbdc84e

Browse files
committed
Add capability
1 parent 38b4488 commit bbdc84e

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

modules/aggregations/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ esplugin {
2020

2121
restResources {
2222
restApi {
23-
include '_common', 'indices', 'cluster', 'index', 'search', 'nodes', 'bulk', 'scripts_painless_execute', 'put_script'
23+
include 'capabilities', '_common', 'indices', 'cluster', 'index', 'search', 'nodes', 'bulk', 'scripts_painless_execute', 'put_script'
2424
}
2525
restTests {
2626
// Pulls in all aggregation tests from core AND the forwards v7's core for forwards compatibility

modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,12 @@ setup:
144144
---
145145
"Test random_sampler aggregation with scored subagg":
146146
- requires:
147-
cluster_features: ["gte_v8.2.0"]
148-
reason: added in 8.2.0
147+
capabilities:
148+
- method: POST
149+
path: /_search
150+
capabilities: [ random_sampler_with_scored_subaggs ]
151+
test_runner_features: capabilities
152+
reason: "Support for random sampler with scored subaggs capability required"
149153
- do:
150154
search:
151155
index: data

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ private SearchCapabilities() {}
4141
/** Support multi-dense-vector script field access. */
4242
private static final String MULTI_DENSE_VECTOR_SCRIPT_ACCESS = "multi_dense_vector_script_access";
4343

44+
private static final String RANDOM_SAMPLER_WITH_SCORED_SUBAGGS = "random_sampler_with_scored_subaggs";
45+
4446
public static final Set<String> CAPABILITIES;
4547
static {
4648
HashSet<String> capabilities = new HashSet<>();
@@ -50,6 +52,7 @@ private SearchCapabilities() {}
5052
capabilities.add(DENSE_VECTOR_DOCVALUE_FIELDS);
5153
capabilities.add(TRANSFORM_RANK_RRF_TO_RETRIEVER);
5254
capabilities.add(NESTED_RETRIEVER_INNER_HITS_SUPPORT);
55+
capabilities.add(RANDOM_SAMPLER_WITH_SCORED_SUBAGGS);
5356
if (MultiDenseVectorFieldMapper.FEATURE_FLAG.isEnabled()) {
5457
capabilities.add(MULTI_DENSE_VECTOR_FIELD_MAPPER);
5558
capabilities.add(MULTI_DENSE_VECTOR_SCRIPT_ACCESS);

0 commit comments

Comments
 (0)