Skip to content

Commit 140beb1

Browse files
authored
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.
1 parent d118cbf commit 140beb1

File tree

5 files changed

+140
-149
lines changed

5 files changed

+140
-149
lines changed

muted-tests.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,24 +153,6 @@ tests:
153153
issue: https://github.com/elastic/elasticsearch/issues/117473
154154
- class: org.elasticsearch.repositories.s3.RepositoryS3EcsClientYamlTestSuiteIT
155155
issue: https://github.com/elastic/elasticsearch/issues/117525
156-
- class: "org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT"
157-
method: "test {scoring.*}"
158-
issue: https://github.com/elastic/elasticsearch/issues/117641
159-
- class: "org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT"
160-
method: "test {scoring.*}"
161-
issue: https://github.com/elastic/elasticsearch/issues/117641
162-
- class: "org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT"
163-
method: "test {scoring.*}"
164-
issue: https://github.com/elastic/elasticsearch/issues/117641
165-
- class: "org.elasticsearch.xpack.esql.qa.mixed.MultiClusterEsqlSpecIT"
166-
method: "test {scoring.*}"
167-
issue: https://github.com/elastic/elasticsearch/issues/118460
168-
- class: "org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT"
169-
method: "test {scoring.*}"
170-
issue: https://github.com/elastic/elasticsearch/issues/118460
171-
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
172-
method: test {scoring.QstrWithFieldAndScoringSortedEval}
173-
issue: https://github.com/elastic/elasticsearch/issues/117751
174156
- class: org.elasticsearch.search.ccs.CrossClusterIT
175157
method: testCancel
176158
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)