Skip to content

Commit bb3959d

Browse files
ticheng-awsticheng-aws
authoredJan 3, 2024
Fix flaky testTerminateAfterEarlyTermination (#11683)
Signed-off-by: Ticheng Lin <ticheng@amazon.com>
·
3.0.0-alpha1
1 parent 7b1c2c7 commit bb3959d

File tree

1 file changed

+52
-22
lines changed

1 file changed

+52
-22
lines changed
 

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

+52-22
Original file line numberDiff line numberDiff line change
@@ -615,12 +615,22 @@ public void testTerminateAfterEarlyTermination() throws Exception {
615615
assertThat(query.getTimeBreakdown().get("score"), greaterThan(0L));
616616
assertThat(query.getTimeBreakdown().get("score_count"), greaterThan(0L));
617617
if (executor != null) {
618-
assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L));
619-
assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));
620-
assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
621-
assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThan(0L));
622-
assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThan(0L));
623-
assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
618+
long maxScore = query.getTimeBreakdown().get("max_score");
619+
long minScore = query.getTimeBreakdown().get("min_score");
620+
long avgScore = query.getTimeBreakdown().get("avg_score");
621+
long maxScoreCount = query.getTimeBreakdown().get("max_score_count");
622+
long minScoreCount = query.getTimeBreakdown().get("min_score_count");
623+
long avgScoreCount = query.getTimeBreakdown().get("avg_score_count");
624+
assertThat(maxScore, greaterThan(0L));
625+
assertThat(minScore, greaterThanOrEqualTo(0L));
626+
assertThat(avgScore, greaterThanOrEqualTo(0L));
627+
assertThat(maxScore, greaterThanOrEqualTo(avgScore));
628+
assertThat(avgScore, greaterThanOrEqualTo(minScore));
629+
assertThat(maxScoreCount, greaterThan(0L));
630+
assertThat(minScoreCount, greaterThanOrEqualTo(0L));
631+
assertThat(avgScoreCount, greaterThanOrEqualTo(0L));
632+
assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
633+
assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
624634
}
625635
assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
626636
assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L));
@@ -744,30 +754,50 @@ public void testTerminateAfterEarlyTermination() throws Exception {
744754
assertThat(query.getProfiledChildren().get(0).getTime(), greaterThan(0L));
745755
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("create_weight"), greaterThan(0L));
746756
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
747-
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score"), greaterThan(0L));
748-
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score_count"), greaterThan(0L));
757+
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score"), greaterThanOrEqualTo(0L));
758+
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(0L));
749759
if (executor != null) {
750-
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score"), greaterThan(0L));
751-
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score"), greaterThan(0L));
752-
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score"), greaterThan(0L));
753-
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score_count"), greaterThan(0L));
754-
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score_count"), greaterThan(0L));
755-
assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
760+
long maxScore = query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score");
761+
long minScore = query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score");
762+
long avgScore = query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score");
763+
long maxScoreCount = query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score_count");
764+
long minScoreCount = query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score_count");
765+
long avgScoreCount = query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score_count");
766+
assertThat(maxScore, greaterThanOrEqualTo(0L));
767+
assertThat(minScore, greaterThanOrEqualTo(0L));
768+
assertThat(avgScore, greaterThanOrEqualTo(0L));
769+
assertThat(maxScore, greaterThanOrEqualTo(avgScore));
770+
assertThat(avgScore, greaterThanOrEqualTo(minScore));
771+
assertThat(maxScoreCount, greaterThanOrEqualTo(0L));
772+
assertThat(minScoreCount, greaterThanOrEqualTo(0L));
773+
assertThat(avgScoreCount, greaterThanOrEqualTo(0L));
774+
assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
775+
assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
756776
}
757777

758778
assertThat(query.getProfiledChildren().get(1).getQueryName(), equalTo("TermQuery"));
759779
assertThat(query.getProfiledChildren().get(1).getTime(), greaterThan(0L));
760780
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("create_weight"), greaterThan(0L));
761781
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
762-
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score"), greaterThan(0L));
763-
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score_count"), greaterThan(0L));
782+
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score"), greaterThanOrEqualTo(0L));
783+
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(0L));
764784
if (executor != null) {
765-
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score"), greaterThan(0L));
766-
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score"), greaterThan(0L));
767-
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score"), greaterThan(0L));
768-
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score_count"), greaterThan(0L));
769-
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score_count"), greaterThan(0L));
770-
assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
785+
long maxScore = query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score");
786+
long minScore = query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score");
787+
long avgScore = query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score");
788+
long maxScoreCount = query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score_count");
789+
long minScoreCount = query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score_count");
790+
long avgScoreCount = query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score_count");
791+
assertThat(maxScore, greaterThanOrEqualTo(0L));
792+
assertThat(minScore, greaterThanOrEqualTo(0L));
793+
assertThat(avgScore, greaterThanOrEqualTo(0L));
794+
assertThat(maxScore, greaterThanOrEqualTo(avgScore));
795+
assertThat(avgScore, greaterThanOrEqualTo(minScore));
796+
assertThat(maxScoreCount, greaterThanOrEqualTo(0L));
797+
assertThat(minScoreCount, greaterThanOrEqualTo(0L));
798+
assertThat(avgScoreCount, greaterThanOrEqualTo(0L));
799+
assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
800+
assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
771801
}
772802
}, collector -> {
773803
assertThat(collector.getReason(), equalTo("search_terminate_after_count"));

0 commit comments

Comments
 (0)
Please sign in to comment.