Skip to content

Commit 4e863f4

Browse files
authored
[8.x] Make ES|QL scoring tests running consistently in serverless (#118854) (#118928)
* Make ES|QL scoring tests running consistently in serverless (#118854) * make scoring tests running consistently in serverless enforce _id in books dataset to make doc distribution across shards consistent. books settings with 3 shards to accomodate serverless settings. unmuting scoring tests. scoring test fixed. (cherry picked from commit 140beb1)
1 parent 1c85bdb commit 4e863f4

File tree

5 files changed

+140
-146
lines changed

5 files changed

+140
-146
lines changed

muted-tests.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -364,21 +364,6 @@ tests:
364364
issue: https://github.com/elastic/elasticsearch/issues/117591
365365
- class: org.elasticsearch.repositories.s3.RepositoryS3ClientYamlTestSuiteIT
366366
issue: https://github.com/elastic/elasticsearch/issues/117596
367-
- class: "org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT"
368-
method: "test {scoring.*}"
369-
issue: https://github.com/elastic/elasticsearch/issues/117641
370-
- class: "org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT"
371-
method: "test {scoring.*}"
372-
issue: https://github.com/elastic/elasticsearch/issues/117641
373-
- class: "org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT"
374-
method: "test {scoring.*}"
375-
issue: https://github.com/elastic/elasticsearch/issues/117641
376-
- class: "org.elasticsearch.xpack.esql.qa.mixed.MultiClusterEsqlSpecIT"
377-
method: "test {scoring.*}"
378-
issue: https://github.com/elastic/elasticsearch/issues/118460
379-
- class: "org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT"
380-
method: "test {scoring.*}"
381-
issue: https://github.com/elastic/elasticsearch/issues/117751
382367
- class: org.elasticsearch.search.ccs.CrossClusterIT
383368
method: testCancel
384369
issue: https://github.com/elastic/elasticsearch/issues/108061

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public class CsvTestsDataLoader {
104104
private static final TestsDataset DISTANCES = new TestsDataset("distances");
105105
private static final TestsDataset K8S = new TestsDataset("k8s", "k8s-mappings.json", "k8s.csv").withSetting("k8s-settings.json");
106106
private static final TestsDataset ADDRESSES = new TestsDataset("addresses");
107-
private static final TestsDataset BOOKS = new TestsDataset("books");
107+
private static final TestsDataset BOOKS = new TestsDataset("books").withSetting("books-settings.json");
108108
private static final TestsDataset SEMANTIC_TEXT = new TestsDataset("semantic_text").withInferenceEndpoint(true);
109109

110110
public static final Map<String, TestsDataset> CSV_DATASET_MAP = Map.ofEntries(
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"index": {
3+
"number_of_shards": 3
4+
}
5+
}

0 commit comments

Comments
 (0)