Remove suggest transport action

core/src/main/java/org/elasticsearch/action/ActionModule.java

@@ -173,8 +173,6 @@
 import org.elasticsearch.action.search.TransportMultiSearchAction;
 import org.elasticsearch.action.search.TransportSearchAction;
 import org.elasticsearch.action.search.TransportSearchScrollAction;
-import org.elasticsearch.action.suggest.SuggestAction;
-import org.elasticsearch.action.suggest.TransportSuggestAction;
 import org.elasticsearch.action.support.ActionFilter;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.AutoCreateIndex;
@@ -320,7 +318,6 @@ protected void configure() {
         registerAction(MultiTermVectorsAction.INSTANCE, TransportMultiTermVectorsAction.class,
                 TransportShardMultiTermsVectorAction.class);
         registerAction(DeleteAction.INSTANCE, TransportDeleteAction.class);
-        registerAction(SuggestAction.INSTANCE, TransportSuggestAction.class);
         registerAction(UpdateAction.INSTANCE, TransportUpdateAction.class);
         registerAction(MultiGetAction.INSTANCE, TransportMultiGetAction.class,
                 TransportShardMultiGetAction.class);

core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java

@@ -42,7 +42,6 @@
 import org.elasticsearch.index.shard.DocsStats;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.store.StoreStats;
-import org.elasticsearch.index.suggest.stats.SuggestStats;
 import org.elasticsearch.index.translog.TranslogStats;
 import org.elasticsearch.index.warmer.WarmerStats;
 import org.elasticsearch.indices.IndicesQueryCache;
@@ -109,7 +108,7 @@ public CommonStats(CommonStatsFlags flags) {
                     translog = new TranslogStats();
                     break;
                 case Suggest:
-                    suggest = new SuggestStats();
+                    // skip
                     break;
                 case RequestCache:
                     requestCache = new RequestCacheStats();
@@ -177,7 +176,7 @@ public CommonStats(IndicesQueryCache indicesQueryCache, PercolatorQueryCache per
                     translog = indexShard.translogStats();
                     break;
                 case Suggest:
-                    suggest = indexShard.suggestStats();
+                    // skip
                     break;
                 case RequestCache:
                     requestCache = indexShard.requestCache().stats();
@@ -236,9 +235,6 @@ public CommonStats(IndicesQueryCache indicesQueryCache, PercolatorQueryCache per
     @Nullable
     public TranslogStats translog;
 
-    @Nullable
-    public SuggestStats suggest;
-
     @Nullable
     public RequestCacheStats requestCache;
 
@@ -367,14 +363,6 @@ public void add(CommonStats stats) {
         } else {
             translog.add(stats.getTranslog());
         }
-        if (suggest == null) {
-            if (stats.getSuggest() != null) {
-                suggest = new SuggestStats();
-                suggest.add(stats.getSuggest());
-            }
-        } else {
-            suggest.add(stats.getSuggest());
-        }
         if (requestCache == null) {
             if (stats.getRequestCache() != null) {
                 requestCache = new RequestCacheStats();
@@ -468,11 +456,6 @@ public TranslogStats getTranslog() {
         return translog;
     }
 
-    @Nullable
-    public SuggestStats getSuggest() {
-        return suggest;
-    }
-
     @Nullable
     public RequestCacheStats getRequestCache() {
         return requestCache;
@@ -555,7 +538,6 @@ public void readFrom(StreamInput in) throws IOException {
             segments = SegmentsStats.readSegmentsStats(in);
         }
         translog = in.readOptionalStreamable(TranslogStats::new);
-        suggest = in.readOptionalStreamable(SuggestStats::new);
         requestCache = in.readOptionalStreamable(RequestCacheStats::new);
         recoveryStats = in.readOptionalStreamable(RecoveryStats::new);
     }
@@ -647,7 +629,6 @@ public void writeTo(StreamOutput out) throws IOException {
             segments.writeTo(out);
         }
         out.writeOptionalStreamable(translog);
-        out.writeOptionalStreamable(suggest);
         out.writeOptionalStreamable(requestCache);
         out.writeOptionalStreamable(recoveryStats);
     }
@@ -700,9 +681,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         if (translog != null) {
             translog.toXContent(builder, params);
         }
-        if (suggest != null) {
-            suggest.toXContent(builder, params);
-        }
         if (requestCache != null) {
             requestCache.toXContent(builder, params);
         }

core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java

@@ -244,7 +244,7 @@ public static enum Flag {
         Completion("completion"),
         Segments("segments"),
         Translog("translog"),
-        Suggest("suggest"),
+        Suggest("suggest"), // unused
         RequestCache("request_cache"),
         Recovery("recovery");
 

core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java

@@ -152,11 +152,6 @@ public IndicesStatsRequestBuilder setTranslog(boolean translog) {
         return this;
     }
 
-    public IndicesStatsRequestBuilder setSuggest(boolean suggest) {
-        request.suggest(suggest);
-        return this;
-    }
-
     public IndicesStatsRequestBuilder setRequestCache(boolean requestCache) {
         request.requestCache(requestCache);
         return this;

core/src/main/java/org/elasticsearch/action/search/SearchRequest.java

@@ -295,6 +295,13 @@ public Boolean requestCache() {
         return this.requestCache;
     }
 
+    /**
+     * @return true if the request only has suggest
+     */
+    public boolean isSuggestOnly() {
+        return source != null && source.isSuggestOnly();
+    }
+
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);

core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

@@ -38,6 +38,7 @@
 import java.util.Set;
 
 import static org.elasticsearch.action.search.SearchType.QUERY_AND_FETCH;
+import static org.elasticsearch.action.search.SearchType.QUERY_THEN_FETCH;
 
 /**
  *
@@ -72,6 +73,17 @@ protected void doExecute(SearchRequest searchRequest, ActionListener<SearchRespo
                 // if we only have one group, then we always want Q_A_F, no need for DFS, and no need to do THEN since we hit one shard
                 searchRequest.searchType(QUERY_AND_FETCH);
             }
+            if (searchRequest.isSuggestOnly()) {
+                // disable request cache if we have only suggest
+                searchRequest.requestCache(false);
+                switch (searchRequest.searchType()) {
+                    case DFS_QUERY_AND_FETCH:
+                    case DFS_QUERY_THEN_FETCH:
+                        // convert to Q_T_F if we have only suggest
+                        searchRequest.searchType(QUERY_THEN_FETCH);
+                        break;
+                }
+            }
         } catch (IndexNotFoundException | IndexClosedException e) {
             // ignore these failures, we will notify the search response if its really the case from the actual action
         } catch (Exception e) {