Skip to content

Commit 3d6b32b

Browse files
committed
Fixed samuel comments
1 parent 19d8ce5 commit 3d6b32b

File tree

2 files changed

+3
-30
lines changed

2 files changed

+3
-30
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void testTopLevelNormalizer() throws IOException {
153153
try (XContentParser parser = createParser(XContentType.JSON.xContent(), json)) {
154154
LinearRetrieverBuilder builder = doParseInstance(parser);
155155
// Test that the top-level normalizer is properly applied - the individual
156-
// retrievers specified "none" but should be overridden by top-level "minmax"
156+
// Per-retriever 'none' should override top-level 'minmax'
157157
ScoreNormalizer[] normalizers = builder.getNormalizers();
158158
assertEquals(2, normalizers.length);
159159
for (ScoreNormalizer normalizer : normalizers) {

x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/linear/10_linear_retriever.yml

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,33 +1492,6 @@ setup:
14921492
- match: { hits.hits.0._id: "1" }
14931493
- close_to: { hits.hits.0._score: { value: 1.0, error: 0.001} }
14941494

1495-
---
1496-
"linear retriever with top-level normalizer - validation test":
1497-
- do:
1498-
catch: /Unknown normalizer \[invalid\]/
1499-
search:
1500-
index: test
1501-
body:
1502-
retriever:
1503-
linear:
1504-
normalizer: invalid
1505-
retrievers: [
1506-
{
1507-
retriever: {
1508-
standard: {
1509-
query: {
1510-
term: {
1511-
keyword: {
1512-
value: "one"
1513-
}
1514-
}
1515-
}
1516-
}
1517-
},
1518-
weight: 1.0
1519-
}
1520-
]
1521-
15221495
---
15231496
"linear retriever with top-level normalizer - empty results":
15241497
- do:
@@ -1901,13 +1874,13 @@ setup:
19011874
---
19021875
"Linear retriever error handling - invalid normalizer":
19031876
- do:
1904-
catch: bad_request
1877+
catch: /Unknown normalizer \[invalid\]/
19051878
search:
19061879
index: test
19071880
body:
19081881
retriever:
19091882
linear:
1910-
normalizer: invalid_normalizer
1883+
normalizer: invalid
19111884
retrievers: [
19121885
{
19131886
retriever: {

0 commit comments

Comments
 (0)