Skip to content

Commit d7c6dbd

Browse files
committed
worked on all the changes
1 parent 45e2f7e commit d7c6dbd

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/RankRRFFeatures.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class RankRRFFeatures implements FeatureSpecification {
2626

2727
@Override
2828
public Set<NodeFeature> getFeatures() {
29-
return Set.of(LINEAR_RETRIEVER_SUPPORTED, LINEAR_RETRIEVER_TOP_LEVEL_NORMALIZER);
29+
return Set.of(LINEAR_RETRIEVER_SUPPORTED);
3030
}
3131

3232
@Override
@@ -38,7 +38,8 @@ public Set<NodeFeature> getTestFeatures() {
3838
LINEAR_RETRIEVER_MINSCORE_FIX,
3939
LinearRetrieverBuilder.MULTI_FIELDS_QUERY_FORMAT_SUPPORT,
4040
RRFRetrieverBuilder.MULTI_FIELDS_QUERY_FORMAT_SUPPORT,
41-
RRFRetrieverBuilder.WEIGHTED_SUPPORT
41+
RRFRetrieverBuilder.WEIGHTED_SUPPORT,
42+
LINEAR_RETRIEVER_TOP_LEVEL_NORMALIZER
4243
);
4344
}
4445
}

x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/linear/10_linear_retriever.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,7 @@ setup:
13861386
---
13871387
"linear retriever with top-level normalizer - l2_norm":
13881388
- requires:
1389-
cluster_features: [ "linear_retriever.l2_norm", "linear_retriever.top_level_normalizer" ]
1389+
cluster_features: [ "linear_retriever.top_level_normalizer" ]
13901390
reason: "Support for L2 normalization and top-level normalizer in linear retriever"
13911391
- do:
13921392
search:
@@ -1435,7 +1435,7 @@ setup:
14351435
---
14361436
"linear retriever with top-level normalizer and per-retriever override":
14371437
- requires:
1438-
cluster_features: [ "linear_retriever.l2_norm", "linear_retriever.top_level_normalizer" ]
1438+
cluster_features: [ "linear_retriever.top_level_normalizer" ]
14391439
reason: "Support for L2 normalization and top-level normalizer in linear retriever"
14401440
- do:
14411441
search:
@@ -1517,7 +1517,7 @@ setup:
15171517
---
15181518
"Linear retriever with per-retriever normalizer override":
15191519
- requires:
1520-
cluster_features: [ "linear_retriever.l2_norm", "linear_retriever.top_level_normalizer" ]
1520+
cluster_features: [ "linear_retriever.top_level_normalizer" ]
15211521
reason: "Support for L2 normalization and top-level normalizer in linear retriever"
15221522
- do:
15231523
search:
@@ -1577,7 +1577,7 @@ setup:
15771577
---
15781578
"Linear retriever with mixed normalizers - inheritance test":
15791579
- requires:
1580-
cluster_features: [ "linear_retriever.l2_norm" ]
1580+
cluster_features: [ "linear_retriever.top_level_normalizer" ]
15811581
reason: "Support for L2 normalization"
15821582

15831583
- do:
@@ -1880,7 +1880,7 @@ setup:
18801880
---
18811881
"Linear retriever with large score differences and L2 normalization":
18821882
- requires:
1883-
cluster_features: [ "linear_retriever.l2_norm", "linear_retriever.top_level_normalizer" ]
1883+
cluster_features: [ "linear_retriever.top_level_normalizer" ]
18841884
reason: "Support for L2 normalization and top-level normalizer in linear retriever"
18851885
- do:
18861886
search:

0 commit comments

Comments
 (0)