Skip to content

Commit 907aad6

Browse files
ticheng-awsticheng-aws
committed
Fix flaky query profile phase tests with concurrent search enabled (#10547)
Signed-off-by: Ticheng Lin <ticheng@amazon.com>
1 parent d3c8909 commit 907aad6

2 files changed

Lines changed: 6 additions & 18 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
157157
### Security
158158

159159
[Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.x...HEAD
160-
[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.11...2.x
160+
[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.11...2.x

‎server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,10 +1066,6 @@ public void testIndexSortScrollOptimization() throws Exception {
10661066
}
10671067

10681068
public void testDisableTopScoreCollection() throws Exception {
1069-
assumeFalse(
1070-
"Concurrent search case muted pending fix: https://github.com/opensearch-project/OpenSearch/issues/10469",
1071-
executor != null
1072-
);
10731069
Directory dir = newDirectory();
10741070
IndexWriterConfig iwc = newIndexWriterConfig(new StandardAnalyzer());
10751071
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
@@ -1108,10 +1104,10 @@ public void testDisableTopScoreCollection() throws Exception {
11081104
assertThat(query.getTimeBreakdown().get("score_count"), greaterThan(0L));
11091105
if (executor != null) {
11101106
assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L));
1111-
assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));
1107+
assertThat(query.getTimeBreakdown().get("min_score"), greaterThanOrEqualTo(0L));
11121108
assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
11131109
assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThan(0L));
1114-
assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThan(0L));
1110+
assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(0L));
11151111
assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
11161112
}
11171113
assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
@@ -1241,10 +1237,6 @@ public void testMinScore() throws Exception {
12411237
}
12421238

12431239
public void testMaxScore() throws Exception {
1244-
assumeFalse(
1245-
"Concurrent search case muted pending fix: https://github.com/opensearch-project/OpenSearch/issues/9932",
1246-
executor != null
1247-
);
12481240
Directory dir = newDirectory();
12491241
final Sort sort = new Sort(new SortField("filter", SortField.Type.STRING));
12501242
IndexWriterConfig iwc = newIndexWriterConfig().setIndexSort(sort);
@@ -1286,7 +1278,7 @@ public void testMaxScore() throws Exception {
12861278
assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L));
12871279
assertThat(query.getTimeBreakdown().get("min_score"), greaterThanOrEqualTo(0L));
12881280
assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
1289-
assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThanOrEqualTo(6L));
1281+
assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThanOrEqualTo(4L));
12901282
assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(0L));
12911283
assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThanOrEqualTo(1L));
12921284
}
@@ -1364,10 +1356,6 @@ public void testMaxScore() throws Exception {
13641356
}
13651357

13661358
public void testCollapseQuerySearchResults() throws Exception {
1367-
assumeFalse(
1368-
"Concurrent search case muted pending fix: https://github.com/opensearch-project/OpenSearch/issues/10139",
1369-
executor != null
1370-
);
13711359
Directory dir = newDirectory();
13721360
final Sort sort = new Sort(new SortField("user", SortField.Type.INT));
13731361
IndexWriterConfig iwc = newIndexWriterConfig().setIndexSort(sort);
@@ -1412,7 +1400,7 @@ public void testCollapseQuerySearchResults() throws Exception {
14121400
assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));
14131401
assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
14141402
assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThanOrEqualTo(6L));
1415-
assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(6L));
1403+
assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(2L));
14161404
assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThanOrEqualTo(6L));
14171405
}
14181406
assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
@@ -1447,7 +1435,7 @@ public void testCollapseQuerySearchResults() throws Exception {
14471435
assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));
14481436
assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
14491437
assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThanOrEqualTo(6L));
1450-
assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(6L));
1438+
assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(2L));
14511439
assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThanOrEqualTo(6L));
14521440
}
14531441
assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));

0 commit comments

Comments
 (0)