mirror of
https://github.com/elastic/elasticsearch.git
synced 2025-04-24 15:17:30 -04:00
Fixing randomization issue for RRFRetrieverBuilderNestedDocsIT (#114859)
This commit is contained in:
Panagiotis Bailis
GitHub
parent
917903df06
commit
bc0a6e8ee2
3 changed files with 44 additions and 14 deletions
|
|
@ -372,9 +372,6 @@ tests:
|
|||
- class: org.elasticsearch.xpack.eql.EqlRestIT
|
||||
method: testUnicodeChars
|
||||
issue: https://github.com/elastic/elasticsearch/issues/114791
|
||||
- class: org.elasticsearch.xpack.rank.rrf.RRFRetrieverBuilderNestedDocsIT
|
||||
method: testRRFExplainWithNamedRetrievers
|
||||
issue: https://github.com/elastic/elasticsearch/issues/114820
|
||||
- class: org.elasticsearch.ingest.geoip.HttpClientTests
|
||||
issue: https://github.com/elastic/elasticsearch/issues/112618
|
||||
- class: org.elasticsearch.xpack.remotecluster.RemoteClusterSecurityWithApmTracingRestIT
|
||||
|
|
|
|||
|
|
@ -174,7 +174,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
);
|
||||
// this one retrieves docs 2 and 6 due to prefilter
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
// this one retrieves docs 2, 3, 6, and 7
|
||||
|
|
@ -221,7 +224,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
);
|
||||
// this one retrieves docs 2 and 6 due to prefilter
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
// this one retrieves docs 2, 3, 6, and 7
|
||||
|
|
@ -273,7 +279,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
);
|
||||
// this one retrieves docs 2 and 6 due to prefilter
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
// this one retrieves docs 2, 3, 6, and 7
|
||||
|
|
@ -327,7 +336,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
);
|
||||
// this one retrieves docs 2 and 6 due to prefilter
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
// this one retrieves docs 2, 3, 6, and 7
|
||||
|
|
@ -390,7 +402,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
);
|
||||
// this one retrieves docs 2 and 6 due to prefilter
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
// this one retrieves docs 2, 3, 6, and 7
|
||||
|
|
@ -453,7 +468,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
standard0.retrieverName("my_custom_retriever");
|
||||
// this one retrieves docs 2 and 6 due to prefilter
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
// this one retrieves docs 2, 3, 6, and 7
|
||||
|
|
@ -509,7 +527,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
standard0.retrieverName("my_custom_retriever");
|
||||
// this one retrieves docs 2 and 6 due to prefilter
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
// this one retrieves docs 2, 3, 6, and 7
|
||||
|
|
@ -577,7 +598,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
QueryBuilders.constantScoreQuery(QueryBuilders.rangeQuery(VECTOR_FIELD).gte(10))
|
||||
);
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
source.retriever(
|
||||
|
|
@ -613,7 +637,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
}
|
||||
};
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
source.retriever(
|
||||
|
|
@ -646,7 +673,10 @@ public class RRFRetrieverBuilderIT extends ESIntegTestCase {
|
|||
}
|
||||
};
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
source.retriever(
|
||||
|
|
|
|||
|
|
@ -142,7 +142,10 @@ public class RRFRetrieverBuilderNestedDocsIT extends RRFRetrieverBuilderIT {
|
|||
);
|
||||
// this one retrieves docs 2 and 6 due to prefilter
|
||||
StandardRetrieverBuilder standard1 = new StandardRetrieverBuilder(
|
||||
QueryBuilders.constantScoreQuery(QueryBuilders.termsQuery(ID_FIELD, "doc_2", "doc_3", "doc_6")).boost(20L)
|
||||
QueryBuilders.boolQuery()
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_2")).boost(20L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_3")).boost(10L))
|
||||
.should(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().addIds("doc_6")).boost(5L))
|
||||
);
|
||||
standard1.getPreFilterQueryBuilders().add(QueryBuilders.queryStringQuery("search").defaultField(TEXT_FIELD));
|
||||
// this one retrieves docs 6
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue