Skip to content

Commit 4ac4940

Browse files
committed
addressed the commentS
1 parent 65cc528 commit 4ac4940

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public final class RRFRetrieverBuilder extends CompoundRetrieverBuilder<RRFRetri
5757
public static final ParseField RANK_CONSTANT_FIELD = new ParseField("rank_constant");
5858
public static final ParseField FIELDS_FIELD = new ParseField("fields");
5959
public static final ParseField QUERY_FIELD = new ParseField("query");
60-
public static final ParseField WEIGHTS_FIELD = new ParseField("weights");
6160

6261
public static final int DEFAULT_RANK_CONSTANT = 60;
6362

@@ -92,7 +91,6 @@ public final class RRFRetrieverBuilder extends CompoundRetrieverBuilder<RRFRetri
9291
PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), QUERY_FIELD);
9392
PARSER.declareInt(ConstructingObjectParser.optionalConstructorArg(), RANK_WINDOW_SIZE_FIELD);
9493
PARSER.declareInt(ConstructingObjectParser.optionalConstructorArg(), RANK_CONSTANT_FIELD);
95-
PARSER.declareFloatArray(ConstructingObjectParser.optionalConstructorArg(), WEIGHTS_FIELD);
9694
RetrieverBuilder.declareBaseParserFields(PARSER);
9795
}
9896

@@ -327,13 +325,6 @@ public void doToXContent(XContentBuilder builder, Params params) throws IOExcept
327325

328326
builder.field(RANK_WINDOW_SIZE_FIELD.getPreferredName(), rankWindowSize);
329327
builder.field(RANK_CONSTANT_FIELD.getPreferredName(), rankConstant);
330-
if (weights.length > 0) {
331-
builder.startArray(WEIGHTS_FIELD.getPreferredName());
332-
for (float weight : weights) {
333-
builder.value(weight);
334-
}
335-
builder.endArray();
336-
}
337328
}
338329

339330
// ---- FOR TESTING XCONTENT PARSING ----

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,7 @@ public static RRFRetrieverComponent fromXContent(XContentParser parser, Retrieve
9494
parser.nextToken();
9595
weight = parser.floatValue();
9696
} else {
97-
if (retriever != null) {
98-
throw new ParsingException(parser.getTokenLocation(), "only one retriever can be specified");
99-
}
100-
throw new ParsingException(
101-
parser.getTokenLocation(),
102-
"unknown field [{}], expected [{}] or [{}]",
103-
fieldName,
104-
RETRIEVER_FIELD.getPreferredName(),
105-
WEIGHT_FIELD.getPreferredName()
106-
);
97+
throw new ParsingException(parser.getTokenLocation(), "unknown field [{}] after retriever", fieldName);
10798
}
10899
} while (parser.nextToken() == XContentParser.Token.FIELD_NAME);
109100

@@ -115,7 +106,8 @@ public static RRFRetrieverComponent fromXContent(XContentParser parser, Retrieve
115106
} else {
116107
RetrieverBuilder retriever = parser.namedObject(RetrieverBuilder.class, firstFieldName, context);
117108
context.trackRetrieverUsage(retriever.getName());
118-
while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
109+
if (parser.nextToken() != XContentParser.Token.END_OBJECT) {
110+
throw new ParsingException(parser.getTokenLocation(), "unknown field [{}] after retriever", parser.currentName());
119111
}
120112
return new RRFRetrieverComponent(retriever, DEFAULT_WEIGHT);
121113
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public void testRRFRetrieverComponentErrorCases() throws IOException {
273273
}
274274
""";
275275

276-
expectParsingException(multipleRetrieversContent, "only one retriever can be specified");
276+
expectParsingException(multipleRetrieversContent, "unknown field [standard] after retriever");
277277

278278
// Test case 2: Weight without retriever
279279
String weightOnlyContent = """

0 commit comments

Comments
 (0)