[ESQL] Fix match phrase tests not being deterministic

ivancea · ivancea · commit 75c773c9ec91 · 2025-06-19T17:26:19.000+02:00
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -583,9 +583,6 @@ tests:
 - class: org.elasticsearch.test.apmintegration.TracesApmIT
   method: testApmIntegration
   issue: https://github.com/elastic/elasticsearch/issues/129651
-- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
-  method: test {scoring.TestMatchPhraseWithScoreBoost ASYNC}
-  issue: https://github.com/elastic/elasticsearch/issues/129676
 
 # Examples:
 #
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/scoring.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/scoring.csv-spec
@@ -567,11 +567,12 @@ required_capability: metadata_score
 from books metadata _score
 | where match_phrase(title, "J. R. R. Tolkien")
 | keep book_no, title, author, _score
+| sort _score desc
 ;
 
 book_no:keyword | title:text                            | author:text                                      | _score:double    
-    5335            | Letters of J R R Tolkien              | J.R.R. Tolkien                                   | 9.017186164855957
-    2130            | The J. R. R. Tolkien Audio Collection | [Christopher Tolkien, John Ronald Reuel Tolkien] | 8.412636756896973
+    5335        | Letters of J R R Tolkien              | J.R.R. Tolkien                                   | 9.017186164855957
+    2130        | The J. R. R. Tolkien Audio Collection | [Christopher Tolkien, John Ronald Reuel Tolkien] | 8.412636756896973
 ;
 
 testMatchPhraseWithScoreBoost
@@ -580,9 +581,10 @@ required_capability: match_phrase_function
 from books metadata _score
 | where match_phrase(title, "J. R. R. Tolkien", {"boost": 5})
 | keep book_no, title, author, _score
+| sort _score desc
 ;
 
 book_no:keyword | title:text                            | author:text                                      | _score:double    
-    5335            | Letters of J R R Tolkien              | J.R.R. Tolkien                                   | 45.0859260559082 
-    2130            | The J. R. R. Tolkien Audio Collection | [Christopher Tolkien, John Ronald Reuel Tolkien] | 42.06318283081055
+    5335        | Letters of J R R Tolkien              | J.R.R. Tolkien                                   | 45.0859260559082 
+    2130        | The J. R. R. Tolkien Audio Collection | [Christopher Tolkien, John Ronald Reuel Tolkien] | 42.06318283081055
 ;

Original file line number	Diff line number	Diff line change
`@@ -583,9 +583,6 @@ tests:`
`583`	`583`	`- class: org.elasticsearch.test.apmintegration.TracesApmIT`
`584`	`584`	`method: testApmIntegration`
`585`	`585`	`issue: https://github.com/elastic/elasticsearch/issues/129651`
`586`		`-- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT`
`587`		`- method: test {scoring.TestMatchPhraseWithScoreBoost ASYNC}`
`588`		`- issue: https://github.com/elastic/elasticsearch/issues/129676`
`589`	`586`
`590`	`587`	`# Examples:`
`591`	`588`	`#`
Original file line number	Diff line number	Diff line change
`@@ -567,11 +567,12 @@ required_capability: metadata_score`
`567`	`567`	`from books metadata _score`
`568`	`568`	`\| where match_phrase(title, "J. R. R. Tolkien")`
`569`	`569`	`\| keep book_no, title, author, _score`
	`570`	`+\| sort _score desc`
`570`	`571`	`;`
`571`	`572`
`572`	`573`	`book_no:keyword \| title:text \| author:text \| _score:double`
`573`		`- 5335 \| Letters of J R R Tolkien \| J.R.R. Tolkien \| 9.017186164855957`
`574`		`- 2130 \| The J. R. R. Tolkien Audio Collection \| [Christopher Tolkien, John Ronald Reuel Tolkien] \| 8.412636756896973`
	`574`	`+ 5335 \| Letters of J R R Tolkien \| J.R.R. Tolkien \| 9.017186164855957`
	`575`	`+ 2130 \| The J. R. R. Tolkien Audio Collection \| [Christopher Tolkien, John Ronald Reuel Tolkien] \| 8.412636756896973`
`575`	`576`	`;`
`576`	`577`
`577`	`578`	`testMatchPhraseWithScoreBoost`
`@@ -580,9 +581,10 @@ required_capability: match_phrase_function`
`580`	`581`	`from books metadata _score`
`581`	`582`	`\| where match_phrase(title, "J. R. R. Tolkien", {"boost": 5})`
`582`	`583`	`\| keep book_no, title, author, _score`
	`584`	`+\| sort _score desc`
`583`	`585`	`;`
`584`	`586`
`585`	`587`	`book_no:keyword \| title:text \| author:text \| _score:double`
`586`		`- 5335 \| Letters of J R R Tolkien \| J.R.R. Tolkien \| 45.0859260559082`
`587`		`- 2130 \| The J. R. R. Tolkien Audio Collection \| [Christopher Tolkien, John Ronald Reuel Tolkien] \| 42.06318283081055`
	`588`	`+ 5335 \| Letters of J R R Tolkien \| J.R.R. Tolkien \| 45.0859260559082`
	`589`	`+ 2130 \| The J. R. R. Tolkien Audio Collection \| [Christopher Tolkien, John Ronald Reuel Tolkien] \| 42.06318283081055`
`588`	`590`	`;`