add tests

Author: weizijun

server/src/main/java/org/elasticsearch/search/SearchService.java

@@ -160,6 +160,9 @@
 import static org.elasticsearch.core.TimeValue.timeValueMillis;
 import static org.elasticsearch.core.TimeValue.timeValueMinutes;
 import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
+import static org.elasticsearch.search.SearchService.SearchOperationType.QUERY;
+import static org.elasticsearch.search.SearchService.SearchOperationType.FETCH;
+import static org.elasticsearch.search.SearchService.SearchOperationType.DFS;
 import static org.elasticsearch.search.rank.feature.RankFeatureShardPhase.EMPTY_RESULT;
 
 public class SearchService extends AbstractLifecycleComponent implements IndexEventListener {
@@ -577,7 +580,7 @@ private DfsSearchResult executeDfsPhase(ShardSearchRequest request, SearchShardT
         Releasable scope = tracer.withScope(task);
             Releasable ignored = readerContext.markAsUsed(getKeepAlive(request));
             SearchContext context = createContext(readerContext, request, task, ResultsType.DFS, false);
-            SearchOperationListenerExecutor executor = new SearchOperationListenerExecutor(context, false, true, System.nanoTime())
+            SearchOperationListenerExecutor executor = new SearchOperationListenerExecutor(context, DFS, System.nanoTime())
         ) {
             DfsPhase.execute(context);
             executor.success();
@@ -828,7 +831,7 @@ public void executeRankFeaturePhase(RankFeatureShardRequest request, SearchShard
     private QueryFetchSearchResult executeFetchPhase(ReaderContext reader, SearchContext context, long afterQueryTime) {
         try (
             Releasable scope = tracer.withScope(context.getTask());
-            SearchOperationListenerExecutor executor = new SearchOperationListenerExecutor(context, true, afterQueryTime)
+            SearchOperationListenerExecutor executor = new SearchOperationListenerExecutor(context, FETCH, afterQueryTime)
         ) {
             fetchPhase.execute(context, shortcutDocIdsToLoad(context), null);
             if (reader.singleSession()) {
@@ -992,7 +995,7 @@ public void executeFetchPhase(ShardFetchRequest request, CancellableTask task, A
                     try (
                         SearchOperationListenerExecutor executor = new SearchOperationListenerExecutor(
                             searchContext,
-                            true,
+                            FETCH,
                             System.nanoTime()
                         )
                     ) {
@@ -1975,6 +1978,10 @@ public AggregationReduceContext forFinalReduction() {
         };
     }
 
+    enum SearchOperationType {
+        QUERY, FETCH, DFS
+    }
+
     /**
      * This helper class ensures we only execute either the success or the failure path for {@link SearchOperationListener}.
      * This is crucial for some implementations like {@link org.elasticsearch.index.search.stats.ShardSearchStats}.
@@ -1983,28 +1990,22 @@ private static final class SearchOperationListenerExecutor implements AutoClosea
         private final SearchOperationListener listener;
         private final SearchContext context;
         private final long time;
-        private final boolean fetch;
-        private final boolean dfs;
+        private final SearchOperationType searchType;
         private long afterQueryTime = -1;
         private boolean closed = false;
 
         SearchOperationListenerExecutor(SearchContext context) {
-            this(context, false, System.nanoTime());
-        }
-
-        SearchOperationListenerExecutor(SearchContext context, boolean fetch, long startTime) {
-            this(context, fetch, false, startTime);
+            this(context, QUERY, System.nanoTime());
         }
 
-        SearchOperationListenerExecutor(SearchContext context, boolean fetch, boolean dfs, long startTime) {
+        SearchOperationListenerExecutor(SearchContext context, SearchOperationType searchType, long startTime) {
             this.listener = context.indexShard().getSearchOperationListener();
             this.context = context;
             time = startTime;
-            this.fetch = fetch;
-            this.dfs = dfs;
-            if (fetch) {
+            this.searchType = searchType;
+            if (this.searchType == FETCH) {
                 listener.onPreFetchPhase(context);
-            } else {
+            } else if (this.searchType == QUERY) {
                 listener.onPreQueryPhase(context);
             }
         }
@@ -2019,17 +2020,17 @@ public void close() {
             if (closed == false) {
                 closed = true;
                 if (afterQueryTime != -1) {
-                    if (fetch) {
+                    if (this.searchType == FETCH) {
                         listener.onFetchPhase(context, afterQueryTime - time);
-                    } else if (dfs) {
+                    } else if (this.searchType == DFS) {
                         listener.onDfsPhase(context, afterQueryTime - time);
                     } else {
                         listener.onQueryPhase(context, afterQueryTime - time);
                     }
                 } else {
-                    if (fetch) {
+                    if (this.searchType == FETCH) {
                         listener.onFailedFetchPhase(context);
-                    } else {
+                    } else if (this.searchType == QUERY) {
                         listener.onFailedQueryPhase(context);
                     }
                 }

server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java

@@ -218,6 +218,7 @@ public void testTwoLoggersDifferentLevel() {
                         .put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())
                         .put(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_WARN_SETTING.getKey(), "40nanos")
                         .put(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_WARN_SETTING.getKey(), "40nanos")
+                        .put(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_DFS_WARN_SETTING.getKey(), "40nanos")
                 ),
                 Settings.EMPTY
             );
@@ -231,6 +232,7 @@ public void testTwoLoggersDifferentLevel() {
                         .put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())
                         .put(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_FETCH_TRACE_SETTING.getKey(), "10nanos")
                         .put(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_QUERY_TRACE_SETTING.getKey(), "10nanos")
+                        .put(SearchSlowLog.INDEX_SEARCH_SLOWLOG_THRESHOLD_DFS_TRACE_SETTING.getKey(), "10nanos")
                 ),
                 Settings.EMPTY
             );
@@ -242,12 +244,16 @@ public void testTwoLoggersDifferentLevel() {
                 assertNull(appender.getLastEventAndReset());
                 log1.onFetchPhase(ctx1, 11L);
                 assertNull(appender.getLastEventAndReset());
+                log1.onDfsPhase(ctx1, 11L);
+                assertNull(appender.getLastEventAndReset());
 
                 // threshold set on TRACE, should log
                 log2.onQueryPhase(ctx2, 11L);
                 assertNotNull(appender.getLastEventAndReset());
                 log2.onFetchPhase(ctx2, 11L);
                 assertNotNull(appender.getLastEventAndReset());
+                log2.onDfsPhase(ctx2, 11L);
+                assertNotNull(appender.getLastEventAndReset());
             }
         }
     }