Skip to content

Commit 41894ea

Browse files
authored
Fix for RRF and RankDoc tests due to different shard and doc ordering (#114084)
1 parent 9852458 commit 41894ea

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,6 @@ tests:
351351
- class: org.elasticsearch.xpack.rank.rrf.RRFRetrieverBuilderIT
352352
method: testRRFWithCollapse
353353
issue: https://github.com/elastic/elasticsearch/issues/114074
354-
- class: org.elasticsearch.xpack.rank.rrf.RRFRetrieverBuilderIT
355-
method: testMultipleRRFRetrievers
356-
issue: https://github.com/elastic/elasticsearch/issues/114079
357354
- class: org.elasticsearch.xpack.inference.TextEmbeddingCrudIT
358355
method: testPutE5Small_withPlatformSpecificVariant
359356
issue: https://github.com/elastic/elasticsearch/issues/113950

server/src/internalClusterTest/java/org/elasticsearch/search/retriever/RankDocRetrieverBuilderIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import java.util.List;
5454
import java.util.Map;
5555

56+
import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS;
5657
import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS;
5758
import static org.hamcrest.Matchers.equalTo;
5859

@@ -112,7 +113,7 @@ public void setup() throws Exception {
112113
}
113114
}
114115
""";
115-
createIndex(INDEX, Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).build());
116+
createIndex(INDEX, Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0).build());
116117
admin().indices().preparePutMapping(INDEX).setSource(mapping, XContentType.JSON).get();
117118
indexDoc(
118119
INDEX,

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.Collection;
3434
import java.util.List;
3535

36+
import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS;
3637
import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS;
3738
import static org.hamcrest.Matchers.containsString;
3839
import static org.hamcrest.Matchers.equalTo;
@@ -97,7 +98,7 @@ protected void setupIndex() {
9798
}
9899
}
99100
""";
100-
createIndex(INDEX, Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 5).build());
101+
createIndex(INDEX, Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0).build());
101102
admin().indices().preparePutMapping(INDEX).setSource(mapping, XContentType.JSON).get();
102103
indexDoc(INDEX, "doc_1", DOC_FIELD, "doc_1", TOPIC_FIELD, "technology", TEXT_FIELD, "term");
103104
indexDoc(
@@ -301,7 +302,7 @@ public void testRRFWithCollapse() {
301302
});
302303
}
303304

304-
public void testRankDocsRetrieverWithCollapseAndAggs() {
305+
public void testRRFRetrieverWithCollapseAndAggs() {
305306
final int rankWindowSize = 100;
306307
final int rankConstant = 10;
307308
SearchSourceBuilder source = new SearchSourceBuilder();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.util.Arrays;
2323

24+
import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS;
2425
import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS;
2526
import static org.hamcrest.Matchers.equalTo;
2627

@@ -67,7 +68,7 @@ protected void setupIndex() {
6768
}
6869
}
6970
""";
70-
createIndex(INDEX, Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 5).build());
71+
createIndex(INDEX, Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0).build());
7172
admin().indices().preparePutMapping(INDEX).setSource(mapping, XContentType.JSON).get();
7273
indexDoc(INDEX, "doc_1", DOC_FIELD, "doc_1", TOPIC_FIELD, "technology", TEXT_FIELD, "term", LAST_30D_FIELD, 100);
7374
indexDoc(

0 commit comments

Comments
 (0)