Skip to content

Commit 34d7b6d

Browse files
drempapisdrempapis
committed
Update after review
1 parent 0a3ab4c commit 34d7b6d

File tree

1 file changed

+56
-47
lines changed

1 file changed

+56
-47
lines changed

‎server/src/test/java/org/elasticsearch/search/stats/ShardSearchStatsTests.java‎

Lines changed: 56 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -52,79 +52,86 @@ public void setup() {
5252
}
5353

5454
public void testQueryPhase() {
55-
SearchContext sc = createSearchContext(false);
56-
shardSearchStatsListener.onPreQueryPhase(sc);
57-
shardSearchStatsListener.onQueryPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
55+
try (SearchContext sc = createSearchContext(false)) {
56+
shardSearchStatsListener.onPreQueryPhase(sc);
57+
shardSearchStatsListener.onQueryPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
5858

59-
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
60-
assertTrue(stats.getSearchLoadRate() > 0.0);
59+
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
60+
assertTrue(stats.getSearchLoadRate() > 0.0);
61+
}
6162
}
6263

6364
public void testQueryPhase_SuggestOnly() {
64-
SearchContext sc = createSearchContext(true);
65-
shardSearchStatsListener.onPreQueryPhase(sc);
66-
shardSearchStatsListener.onQueryPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
65+
try (SearchContext sc = createSearchContext(true)) {
66+
shardSearchStatsListener.onPreQueryPhase(sc);
67+
shardSearchStatsListener.onQueryPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
6768

68-
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
69-
assertTrue(stats.getSearchLoadRate() > 0.0);
69+
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
70+
assertTrue(stats.getSearchLoadRate() > 0.0);
71+
}
7072
}
7173

7274
public void testQueryPhase_withGroup() {
73-
SearchContext sc = createSearchContext(false);
74-
shardSearchStatsListener.onPreQueryPhase(sc);
75-
shardSearchStatsListener.onQueryPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
75+
try (SearchContext sc = createSearchContext(false)) {
76+
shardSearchStatsListener.onPreQueryPhase(sc);
77+
shardSearchStatsListener.onQueryPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
7678

77-
SearchStats searchStats = shardSearchStatsListener.stats("_all");
78-
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
79-
assertTrue(stats.getSearchLoadRate() > 0.0);
79+
SearchStats searchStats = shardSearchStatsListener.stats("_all");
80+
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
81+
assertTrue(stats.getSearchLoadRate() > 0.0);
8082

81-
stats = Objects.requireNonNull(searchStats.getGroupStats()).get("group1");
82-
assertTrue(stats.getSearchLoadRate() > 0.0);
83+
stats = Objects.requireNonNull(searchStats.getGroupStats()).get("group1");
84+
assertTrue(stats.getSearchLoadRate() > 0.0);
85+
}
8386
}
8487

8588
public void testQueryPhase_withGroup_SuggestOnly() {
86-
SearchContext sc = createSearchContext(true);
89+
try (SearchContext sc = createSearchContext(true)) {
8790

88-
shardSearchStatsListener.onPreQueryPhase(sc);
89-
shardSearchStatsListener.onQueryPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
91+
shardSearchStatsListener.onPreQueryPhase(sc);
92+
shardSearchStatsListener.onQueryPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
9093

91-
SearchStats searchStats = shardSearchStatsListener.stats("_all");
92-
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
93-
assertTrue(stats.getSearchLoadRate() > 0.0);
94+
SearchStats searchStats = shardSearchStatsListener.stats("_all");
95+
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
96+
assertTrue(stats.getSearchLoadRate() > 0.0);
9497

95-
stats = Objects.requireNonNull(searchStats.getGroupStats()).get("group1");
96-
assertTrue(stats.getSearchLoadRate() > 0.0);
98+
stats = Objects.requireNonNull(searchStats.getGroupStats()).get("group1");
99+
assertTrue(stats.getSearchLoadRate() > 0.0);
100+
}
97101
}
98102

99103
public void testQueryPhase_SuggestOnly_Failure() {
100-
SearchContext sc = createSearchContext(true);
101-
shardSearchStatsListener.onPreQueryPhase(sc);
102-
shardSearchStatsListener.onFailedQueryPhase(sc);
104+
try (SearchContext sc = createSearchContext(true)) {
105+
shardSearchStatsListener.onPreQueryPhase(sc);
106+
shardSearchStatsListener.onFailedQueryPhase(sc);
103107

104-
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
105-
assertEquals(0.0, stats.getSearchLoadRate(), 0);
108+
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
109+
assertEquals(0.0, stats.getSearchLoadRate(), 0);
110+
}
106111
}
107112

108113
public void testQueryPhase_Failure() {
109-
SearchContext sc = createSearchContext(false);
110-
shardSearchStatsListener.onPreQueryPhase(sc);
111-
shardSearchStatsListener.onFailedQueryPhase(sc);
114+
try (SearchContext sc = createSearchContext(false)) {
115+
shardSearchStatsListener.onPreQueryPhase(sc);
116+
shardSearchStatsListener.onFailedQueryPhase(sc);
112117

113-
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
114-
assertEquals(0.0, stats.getSearchLoadRate(), 0);
118+
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
119+
assertEquals(0.0, stats.getSearchLoadRate(), 0);
120+
}
115121
}
116122

117123
public void testFetchPhase() {
118-
SearchContext sc = createSearchContext(false);
119-
shardSearchStatsListener.onPreFetchPhase(sc);
120-
shardSearchStatsListener.onFetchPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
124+
try (SearchContext sc = createSearchContext(false)) {
125+
shardSearchStatsListener.onPreFetchPhase(sc);
126+
shardSearchStatsListener.onFetchPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
121127

122-
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
123-
assertTrue(stats.getSearchLoadRate() > 0.0);
128+
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
129+
assertTrue(stats.getSearchLoadRate() > 0.0);
130+
}
124131
}
125132

126133
public void testFetchPhase_withGroup() {
127-
SearchContext sc = createSearchContext(false);
134+
try (SearchContext sc = createSearchContext(false)) {
128135
shardSearchStatsListener.onPreFetchPhase(sc);
129136
shardSearchStatsListener.onFetchPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));
130137

@@ -134,15 +141,17 @@ public void testFetchPhase_withGroup() {
134141

135142
stats = Objects.requireNonNull(searchStats.getGroupStats()).get("group1");
136143
assertTrue(stats.getSearchLoadRate() > 0.0);
144+
}
137145
}
138146

139147
public void testFetchPhase_Failure() {
140-
SearchContext sc = createSearchContext(false);
141-
shardSearchStatsListener.onPreFetchPhase(sc);
142-
shardSearchStatsListener.onFailedFetchPhase(sc);
148+
try (SearchContext sc = createSearchContext(false)) {
149+
shardSearchStatsListener.onPreFetchPhase(sc);
150+
shardSearchStatsListener.onFailedFetchPhase(sc);
143151

144-
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
145-
assertEquals(0.0, stats.getSearchLoadRate(), 0);
152+
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
153+
assertEquals(0.0, stats.getSearchLoadRate(), 0);
154+
}
146155
}
147156

148157
private static SearchContext createSearchContext(boolean suggested) {

0 commit comments

Comments
 (0)