Skip to content

Commit fc5195f

Browse files
drempapisdrempapis
committed
update after reviw - revert code
1 parent 14dfccc commit fc5195f

File tree

2 files changed

+1
-69
lines changed

2 files changed

+1
-69
lines changed

‎server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,6 @@ static final class Fields {
437437
static final String SEARCH = "search";
438438
static final String OPEN_CONTEXTS = "open_contexts";
439439
static final String GROUPS = "groups";
440-
static final String DFS_TOTAL = "dfs_total";
441-
static final String DFS_TIME = "dfs_time";
442-
static final String DFS_TIME_IN_MILLIS = "dfs_time_in_millis";
443-
static final String DFS_CURRENT = "dfs_current";
444-
static final String DFS_FAILURE = "dfs_failure";
445440
static final String QUERY_TOTAL = "query_total";
446441
static final String QUERY_TIME = "query_time";
447442
static final String QUERY_TIME_IN_MILLIS = "query_time_in_millis";

‎server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java‎

Lines changed: 1 addition & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ public class SearchOperationListenerTests extends ESTestCase {
3131

3232
// this test also tests if calls are correct if one or more listeners throw exceptions
3333
public void testListenersAreExecuted() {
34-
AtomicInteger onDfs = new AtomicInteger();
35-
AtomicInteger preDfs = new AtomicInteger();
36-
AtomicInteger failedDfs = new AtomicInteger();
3734
AtomicInteger preQuery = new AtomicInteger();
3835
AtomicInteger failedQuery = new AtomicInteger();
3936
AtomicInteger onQuery = new AtomicInteger();
@@ -47,25 +44,6 @@ public void testListenersAreExecuted() {
4744
AtomicInteger validateSearchContext = new AtomicInteger();
4845
AtomicInteger timeInNanos = new AtomicInteger(randomIntBetween(0, 10));
4946
SearchOperationListener listener = new SearchOperationListener() {
50-
@Override
51-
public void onPreDfsPhase(SearchContext searchContext) {
52-
assertNotNull(searchContext);
53-
preDfs.incrementAndGet();
54-
}
55-
56-
@Override
57-
public void onFailedDfsPhase(SearchContext searchContext) {
58-
assertNotNull(searchContext);
59-
failedDfs.incrementAndGet();
60-
}
61-
62-
@Override
63-
public void onDfsPhase(SearchContext searchContext, long tookInNanos) {
64-
assertEquals(timeInNanos.get(), tookInNanos);
65-
assertNotNull(searchContext);
66-
onDfs.incrementAndGet();
67-
}
68-
6947
@Override
7048
public void onPreQueryPhase(SearchContext searchContext) {
7149
assertNotNull(searchContext);
@@ -162,13 +140,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
162140
);
163141
try (SearchContext ctx = new TestSearchContext((SearchExecutionContext) null)) {
164142
compositeListener.onDfsPhase(ctx, timeInNanos.get());
165-
assertEquals(0, preDfs.get());
166143
assertEquals(0, preFetch.get());
167144
assertEquals(0, preQuery.get());
168-
assertEquals(0, failedDfs.get());
169145
assertEquals(0, failedFetch.get());
170146
assertEquals(0, failedQuery.get());
171-
assertEquals(2, onDfs.get());
172147
assertEquals(0, onQuery.get());
173148
assertEquals(0, onFetch.get());
174149
assertEquals(0, newContext.get());
@@ -178,13 +153,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
178153
assertEquals(0, validateSearchContext.get());
179154

180155
compositeListener.onQueryPhase(ctx, timeInNanos.get());
181-
assertEquals(0, preDfs.get());
182156
assertEquals(0, preFetch.get());
183157
assertEquals(0, preQuery.get());
184-
assertEquals(0, failedDfs.get());
185158
assertEquals(0, failedFetch.get());
186159
assertEquals(0, failedQuery.get());
187-
assertEquals(2, onDfs.get());
188160
assertEquals(2, onQuery.get());
189161
assertEquals(0, onFetch.get());
190162
assertEquals(0, newContext.get());
@@ -194,13 +166,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
194166
assertEquals(0, validateSearchContext.get());
195167

196168
compositeListener.onFetchPhase(ctx, timeInNanos.get());
197-
assertEquals(0, preDfs.get());
198169
assertEquals(0, preFetch.get());
199170
assertEquals(0, preQuery.get());
200-
assertEquals(0, failedDfs.get());
201171
assertEquals(0, failedFetch.get());
202172
assertEquals(0, failedQuery.get());
203-
assertEquals(2, onDfs.get());
204173
assertEquals(2, onQuery.get());
205174
assertEquals(2, onFetch.get());
206175
assertEquals(0, newContext.get());
@@ -210,13 +179,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
210179
assertEquals(0, validateSearchContext.get());
211180

212181
compositeListener.onPreDfsPhase(ctx);
213-
assertEquals(2, preDfs.get());
214182
assertEquals(0, preFetch.get());
215183
assertEquals(0, preQuery.get());
216-
assertEquals(0, failedDfs.get());
217184
assertEquals(0, failedFetch.get());
218185
assertEquals(0, failedQuery.get());
219-
assertEquals(2, onDfs.get());
220186
assertEquals(2, onQuery.get());
221187
assertEquals(2, onFetch.get());
222188
assertEquals(0, newContext.get());
@@ -226,13 +192,11 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
226192
assertEquals(0, validateSearchContext.get());
227193

228194
compositeListener.onPreQueryPhase(ctx);
229-
assertEquals(2, preDfs.get());
195+
230196
assertEquals(0, preFetch.get());
231197
assertEquals(2, preQuery.get());
232-
assertEquals(0, failedDfs.get());
233198
assertEquals(0, failedFetch.get());
234199
assertEquals(0, failedQuery.get());
235-
assertEquals(2, onDfs.get());
236200
assertEquals(2, onQuery.get());
237201
assertEquals(2, onFetch.get());
238202
assertEquals(0, newContext.get());
@@ -242,13 +206,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
242206
assertEquals(0, validateSearchContext.get());
243207

244208
compositeListener.onPreFetchPhase(ctx);
245-
assertEquals(2, preDfs.get());
246209
assertEquals(2, preFetch.get());
247210
assertEquals(2, preQuery.get());
248-
assertEquals(0, failedDfs.get());
249211
assertEquals(0, failedFetch.get());
250212
assertEquals(0, failedQuery.get());
251-
assertEquals(2, onDfs.get());
252213
assertEquals(2, onQuery.get());
253214
assertEquals(2, onFetch.get());
254215
assertEquals(0, newContext.get());
@@ -258,13 +219,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
258219
assertEquals(0, validateSearchContext.get());
259220

260221
compositeListener.onFailedDfsPhase(ctx);
261-
assertEquals(2, preDfs.get());
262222
assertEquals(2, preFetch.get());
263223
assertEquals(2, preQuery.get());
264-
assertEquals(2, failedDfs.get());
265224
assertEquals(0, failedFetch.get());
266225
assertEquals(0, failedQuery.get());
267-
assertEquals(2, onDfs.get());
268226
assertEquals(2, onQuery.get());
269227
assertEquals(2, onFetch.get());
270228
assertEquals(0, newContext.get());
@@ -274,13 +232,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
274232
assertEquals(0, validateSearchContext.get());
275233

276234
compositeListener.onFailedFetchPhase(ctx);
277-
assertEquals(2, preDfs.get());
278235
assertEquals(2, preFetch.get());
279236
assertEquals(2, preQuery.get());
280-
assertEquals(2, failedDfs.get());
281237
assertEquals(2, failedFetch.get());
282238
assertEquals(0, failedQuery.get());
283-
assertEquals(2, onDfs.get());
284239
assertEquals(2, onQuery.get());
285240
assertEquals(2, onFetch.get());
286241
assertEquals(0, newContext.get());
@@ -290,13 +245,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
290245
assertEquals(0, validateSearchContext.get());
291246

292247
compositeListener.onFailedQueryPhase(ctx);
293-
assertEquals(2, preDfs.get());
294248
assertEquals(2, preFetch.get());
295249
assertEquals(2, preQuery.get());
296-
assertEquals(2, failedDfs.get());
297250
assertEquals(2, failedFetch.get());
298251
assertEquals(2, failedQuery.get());
299-
assertEquals(2, onDfs.get());
300252
assertEquals(2, onQuery.get());
301253
assertEquals(2, onFetch.get());
302254
assertEquals(0, newContext.get());
@@ -306,13 +258,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
306258
assertEquals(0, validateSearchContext.get());
307259

308260
compositeListener.onNewReaderContext(mock(ReaderContext.class));
309-
assertEquals(2, preDfs.get());
310261
assertEquals(2, preFetch.get());
311262
assertEquals(2, preQuery.get());
312-
assertEquals(2, failedDfs.get());
313263
assertEquals(2, failedFetch.get());
314264
assertEquals(2, failedQuery.get());
315-
assertEquals(2, onDfs.get());
316265
assertEquals(2, onQuery.get());
317266
assertEquals(2, onFetch.get());
318267
assertEquals(2, newContext.get());
@@ -322,13 +271,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
322271
assertEquals(0, validateSearchContext.get());
323272

324273
compositeListener.onNewScrollContext(mock(ReaderContext.class));
325-
assertEquals(2, preDfs.get());
326274
assertEquals(2, preFetch.get());
327275
assertEquals(2, preQuery.get());
328-
assertEquals(2, failedDfs.get());
329276
assertEquals(2, failedFetch.get());
330277
assertEquals(2, failedQuery.get());
331-
assertEquals(2, onDfs.get());
332278
assertEquals(2, onQuery.get());
333279
assertEquals(2, onFetch.get());
334280
assertEquals(2, newContext.get());
@@ -338,13 +284,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
338284
assertEquals(0, validateSearchContext.get());
339285

340286
compositeListener.onFreeReaderContext(mock(ReaderContext.class));
341-
assertEquals(2, preDfs.get());
342287
assertEquals(2, preFetch.get());
343288
assertEquals(2, preQuery.get());
344-
assertEquals(2, failedDfs.get());
345289
assertEquals(2, failedFetch.get());
346290
assertEquals(2, failedQuery.get());
347-
assertEquals(2, onDfs.get());
348291
assertEquals(2, onQuery.get());
349292
assertEquals(2, onFetch.get());
350293
assertEquals(2, newContext.get());
@@ -354,13 +297,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
354297
assertEquals(0, validateSearchContext.get());
355298

356299
compositeListener.onFreeScrollContext(mock(ReaderContext.class));
357-
assertEquals(2, preDfs.get());
358300
assertEquals(2, preFetch.get());
359301
assertEquals(2, preQuery.get());
360-
assertEquals(2, failedDfs.get());
361302
assertEquals(2, failedFetch.get());
362303
assertEquals(2, failedQuery.get());
363-
assertEquals(2, onDfs.get());
364304
assertEquals(2, onQuery.get());
365305
assertEquals(2, onFetch.get());
366306
assertEquals(2, newContext.get());
@@ -382,13 +322,10 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
382322
assertThat(expected.getSuppressed()[0], not(sameInstance(expected)));
383323
}
384324
}
385-
assertEquals(2, preDfs.get());
386325
assertEquals(2, preFetch.get());
387326
assertEquals(2, preQuery.get());
388-
assertEquals(2, failedDfs.get());
389327
assertEquals(2, failedFetch.get());
390328
assertEquals(2, failedQuery.get());
391-
assertEquals(2, onDfs.get());
392329
assertEquals(2, onQuery.get());
393330
assertEquals(2, onFetch.get());
394331
assertEquals(2, newContext.get());

0 commit comments

Comments
 (0)