Skip to content

Commit 532e7df

Browse files
committed
Fixed the comments
1 parent d66f5a6 commit 532e7df

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,6 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContentObject.Para
5656
return builder;
5757
}
5858

59-
@SuppressWarnings("unchecked")
60-
static final ConstructingObjectParser<RRFRetrieverComponent, RetrieverParserContext> PARSER = new ConstructingObjectParser<>(
61-
"rrf_component",
62-
false,
63-
(args, context) -> {
64-
RetrieverBuilder retrieverBuilder = (RetrieverBuilder) args[0];
65-
Float weight = (Float) args[1];
66-
return new RRFRetrieverComponent(retrieverBuilder, weight);
67-
}
68-
);
69-
70-
static {
71-
PARSER.declareNamedObject(constructorArg(), (p, c, n) -> {
72-
RetrieverBuilder innerRetriever = p.namedObject(RetrieverBuilder.class, n, c);
73-
c.trackRetrieverUsage(innerRetriever.getName());
74-
return innerRetriever;
75-
}, RETRIEVER_FIELD);
76-
PARSER.declareFloat(optionalConstructorArg(), WEIGHT_FIELD);
77-
}
78-
7959
public static RRFRetrieverComponent fromXContent(XContentParser parser, RetrieverParserContext context) throws IOException {
8060
if (parser.currentToken() != XContentParser.Token.START_OBJECT) {
8161
throw new ParsingException(parser.getTokenLocation(), "expected object but found [{}]", parser.currentToken());

x-pack/plugin/rank-rrf/src/test/java/org/elasticsearch/xpack/rank/rrf/RRFRetrieverBuilderParsingTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,13 @@ public static RRFRetrieverBuilder createRandomRRFRetrieverBuilder() {
5757

5858
int retrieverCount = randomIntBetween(2, 50);
5959
List<CompoundRetrieverBuilder.RetrieverSource> innerRetrievers = new ArrayList<>(retrieverCount);
60+
float[] weights = new float[retrieverCount];
61+
int i = 0;
6062
while (retrieverCount > 0) {
6163
innerRetrievers.add(CompoundRetrieverBuilder.RetrieverSource.from(TestRetrieverBuilder.createRandomTestRetrieverBuilder()));
64+
weights[i++] = randomFloat();
6265
--retrieverCount;
6366
}
64-
float[] weights = new float[innerRetrievers.size()];
65-
for (int i = 0; i < innerRetrievers.size(); i++) {
66-
weights[i] = randomFloat();
67-
}
6867

6968
return new RRFRetrieverBuilder(innerRetrievers, fields, query, rankWindowSize, rankConstant, weights);
7069
}
@@ -336,7 +335,7 @@ public void testRRFRetrieverComponentErrorCases() throws IOException {
336335
}
337336
""";
338337

339-
expectParsingException(negativeWeightContent, "weight] must be non-negative");
338+
expectParsingException(negativeWeightContent, "[weight] must be non-negative");
340339
}
341340

342341
private void expectParsingException(String restContent, String expectedMessageFragment) throws IOException {

0 commit comments

Comments
 (0)