update after reviw - revert code

Author: drempapis

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

@@ -139,19 +139,6 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
             logger
         );
         try (SearchContext ctx = new TestSearchContext((SearchExecutionContext) null)) {
-            compositeListener.onDfsPhase(ctx, timeInNanos.get());
-            assertEquals(0, preFetch.get());
-            assertEquals(0, preQuery.get());
-            assertEquals(0, failedFetch.get());
-            assertEquals(0, failedQuery.get());
-            assertEquals(0, onQuery.get());
-            assertEquals(0, onFetch.get());
-            assertEquals(0, newContext.get());
-            assertEquals(0, newScrollContext.get());
-            assertEquals(0, freeContext.get());
-            assertEquals(0, freeScrollContext.get());
-            assertEquals(0, validateSearchContext.get());
-
             compositeListener.onQueryPhase(ctx, timeInNanos.get());
             assertEquals(0, preFetch.get());
             assertEquals(0, preQuery.get());
@@ -178,19 +165,6 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
             assertEquals(0, freeScrollContext.get());
             assertEquals(0, validateSearchContext.get());
 
-            compositeListener.onPreDfsPhase(ctx);
-            assertEquals(0, preFetch.get());
-            assertEquals(0, preQuery.get());
-            assertEquals(0, failedFetch.get());
-            assertEquals(0, failedQuery.get());
-            assertEquals(2, onQuery.get());
-            assertEquals(2, onFetch.get());
-            assertEquals(0, newContext.get());
-            assertEquals(0, newScrollContext.get());
-            assertEquals(0, freeContext.get());
-            assertEquals(0, freeScrollContext.get());
-            assertEquals(0, validateSearchContext.get());
-
             compositeListener.onPreQueryPhase(ctx);
 
             assertEquals(0, preFetch.get());
@@ -218,19 +192,6 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
             assertEquals(0, freeScrollContext.get());
             assertEquals(0, validateSearchContext.get());
 
-            compositeListener.onFailedDfsPhase(ctx);
-            assertEquals(2, preFetch.get());
-            assertEquals(2, preQuery.get());
-            assertEquals(0, failedFetch.get());
-            assertEquals(0, failedQuery.get());
-            assertEquals(2, onQuery.get());
-            assertEquals(2, onFetch.get());
-            assertEquals(0, newContext.get());
-            assertEquals(0, newScrollContext.get());
-            assertEquals(0, freeContext.get());
-            assertEquals(0, freeScrollContext.get());
-            assertEquals(0, validateSearchContext.get());
-
             compositeListener.onFailedFetchPhase(ctx);
             assertEquals(2, preFetch.get());
             assertEquals(2, preQuery.get());

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsMonitoringDocTests.java

@@ -187,7 +187,6 @@ private CommonStats mockCommonStats() {
         commonStats.getIndexing().add(new IndexingStats(indexingStats));
 
         final SearchStats.Stats searchStats = new SearchStats.Stats(6L, 7L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0.0);
-
         commonStats.getSearch().add(new SearchStats(searchStats, 0L, null));
 
         final BulkStats bulkStats = new BulkStats(0L, 0L, 0L, 0L, 0L);