Skip to content

Commit 288222a

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 20b2820 commit 288222a

File tree

4 files changed

+22
-27
lines changed

4 files changed

+22
-27
lines changed

server/src/main/java/org/elasticsearch/search/retriever/rankdoc/RankDocsQuery.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,10 @@ public Query rewrite(IndexSearcher searcher) throws IOException {
334334
public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost) throws IOException {
335335
Query combinedQuery;
336336
if (onlyRankDocs) {
337-
combinedQuery = topQuery;
337+
combinedQuery = topQuery;
338338
} else {
339339
if (tailQuery == null) {
340-
combinedQuery = topQuery;
340+
combinedQuery = topQuery;
341341
} else {
342342
var combined = new BooleanQuery.Builder().add(topQuery, BooleanClause.Occur.SHOULD)
343343
.add(tailQuery, BooleanClause.Occur.FILTER)

server/src/test/java/org/elasticsearch/index/query/RankDocsQueryBuilderTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,7 @@ public void testRankDocsQueryMinScoreFiltering() throws IOException {
294294
}
295295

296296
float minScore = 1.5f;
297-
RankDoc[] rankDocs = new RankDoc[] {
298-
new RankDoc(0, 2.0f, 0),
299-
new RankDoc(1, 1.0f, 0),
300-
new RankDoc(2, 1.6f, 0)
301-
};
297+
RankDoc[] rankDocs = new RankDoc[] { new RankDoc(0, 2.0f, 0), new RankDoc(1, 1.0f, 0), new RankDoc(2, 1.6f, 0) };
302298
Arrays.sort(rankDocs);
303299
for (int i = 0; i < rankDocs.length; i++) {
304300
rankDocs[i].rank = i;
@@ -313,7 +309,7 @@ public void testRankDocsQueryMinScoreFiltering() throws IOException {
313309
IndexSearcher searcher = newSearcher(reader);
314310
TopDocs topDocs = searcher.search(query, 10);
315311

316-
long expectedTotalHits = 2;
312+
long expectedTotalHits = 2;
317313
long expectedFilteredHits = 2;
318314
assertEquals("Total hits should match filtered count", expectedTotalHits, topDocs.totalHits.value());
319315
assertEquals("Number of score docs should match filtered count", expectedFilteredHits, topDocs.scoreDocs.length);

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import java.util.List;
3232
import java.util.Map;
3333

34+
import static org.elasticsearch.index.query.RankDocsQueryBuilder.DEFAULT_MIN_SCORE;
3435
import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg;
3536
import static org.elasticsearch.xcontent.ConstructingObjectParser.optionalConstructorArg;
36-
import static org.elasticsearch.index.query.RankDocsQueryBuilder.DEFAULT_MIN_SCORE;
3737
import static org.elasticsearch.xpack.rank.RankRRFFeatures.LINEAR_RETRIEVER_SUPPORTED;
3838
import static org.elasticsearch.xpack.rank.linear.LinearRetrieverComponent.DEFAULT_WEIGHT;
3939

@@ -107,14 +107,20 @@ public static LinearRetrieverBuilder fromXContent(XContentParser parser, Retriev
107107
}
108108

109109
LinearRetrieverBuilder(List<RetrieverSource> innerRetrievers, int rankWindowSize) {
110-
this(innerRetrievers, rankWindowSize, getDefaultWeight(innerRetrievers.size()), getDefaultNormalizers(innerRetrievers.size()), DEFAULT_MIN_SCORE);
110+
this(
111+
innerRetrievers,
112+
rankWindowSize,
113+
getDefaultWeight(innerRetrievers.size()),
114+
getDefaultNormalizers(innerRetrievers.size()),
115+
DEFAULT_MIN_SCORE
116+
);
111117
}
112118

113119
public LinearRetrieverBuilder(
114120
List<RetrieverSource> innerRetrievers,
115121
int rankWindowSize,
116122
float[] weights,
117-
ScoreNormalizer[] normalizers,
123+
ScoreNormalizer[] normalizers,
118124
float minScore
119125
) {
120126
super(innerRetrievers, rankWindowSize);

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

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ public void testCombineInnerRetrieverResultsCalculatesWeightedSum() throws IOExc
2222
ScoreNormalizer[] normalizers = new ScoreNormalizer[] { IdentityScoreNormalizer.INSTANCE, IdentityScoreNormalizer.INSTANCE };
2323
float minScore = 0f;
2424

25-
LinearRetrieverBuilder builder = new LinearRetrieverBuilder(
26-
sources, rankWindowSize, weights, normalizers, minScore
27-
);
25+
LinearRetrieverBuilder builder = new LinearRetrieverBuilder(sources, rankWindowSize, weights, normalizers, minScore);
2826

2927
ScoreDoc[] left = new ScoreDoc[] { new ScoreDoc(5, 1.0f, 0), new ScoreDoc(6, 2.0f, 0) };
3028
ScoreDoc[] right = new ScoreDoc[] { new ScoreDoc(5, 3.0f, 0), new ScoreDoc(6, 1.0f, 0), new ScoreDoc(7, 0.5f, 0) };
@@ -56,39 +54,34 @@ public void testCombineAndFilterWithMinScore() throws IOException {
5654
ScoreNormalizer[] normalizers = new ScoreNormalizer[] { IdentityScoreNormalizer.INSTANCE, IdentityScoreNormalizer.INSTANCE };
5755
final float minScoreThreshold = 1.5f;
5856

59-
LinearRetrieverBuilder builder = new LinearRetrieverBuilder(
60-
sources, rankWindowSize, weights, normalizers, minScoreThreshold
61-
);
62-
assertEquals(minScoreThreshold, builder.getMinScore(), 0f);
57+
LinearRetrieverBuilder builder = new LinearRetrieverBuilder(sources, rankWindowSize, weights, normalizers, minScoreThreshold);
58+
assertEquals(minScoreThreshold, builder.getMinScore(), 0f);
6359

6460
ScoreDoc[] left = new ScoreDoc[] { new ScoreDoc(0, 1.0f, 0), new ScoreDoc(1, 0.8f, 0) };
6561
ScoreDoc[] right = new ScoreDoc[] { new ScoreDoc(0, 2.0f, 0), new ScoreDoc(1, 0.6f, 0), new ScoreDoc(2, 1.8f, 0) };
6662

6763
RankDoc[] combinedRankDocs = builder.combineInnerRetrieverResults(List.of(left, right), false);
6864
assertEquals("Combined docs before filtering", 3, combinedRankDocs.length);
6965

70-
List<RankDoc> filteredDocs = Stream.of(combinedRankDocs)
71-
.filter(rd -> rd.score >= builder.getMinScore())
72-
.sorted()
73-
.toList();
66+
List<RankDoc> filteredDocs = Stream.of(combinedRankDocs).filter(rd -> rd.score >= builder.getMinScore()).sorted().toList();
7467

7568
assertEquals("Filtered docs count", 2, filteredDocs.size());
7669

7770
boolean foundDoc0 = false;
7871
boolean foundDoc2 = false;
7972
for (RankDoc scoreDoc : filteredDocs) {
80-
assertTrue("Score should be >= minScore", scoreDoc.score >= minScoreThreshold);
73+
assertTrue("Score should be >= minScore", scoreDoc.score >= minScoreThreshold);
8174
if (scoreDoc.doc == 0) {
82-
assertEquals("Doc 0 score", 3.0f, scoreDoc.score, 0.001f);
75+
assertEquals("Doc 0 score", 3.0f, scoreDoc.score, 0.001f);
8376
foundDoc0 = true;
8477
} else if (scoreDoc.doc == 2) {
85-
assertEquals("Doc 2 score", 1.8f, scoreDoc.score, 0.001f);
78+
assertEquals("Doc 2 score", 1.8f, scoreDoc.score, 0.001f);
8679
foundDoc2 = true;
8780
} else {
88-
fail("Unexpected document ID returned: " + scoreDoc.doc + " (should have been filtered)");
81+
fail("Unexpected document ID returned: " + scoreDoc.doc + " (should have been filtered)");
8982
}
9083
}
9184
assertTrue("Document 0 should have been found", foundDoc0);
9285
assertTrue("Document 2 should have been found", foundDoc2);
9386
}
94-
}
87+
}

0 commit comments

Comments
 (0)