Skip to content

Commit ff29ab8

Browse files
committed
Added cluster feature
1 parent 337e17d commit ff29ab8

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.elasticsearch.features.FeatureSpecification;
1111
import org.elasticsearch.features.NodeFeature;
1212
import org.elasticsearch.xpack.rank.linear.LinearRetrieverBuilder;
13+
import org.elasticsearch.xpack.rank.rrf.RRFRetrieverBuilder;
1314

1415
import java.util.Set;
1516

@@ -34,7 +35,8 @@ public Set<NodeFeature> getTestFeatures() {
3435
LINEAR_RETRIEVER_MINMAX_SINGLE_DOC_FIX,
3536
LINEAR_RETRIEVER_L2_NORM,
3637
LINEAR_RETRIEVER_MINSCORE_FIX,
37-
LinearRetrieverBuilder.MULTI_FIELDS_QUERY_FORMAT_SUPPORT
38+
LinearRetrieverBuilder.MULTI_FIELDS_QUERY_FORMAT_SUPPORT,
39+
RRFRetrieverBuilder.MULTI_FIELDS_QUERY_FORMAT_SUPPORT
3840
);
3941
}
4042
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.elasticsearch.action.ActionRequestValidationException;
1212
import org.elasticsearch.action.ResolvedIndices;
1313
import org.elasticsearch.common.util.Maps;
14+
import org.elasticsearch.features.NodeFeature;
1415
import org.elasticsearch.index.query.MatchNoneQueryBuilder;
1516
import org.elasticsearch.index.query.QueryBuilder;
1617
import org.elasticsearch.index.query.QueryRewriteContext;
@@ -46,6 +47,9 @@
4647
* formula.
4748
*/
4849
public final class RRFRetrieverBuilder extends CompoundRetrieverBuilder<RRFRetrieverBuilder> {
50+
public static final NodeFeature MULTI_FIELDS_QUERY_FORMAT_SUPPORT = new NodeFeature(
51+
"rrf_retriever.multi_fields_query_format_support"
52+
);
4953

5054
public static final String NAME = "rrf";
5155

@@ -218,6 +222,7 @@ protected RetrieverBuilder doRewrite(QueryRewriteContext ctx) {
218222

219223
ResolvedIndices resolvedIndices = ctx.getResolvedIndices();
220224
if (resolvedIndices != null && query != null) {
225+
// TODO: Refactor duplicate code
221226
// Using the multi-fields query format
222227
var localIndicesMetadata = resolvedIndices.getConcreteLocalIndicesMetadata();
223228
if (localIndicesMetadata.size() > 1) {

0 commit comments

Comments
 (0)