Ensuring consistent ordering for inner hits in collapse test for rrf (#114740)

This commit is contained in:
Panagiotis Bailis 2024-10-15 22:11:55 +03:00 committed by GitHub
parent 403f1e1472
commit 4fa8485a26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 7 deletions

View file

@ -325,9 +325,6 @@ tests:
- class: org.elasticsearch.xpack.inference.services.cohere.CohereServiceTests - class: org.elasticsearch.xpack.inference.services.cohere.CohereServiceTests
method: testInfer_StreamRequest_ErrorResponse method: testInfer_StreamRequest_ErrorResponse
issue: https://github.com/elastic/elasticsearch/issues/114327 issue: https://github.com/elastic/elasticsearch/issues/114327
- class: org.elasticsearch.xpack.rank.rrf.RRFRankClientYamlTestSuiteIT
method: test {yaml=rrf/700_rrf_retriever_search_api_compatibility/rrf retriever with top-level collapse}
issue: https://github.com/elastic/elasticsearch/issues/114331
- class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT - class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT
method: test {yaml=cluster.stats/30_ccs_stats/cross-cluster search stats search} method: test {yaml=cluster.stats/30_ccs_stats/cross-cluster search stats search}
issue: https://github.com/elastic/elasticsearch/issues/114371 issue: https://github.com/elastic/elasticsearch/issues/114371

View file

@ -11,6 +11,8 @@ setup:
body: body:
mappings: mappings:
properties: properties:
id:
type: integer
text: text:
type: text type: text
text_to_highlight: text_to_highlight:
@ -39,6 +41,7 @@ setup:
index: test index: test
id: "1" id: "1"
body: body:
id: 1
text: "term1" text: "term1"
vector: [1.0] vector: [1.0]
@ -47,6 +50,7 @@ setup:
index: test index: test
id: "2" id: "2"
body: body:
id: 2
text: "term2" text: "term2"
text_to_highlight: "search for the truth" text_to_highlight: "search for the truth"
keyword: "biology" keyword: "biology"
@ -57,6 +61,7 @@ setup:
index: test index: test
id: "3" id: "3"
body: body:
id: 3
text: "term3" text: "term3"
text_to_highlight: "nothing related" text_to_highlight: "nothing related"
keyword: "technology" keyword: "technology"
@ -67,6 +72,7 @@ setup:
index: test index: test
id: "4" id: "4"
body: body:
id: 4
text: "term4" text: "term4"
vector: [4.0] vector: [4.0]
- do: - do:
@ -74,6 +80,7 @@ setup:
index: test index: test
id: "5" id: "5"
body: body:
id: 5
text: "term5" text: "term5"
text_to_highlight: "You know, for Search!" text_to_highlight: "You know, for Search!"
keyword: "technology" keyword: "technology"
@ -81,9 +88,10 @@ setup:
vector: [5.0] vector: [5.0]
- do: - do:
index: index:
id: 6
index: test index: test
id: "6"
body: body:
id: 6
text: "term6" text: "term6"
keyword: "biology" keyword: "biology"
integer: 6 integer: 6
@ -93,6 +101,7 @@ setup:
index: test index: test
id: "7" id: "7"
body: body:
id: 7
text: "term7" text: "term7"
keyword: "astronomy" keyword: "astronomy"
vector: [77.0] vector: [77.0]
@ -102,6 +111,7 @@ setup:
index: test index: test
id: "8" id: "8"
body: body:
id: 8
text: "term8" text: "term8"
keyword: "technology" keyword: "technology"
nested: { views: 100} nested: { views: 100}
@ -110,6 +120,7 @@ setup:
index: test index: test
id: "9" id: "9"
body: body:
id: 9
text: "term9" text: "term9"
integer: 2 integer: 2
keyword: "technology" keyword: "technology"
@ -439,7 +450,19 @@ setup:
rank_window_size: 5 rank_window_size: 5
rank_constant: 10 rank_constant: 10
size: 3 size: 3
collapse: { field: keyword, inner_hits: { name: sub_hits, size: 2 } } collapse: {
field: keyword,
inner_hits: {
name: sub_hits,
size: 2,
sort:
{
id: {
order: desc
}
}
}
}
- match: { hits.total : 9 } - match: { hits.total : 9 }
@ -456,8 +479,8 @@ setup:
- match: { hits.hits.1.inner_hits.sub_hits.hits.total : 4 } - match: { hits.hits.1.inner_hits.sub_hits.hits.total : 4 }
- length: { hits.hits.1.inner_hits.sub_hits.hits.hits : 2 } - length: { hits.hits.1.inner_hits.sub_hits.hits.hits : 2 }
- match: { hits.hits.1.inner_hits.sub_hits.hits.hits.0._id: "5" } - match: { hits.hits.1.inner_hits.sub_hits.hits.hits.0._id: "9" }
- match: { hits.hits.1.inner_hits.sub_hits.hits.hits.1._id: "3" } - match: { hits.hits.1.inner_hits.sub_hits.hits.hits.1._id: "8" }
- length: { hits.hits.2.inner_hits.sub_hits.hits.hits: 2 } - length: { hits.hits.2.inner_hits.sub_hits.hits.hits: 2 }
- match: { hits.hits.2.inner_hits.sub_hits.hits.hits.0._id: "6" } - match: { hits.hits.2.inner_hits.sub_hits.hits.hits.0._id: "6" }