|
27 | 27 | import org.elasticsearch.xcontent.XContentBuilder; |
28 | 28 | import org.elasticsearch.xcontent.XContentParser; |
29 | 29 | import org.elasticsearch.xpack.core.XPackPlugin; |
30 | | -import org.elasticsearch.xpack.rank.simplified.SimplifiedInnerRetrieverUtils; |
| 30 | +import org.elasticsearch.xpack.rank.MultiFieldsInnerRetrieverUtils; |
31 | 31 |
|
32 | 32 | import java.io.IOException; |
33 | 33 | import java.util.ArrayList; |
@@ -138,7 +138,7 @@ public ActionRequestValidationException validate( |
138 | 138 | boolean allowPartialSearchResults |
139 | 139 | ) { |
140 | 140 | validationException = super.validate(source, validationException, isScroll, allowPartialSearchResults); |
141 | | - return SimplifiedInnerRetrieverUtils.validateSimplifiedFormatParams( |
| 141 | + return MultiFieldsInnerRetrieverUtils.validateParams( |
142 | 142 | innerRetrievers, |
143 | 143 | fields, |
144 | 144 | query, |
@@ -233,13 +233,13 @@ protected RetrieverBuilder doRewrite(QueryRewriteContext ctx) { |
233 | 233 | ); |
234 | 234 | } |
235 | 235 |
|
236 | | - List<RetrieverSource> fieldsInnerRetrievers = SimplifiedInnerRetrieverUtils.generateInnerRetrievers( |
| 236 | + List<RetrieverSource> fieldsInnerRetrievers = MultiFieldsInnerRetrieverUtils.generateInnerRetrievers( |
237 | 237 | fields, |
238 | 238 | query, |
239 | 239 | localIndicesMetadata.values(), |
240 | 240 | r -> { |
241 | 241 | List<RetrieverSource> retrievers = r.stream() |
242 | | - .map(SimplifiedInnerRetrieverUtils.WeightedRetrieverSource::retrieverSource) |
| 242 | + .map(MultiFieldsInnerRetrieverUtils.WeightedRetrieverSource::retrieverSource) |
243 | 243 | .toList(); |
244 | 244 | return new RRFRetrieverBuilder(retrievers, rankWindowSize, rankConstant); |
245 | 245 | }, |
|
0 commit comments