Skip to content

Commit cca6e39

Browse files
carlosdelestcarlosdelest
committed
Fix test commpilation
1 parent 934eedb commit cca6e39

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void setupSuiteScopeCluster() throws Exception {
136136

137137
public void testTotalDocsSmallerThanSize() {
138138
float[] queryVector = { 0.0f };
139-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector", queryVector, 3, 3, null);
139+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector", queryVector, 3, 3, null, null);
140140
assertResponse(
141141
prepareSearch("tiny_index").setRankBuilder(new RRFRankBuilder(100, 1))
142142
.setKnnSearch(List.of(knnSearch))
@@ -167,7 +167,7 @@ public void testTotalDocsSmallerThanSize() {
167167

168168
public void testBM25AndKnn() {
169169
float[] queryVector = { 500.0f };
170-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null);
170+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null);
171171
assertResponse(
172172
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1))
173173
.setTrackTotalHits(false)
@@ -208,8 +208,8 @@ public void testBM25AndKnn() {
208208
public void testMultipleOnlyKnn() {
209209
float[] queryVectorAsc = { 500.0f };
210210
float[] queryVectorDesc = { 500.0f };
211-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null);
212-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null);
211+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null, null);
212+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null, null);
213213
assertResponse(
214214
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(51, 1))
215215
.setTrackTotalHits(true)
@@ -260,8 +260,8 @@ public void testMultipleOnlyKnn() {
260260
public void testBM25AndMultipleKnn() {
261261
float[] queryVectorAsc = { 500.0f };
262262
float[] queryVectorDesc = { 500.0f };
263-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null);
264-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null);
263+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null, null);
264+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null, null);
265265
assertResponse(
266266
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(51, 1))
267267
.setTrackTotalHits(false)
@@ -332,7 +332,7 @@ public void testBM25AndMultipleKnn() {
332332

333333
public void testBM25AndKnnWithBucketAggregation() {
334334
float[] queryVector = { 500.0f };
335-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null);
335+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null);
336336
assertResponse(
337337
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1))
338338
.setTrackTotalHits(true)
@@ -389,8 +389,8 @@ public void testBM25AndKnnWithBucketAggregation() {
389389
public void testMultipleOnlyKnnWithAggregation() {
390390
float[] queryVectorAsc = { 500.0f };
391391
float[] queryVectorDesc = { 500.0f };
392-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null);
393-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null);
392+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null, null);
393+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null, null);
394394
assertResponse(
395395
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(51, 1))
396396
.setTrackTotalHits(false)
@@ -457,8 +457,8 @@ public void testMultipleOnlyKnnWithAggregation() {
457457
public void testBM25AndMultipleKnnWithAggregation() {
458458
float[] queryVectorAsc = { 500.0f };
459459
float[] queryVectorDesc = { 500.0f };
460-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null);
461-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null);
460+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null, null);
461+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null, null);
462462
assertResponse(
463463
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(51, 1))
464464
.setTrackTotalHits(true)
@@ -704,7 +704,7 @@ public void testMultiBM25WithAggregation() {
704704

705705
public void testMultiBM25AndSingleKnn() {
706706
float[] queryVector = { 500.0f };
707-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null);
707+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null);
708708
assertResponse(
709709
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1))
710710
.setTrackTotalHits(false)
@@ -762,7 +762,7 @@ public void testMultiBM25AndSingleKnn() {
762762

763763
public void testMultiBM25AndSingleKnnWithAggregation() {
764764
float[] queryVector = { 500.0f };
765-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null);
765+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null);
766766
assertResponse(
767767
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1))
768768
.setTrackTotalHits(false)
@@ -837,8 +837,8 @@ public void testMultiBM25AndSingleKnnWithAggregation() {
837837
public void testMultiBM25AndMultipleKnn() {
838838
float[] queryVectorAsc = { 500.0f };
839839
float[] queryVectorDesc = { 500.0f };
840-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null);
841-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null);
840+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null, null);
841+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null, null);
842842
assertResponse(
843843
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1))
844844
.setTrackTotalHits(false)
@@ -899,8 +899,8 @@ public void testMultiBM25AndMultipleKnn() {
899899
public void testMultiBM25AndMultipleKnnWithAggregation() {
900900
float[] queryVectorAsc = { 500.0f };
901901
float[] queryVectorDesc = { 500.0f };
902-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null);
903-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null);
902+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null, null);
903+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null, null);
904904
assertResponse(
905905
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1))
906906
.setTrackTotalHits(false)
@@ -979,7 +979,7 @@ public void testBasicRRFExplain() {
979979
// the first result should be the one present in both queries (i.e. doc with text0: 10 and vector: [10]) and the other ones
980980
// should only match the knn query
981981
float[] queryVector = { 9f };
982-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null).queryName("my_knn_search");
982+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null).queryName("my_knn_search");
983983
assertResponse(
984984
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(100, 1))
985985
.setKnnSearch(List.of(knnSearch))
@@ -1045,7 +1045,7 @@ public void testRRFExplainUnknownField() {
10451045
// in this test we try knn with a query on an unknown field that would be rewritten to MatchNoneQuery
10461046
// so we expect results and explanations only for the first part
10471047
float[] queryVector = { 9f };
1048-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null).queryName("my_knn_search");
1048+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null).queryName("my_knn_search");
10491049
assertResponse(
10501050
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(100, 1))
10511051
.setKnnSearch(List.of(knnSearch))
@@ -1112,7 +1112,7 @@ public void testRRFExplainOneUnknownFieldSubSearches() {
11121112
// while the other one would produce a match.
11131113
// So, we'd have a total of 3 queries, a (rewritten) MatchNoneQuery, a TermQuery, and a kNN query
11141114
float[] queryVector = { 9f };
1115-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null).queryName("my_knn_search");
1115+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null).queryName("my_knn_search");
11161116
assertResponse(
11171117
prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(100, 1))
11181118
.setKnnSearch(List.of(knnSearch))

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void setupIndices() throws Exception {
131131

132132
public void testTotalDocsSmallerThanSize() {
133133
float[] queryVector = { 0.0f };
134-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector", queryVector, 3, 3, null);
134+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector", queryVector, 3, 3, null, null);
135135

136136
assertResponse(
137137
client().prepareSearch("tiny_index")
@@ -164,7 +164,7 @@ public void testTotalDocsSmallerThanSize() {
164164

165165
public void testBM25AndKnn() {
166166
float[] queryVector = { 500.0f };
167-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null);
167+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null);
168168
assertResponse(
169169
client().prepareSearch("nrd_index")
170170
.setRankBuilder(new RRFRankBuilder(101, 1))
@@ -206,8 +206,8 @@ public void testBM25AndKnn() {
206206
public void testMultipleOnlyKnn() {
207207
float[] queryVectorAsc = { 500.0f };
208208
float[] queryVectorDesc = { 500.0f };
209-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null);
210-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null);
209+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null, null);
210+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null, null);
211211
assertResponse(
212212
client().prepareSearch("nrd_index")
213213
.setRankBuilder(new RRFRankBuilder(51, 1))
@@ -259,8 +259,8 @@ public void testMultipleOnlyKnn() {
259259
public void testBM25AndMultipleKnn() {
260260
float[] queryVectorAsc = { 500.0f };
261261
float[] queryVectorDesc = { 500.0f };
262-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null);
263-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null);
262+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null, null);
263+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null, null);
264264
assertResponse(
265265
client().prepareSearch("nrd_index")
266266
.setRankBuilder(new RRFRankBuilder(51, 1))
@@ -332,7 +332,7 @@ public void testBM25AndMultipleKnn() {
332332

333333
public void testBM25AndKnnWithBucketAggregation() {
334334
float[] queryVector = { 500.0f };
335-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null);
335+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null);
336336
assertResponse(
337337
client().prepareSearch("nrd_index")
338338
.setRankBuilder(new RRFRankBuilder(101, 1))
@@ -390,8 +390,8 @@ public void testBM25AndKnnWithBucketAggregation() {
390390
public void testMultipleOnlyKnnWithAggregation() {
391391
float[] queryVectorAsc = { 500.0f };
392392
float[] queryVectorDesc = { 500.0f };
393-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null);
394-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null);
393+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null, null);
394+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null, null);
395395
assertResponse(
396396
client().prepareSearch("nrd_index")
397397
.setRankBuilder(new RRFRankBuilder(51, 1))
@@ -459,8 +459,8 @@ public void testMultipleOnlyKnnWithAggregation() {
459459
public void testBM25AndMultipleKnnWithAggregation() {
460460
float[] queryVectorAsc = { 500.0f };
461461
float[] queryVectorDesc = { 500.0f };
462-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null);
463-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null);
462+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null, null);
463+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null, null);
464464
assertResponse(
465465
client().prepareSearch("nrd_index")
466466
.setRankBuilder(new RRFRankBuilder(51, 1))
@@ -709,7 +709,7 @@ public void testMultiBM25WithAggregation() {
709709

710710
public void testMultiBM25AndSingleKnn() {
711711
float[] queryVector = { 500.0f };
712-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null);
712+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null);
713713
assertResponse(
714714
client().prepareSearch("nrd_index")
715715
.setRankBuilder(new RRFRankBuilder(101, 1))
@@ -768,7 +768,7 @@ public void testMultiBM25AndSingleKnn() {
768768

769769
public void testMultiBM25AndSingleKnnWithAggregation() {
770770
float[] queryVector = { 500.0f };
771-
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null);
771+
KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null, null);
772772
assertResponse(
773773
client().prepareSearch("nrd_index")
774774
.setRankBuilder(new RRFRankBuilder(101, 1))
@@ -844,8 +844,8 @@ public void testMultiBM25AndSingleKnnWithAggregation() {
844844
public void testMultiBM25AndMultipleKnn() {
845845
float[] queryVectorAsc = { 500.0f };
846846
float[] queryVectorDesc = { 500.0f };
847-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null);
848-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null);
847+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null, null);
848+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null, null);
849849
assertResponse(
850850
client().prepareSearch("nrd_index")
851851
.setRankBuilder(new RRFRankBuilder(101, 1))
@@ -907,8 +907,8 @@ public void testMultiBM25AndMultipleKnn() {
907907
public void testMultiBM25AndMultipleKnnWithAggregation() {
908908
float[] queryVectorAsc = { 500.0f };
909909
float[] queryVectorDesc = { 500.0f };
910-
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null);
911-
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null);
910+
KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null, null);
911+
KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null, null);
912912
assertResponse(
913913
client().prepareSearch("nrd_index")
914914
.setRankBuilder(new RRFRankBuilder(101, 1))

0 commit comments

Comments
 (0)