Skip to content

Commit 955da1f

Browse files
carlosdelestcarlosdelest
committed
Fix refactoring, spotless
1 parent 4497b92 commit 955da1f

File tree

8 files changed

+40
-19
lines changed

8 files changed

+40
-19
lines changed

‎server/src/main/java/org/elasticsearch/search/retriever/KnnRetrieverBuilder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ public final class KnnRetrieverBuilder extends RetrieverBuilder {
7676
(QueryVectorBuilder) args[2],
7777
(int) args[3],
7878
(int) args[4],
79-
(RescoreVectorBuilder) args[6], (Float) args[5]
79+
(RescoreVectorBuilder) args[6],
80+
(Float) args[5]
8081
);
8182
}
8283
);

‎server/src/test/java/org/elasticsearch/search/retriever/KnnRetrieverBuilderParsingTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ public static KnnRetrieverBuilder createRandomKnnRetrieverBuilder() {
6262
null,
6363
k,
6464
numCands,
65-
rescoreVectorBuilder, similarity
65+
rescoreVectorBuilder,
66+
similarity
6667
);
6768

6869
List<QueryBuilder> preFilterQueryBuilders = new ArrayList<>();

‎server/src/test/java/org/elasticsearch/search/retriever/RankDocsRetrieverBuilderTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ private List<RetrieverBuilder> innerRetrievers(QueryRewriteContext queryRewriteC
7070
null,
7171
randomInt(10),
7272
randomIntBetween(10, 100),
73-
randomBoolean() ? null : new RescoreVectorBuilder(randomFloatBetween(1.0f, 10.0f, false)), randomFloat()
73+
randomBoolean() ? null : new RescoreVectorBuilder(randomFloatBetween(1.0f, 10.0f, false)),
74+
randomFloat()
7475
);
7576
if (randomBoolean()) {
7677
knnRetrieverBuilder.preFilterQueryBuilders = preFilters(queryRewriteContext);

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankRetrieverTelemetryTests.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,11 @@ public void testTelemetryForRRFRetriever() throws IOException {
102102

103103
// search#1 - this will record 1 entry for "retriever" in `sections`, and 1 for "knn" under `retrievers`
104104
{
105-
performSearch(new SearchSourceBuilder().retriever(new KnnRetrieverBuilder("vector", new float[] { 1.0f }, null, 10, 15, (RescoreVectorBuilder) args[6], null)));
105+
performSearch(
106+
new SearchSourceBuilder().retriever(
107+
new KnnRetrieverBuilder("vector", new float[] { 1.0f }, null, 10, 15, null, null)
108+
)
109+
);
106110
}
107111

108112
// search#2 - this will record 1 entry for "retriever" in `sections`, 1 for "standard" under `retrievers`, and 1 for "range" under
@@ -146,7 +150,9 @@ public void testTelemetryForRRFRetriever() throws IOException {
146150

147151
// search#6 - this will record 1 entry for "knn" in `sections`
148152
{
149-
performSearch(new SearchSourceBuilder().knnSearch(List.of(new KnnSearchBuilder("vector", new float[] { 1.0f }, 10, 15, null))));
153+
performSearch(
154+
new SearchSourceBuilder().knnSearch(List.of(new KnnSearchBuilder("vector", new float[] { 1.0f }, 10, 15, null, null)))
155+
);
150156
}
151157

152158
// search#7 - this will record 1 entry for "query" in `sections`, and 1 for "match_all" under `queries`

‎x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRetrieverBuilderIT.java‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ public void testRRFPagination() {
183183
);
184184
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
185185
// this one retrieves docs 2, 3, 6, and 7
186-
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, (RescoreVectorBuilder) args[6], null);
186+
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(
187+
VECTOR_FIELD,
188+
new float[] { 2.0f },
189+
null,
190+
10,
191+
100,
192+
null,
193+
null
194+
);
187195
source.retriever(
188196
new RRFRetrieverBuilder(
189197
Arrays.asList(
@@ -233,7 +241,7 @@ public void testRRFWithAggs() {
233241
);
234242
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
235243
// this one retrieves docs 2, 3, 6, and 7
236-
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, (RescoreVectorBuilder) args[6], null);
244+
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, null, null);
237245
source.retriever(
238246
new RRFRetrieverBuilder(
239247
Arrays.asList(
@@ -288,7 +296,7 @@ public void testRRFWithCollapse() {
288296
);
289297
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
290298
// this one retrieves docs 2, 3, 6, and 7
291-
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, (RescoreVectorBuilder) args[6], null);
299+
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, null, null);
292300
source.retriever(
293301
new RRFRetrieverBuilder(
294302
Arrays.asList(
@@ -345,7 +353,7 @@ public void testRRFRetrieverWithCollapseAndAggs() {
345353
);
346354
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
347355
// this one retrieves docs 2, 3, 6, and 7
348-
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, (RescoreVectorBuilder) args[6], null);
356+
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, null, null);
349357
source.retriever(
350358
new RRFRetrieverBuilder(
351359
Arrays.asList(
@@ -411,7 +419,7 @@ public void testMultipleRRFRetrievers() {
411419
);
412420
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
413421
// this one retrieves docs 2, 3, 6, and 7
414-
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, (RescoreVectorBuilder) args[6], null);
422+
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, null, null);
415423
source.retriever(
416424
new RRFRetrieverBuilder(
417425
Arrays.asList(
@@ -430,7 +438,7 @@ public void testMultipleRRFRetrievers() {
430438
),
431439
// this one bring just doc 7 which should be ranked first eventually
432440
new CompoundRetrieverBuilder.RetrieverSource(
433-
new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 7.0f }, null, 1, 100, (RescoreVectorBuilder) args[6], null),
441+
new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 7.0f }, null, 1, 100, null, null),
434442
null
435443
)
436444
),
@@ -477,7 +485,7 @@ public void testRRFExplainWithNamedRetrievers() {
477485
);
478486
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
479487
// this one retrieves docs 2, 3, 6, and 7
480-
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, (RescoreVectorBuilder) args[6], null);
488+
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, null, null);
481489
source.retriever(
482490
new RRFRetrieverBuilder(
483491
Arrays.asList(
@@ -536,7 +544,7 @@ public void testRRFExplainWithAnotherNestedRRF() {
536544
);
537545
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
538546
// this one retrieves docs 2, 3, 6, and 7
539-
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, (RescoreVectorBuilder) args[6], null);
547+
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 2.0f }, null, 10, 100, null, null);
540548

541549
RRFRetrieverBuilder nestedRRF = new RRFRetrieverBuilder(
542550
Arrays.asList(
@@ -773,7 +781,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
773781
throw new IllegalStateException("Should not be called");
774782
}
775783
};
776-
var knn = new KnnRetrieverBuilder("vector", null, vectorBuilder, 10, 10, (RescoreVectorBuilder) args[6], null);
784+
var knn = new KnnRetrieverBuilder("vector", null, vectorBuilder, 10, 10, null, null);
777785
var standard = new StandardRetrieverBuilder(new KnnVectorQueryBuilder("vector", vectorBuilder, 10, 10, null));
778786
var rrf = new RRFRetrieverBuilder(
779787
List.of(new CompoundRetrieverBuilder.RetrieverSource(knn, null), new CompoundRetrieverBuilder.RetrieverSource(standard, null)),

‎x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRetrieverBuilderNestedDocsIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public void testRRFRetrieverWithNestedQuery() {
149149
);
150150
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
151151
// this one retrieves docs 6
152-
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 6.0f }, null, 1, 100, (RescoreVectorBuilder) args[6], null);
152+
KnnRetrieverBuilder knnRetrieverBuilder = new KnnRetrieverBuilder(VECTOR_FIELD, new float[] { 6.0f }, null, 1, 100, null, null);
153153
source.retriever(
154154
new RRFRetrieverBuilder(
155155
Arrays.asList(

‎x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRetrieverTelemetryIT.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ public void testTelemetryForRRFRetriever() throws IOException {
103103

104104
// search#1 - this will record 1 entry for "retriever" in `sections`, and 1 for "knn" under `retrievers`
105105
{
106-
performSearch(new SearchSourceBuilder().retriever(new KnnRetrieverBuilder("vector", new float[] { 1.0f }, null, 10, 15, (RescoreVectorBuilder) args[6], null)));
106+
performSearch(
107+
new SearchSourceBuilder().retriever(new KnnRetrieverBuilder("vector", new float[] { 1.0f }, null, 10, 15, null, null))
108+
);
107109
}
108110

109111
// search#2 - this will record 1 entry for "retriever" in `sections`, 1 for "standard" under `retrievers`, and 1 for "range" under
@@ -136,7 +138,7 @@ public void testTelemetryForRRFRetriever() throws IOException {
136138
new RRFRetrieverBuilder(
137139
Arrays.asList(
138140
new CompoundRetrieverBuilder.RetrieverSource(
139-
new KnnRetrieverBuilder("vector", new float[] { 1.0f }, null, 10, 15, (RescoreVectorBuilder) args[6], null),
141+
new KnnRetrieverBuilder("vector", new float[] { 1.0f }, null, 10, 15, null, null),
140142
null
141143
),
142144
new CompoundRetrieverBuilder.RetrieverSource(
@@ -153,7 +155,9 @@ public void testTelemetryForRRFRetriever() throws IOException {
153155

154156
// search#6 - this will record 1 entry for "knn" in `sections`
155157
{
156-
performSearch(new SearchSourceBuilder().knnSearch(List.of(new KnnSearchBuilder("vector", new float[] { 1.0f }, 10, 15, null))));
158+
performSearch(
159+
new SearchSourceBuilder().knnSearch(List.of(new KnnSearchBuilder("vector", new float[] { 1.0f }, 10, 15, null, null)))
160+
);
157161
}
158162

159163
// search#7 - this will record 1 entry for "query" in `sections`, and 1 for "match_all" under `queries`

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public RetrieverBuilder toRetriever(SearchSourceBuilder source, Predicate<NodeFe
217217
knnSearchBuilder.getNumCands(),
218218
knnSearchBuilder.getRescoreVectorBuilder(),
219219
knnSearchBuilder.getSimilarity()
220-
);
220+
);
221221
knnRetriever.retrieverName(knnSearchBuilder.queryName());
222222
retrieverSources.add(new CompoundRetrieverBuilder.RetrieverSource(knnRetriever, null));
223223
}

0 commit comments

Comments
 (0)