iter

pmpailis · Dec 3, 2024 · 35274e7 · 35274e7
1 parent a8baf0a
commit 35274e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/server/src/main/java/org/elasticsearch/search/retriever/CompoundRetrieverBuilder.java b/server/src/main/java/org/elasticsearch/search/retriever/CompoundRetrieverBuilder.java
@@ -47,7 +47,7 @@
  */
 public abstract class CompoundRetrieverBuilder<T extends CompoundRetrieverBuilder<T>> extends RetrieverBuilder {
 
-    public static final NodeFeature CHILD_RETRIEVERS_FILTER_SUPPORT = new NodeFeature("child_retrievers_filter_support");
+    public static final NodeFeature INNER_RETRIEVERS_FILTER_SUPPORT = new NodeFeature("inner_retrievers_filter_support");
 
     public record RetrieverSource(RetrieverBuilder retriever, SearchSourceBuilder source) {}
 
@@ -67,7 +67,7 @@ public T addChild(RetrieverBuilder retrieverBuilder) {
 
     /**
      * Returns a clone of the original retriever, replacing the sub-retrievers with
-     * the provided {@code newChildRetrievers}.
+     * the provided {@code newChildRetrievers} and the filters with the {@code newPreFilterQueryBuilders}.
      */
     protected abstract T clone(List<RetrieverSource> newChildRetrievers, List<QueryBuilder> newPreFilterQueryBuilders);
 

diff --git a/x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/rrf/RRFFeatures.java b/x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/rrf/RRFFeatures.java
@@ -12,7 +12,7 @@
 
 import java.util.Set;
 
-import static org.elasticsearch.search.retriever.CompoundRetrieverBuilder.CHILD_RETRIEVERS_FILTER_SUPPORT;
+import static org.elasticsearch.search.retriever.CompoundRetrieverBuilder.INNER_RETRIEVERS_FILTER_SUPPORT;
 import static org.elasticsearch.xpack.rank.rrf.RRFRetrieverBuilder.RRF_RETRIEVER_COMPOSITION_SUPPORTED;
 
 /**
@@ -27,6 +27,6 @@ public Set<NodeFeature> getFeatures() {
 
     @Override
     public Set<NodeFeature> getTestFeatures() {
-        return Set.of(CHILD_RETRIEVERS_FILTER_SUPPORT);
+        return Set.of(INNER_RETRIEVERS_FILTER_SUPPORT);
     }
 }
diff --git a/...lRestTest/resources/rest-api-spec/test/rrf/700_rrf_retriever_search_api_compatibility.yml b/...lRestTest/resources/rest-api-spec/test/rrf/700_rrf_retriever_search_api_compatibility.yml
@@ -1076,7 +1076,7 @@ setup:
 ---
 "rrf retriever with filters to be passed to nested rrf retrievers":
   - requires:
-      cluster_features: 'child_retrievers_filter_support'
+      cluster_features: 'inner_retrievers_filter_support'
       reason: 'requires fix for properly propagating filters to nested sub-retrievers'
 
   - do:
@@ -1138,7 +1138,7 @@ setup:
                   rank_constant: 10
                 }
             }
-          size: 3
+          size: 10
 
   - match: { hits.total.value: 2 }
   - match: { hits.hits.0._id: "5" }