update spot

Author: drempapis

server/src/internalClusterTest/java/org/elasticsearch/monitor/metrics/IndicesMetricsIT.java

@@ -273,7 +273,6 @@ public void testIndicesMetrics() {
             )
         );
 
-
         client(searchNode).prepareSearch("time*").setPreference(preference).setSize(100).get().decRef();
         var search2 = indicesService.stats(CommonStatsFlags.ALL, false).getSearch().getTotal();
         collectThenAssertMetrics(

server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java

@@ -130,7 +130,7 @@ public void testSimpleStats() throws Exception {
 
         IndicesStatsResponse indicesStats = indicesAdmin().prepareStats().get();
         logger.debug("###### indices search stats: {}", indicesStats.getTotal().getSearch());
-        assertThat(indicesStats.getTotal().getSearch().getTotal().getDfsCount(),equalTo(0L));
+        assertThat(indicesStats.getTotal().getSearch().getTotal().getDfsCount(), equalTo(0L));
         assertThat(indicesStats.getTotal().getSearch().getTotal().getDfsTimeInMillis(), equalTo(0L));
         assertThat(indicesStats.getTotal().getSearch().getTotal().getQueryCount(), greaterThan(0L));
         assertThat(indicesStats.getTotal().getSearch().getTotal().getQueryTimeInMillis(), greaterThan(0L));

server/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java

@@ -107,13 +107,13 @@ public void onFetchPhase(SearchContext searchContext, long tookInNanos) {
         });
     }
 
-      @Override
-   public void onPreDfsPhase(SearchContext searchContext) {
+    @Override
+    public void onPreDfsPhase(SearchContext searchContext) {
         computeStats(searchContext, statsHolder -> statsHolder.dfsCurrent.inc());
     }
 
     @Override
-   public void onDfsPhase(SearchContext searchContext, long tookInNanos) {
+    public void onDfsPhase(SearchContext searchContext, long tookInNanos) {
         computeStats(searchContext, statsHolder -> {
             statsHolder.dfsMetric.inc(tookInNanos);
             statsHolder.dfsCurrent.dec();

server/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java

@@ -79,7 +79,7 @@ default void onPreDfsPhase(SearchContext searchContext) {}
      *
      * @see #onFailedQueryPhase(SearchContext)
      */
-   default void onDfsPhase(SearchContext searchContext, long tookInNanos) {}
+    default void onDfsPhase(SearchContext searchContext, long tookInNanos) {}
 
     /**
      * Executed if a dfs phased failed.

server/src/test/java/org/elasticsearch/index/search/stats/SearchStatsTests.java

@@ -22,9 +22,9 @@ public void testShardLevelSearchGroupStats() throws Exception {
         // let's create two dummy search stats with groups
         Map<String, Stats> groupStats1 = new HashMap<>();
         Map<String, Stats> groupStats2 = new HashMap<>();
-        groupStats2.put("group1", new Stats(1,1,1,1,1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1));
-        SearchStats searchStats1 = new SearchStats(new Stats(1,1,1,1,1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), 0, groupStats1);
-        SearchStats searchStats2 = new SearchStats(new Stats(1,1,1,1,1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), 0, groupStats2);
+        groupStats2.put("group1", new Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1));
+        SearchStats searchStats1 = new SearchStats(new Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), 0, groupStats1);
+        SearchStats searchStats2 = new SearchStats(new Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), 0, groupStats2);
 
         // adding these two search stats and checking group stats are correct
         searchStats1.add(searchStats2);

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

@@ -177,7 +177,6 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
             assertEquals(0, freeScrollContext.get());
             assertEquals(0, validateSearchContext.get());
 
-
             compositeListener.onQueryPhase(ctx, timeInNanos.get());
             assertEquals(0, preDfs.get());
             assertEquals(0, preFetch.get());

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

@@ -408,7 +408,26 @@ private static CommonStats mockCommonStats() {
         );
         commonStats.getIndexing().add(new IndexingStats(indexingStats));
 
-        final SearchStats.Stats searchStats = new SearchStats.Stats(++iota, ++iota, no, no, no, no, no, no, no, no, no, no, no, no);
+        final SearchStats.Stats searchStats = new SearchStats.Stats(
+            no,
+            no,
+            no,
+            no,
+            ++iota,
+            ++iota,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no
+        );
         commonStats.getSearch().add(new SearchStats(searchStats, no, null));
 
         final SegmentsStats segmentsStats = new SegmentsStats();

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

@@ -186,7 +186,7 @@ private CommonStats mockCommonStats() {
         final IndexingStats.Stats indexingStats = new IndexingStats.Stats(3L, 4L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, true, 5L, 0, 0, 0.0, 0.0);
         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);
+        final SearchStats.Stats searchStats = new SearchStats.Stats(0L, 0L, 0L, 0L, 6L, 7L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L);
         commonStats.getSearch().add(new SearchStats(searchStats, 0L, null));
 
         final BulkStats bulkStats = new BulkStats(0L, 0L, 0L, 0L, 0L);

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsMonitoringDocTests.java

@@ -356,7 +356,26 @@ private static NodeStats mockNodeStats() {
         indicesCommonStats.getQueryCache().add(new QueryCacheStats(++iota, ++iota, ++iota, ++iota, no));
         indicesCommonStats.getRequestCache().add(new RequestCacheStats(++iota, ++iota, ++iota, ++iota));
 
-        final SearchStats.Stats searchStats = new SearchStats.Stats(++iota, ++iota, no, no, no, no, no, no, no, no, no, no, no, no);
+        final SearchStats.Stats searchStats = new SearchStats.Stats(
+            no,
+            no,
+            no,
+            no,
+            ++iota,
+            ++iota,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no,
+            no
+        );
         indicesCommonStats.getSearch().add(new SearchStats(searchStats, no, null));
 
         final SegmentsStats segmentsStats = new SegmentsStats();