Search: When searching against a type with a dfs search type, dfs is ignored, closes elastic#1546.

Author: kimchy

modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java

@@ -133,16 +133,26 @@ public static class Encoders {
                     // QueryScorer uses WeightedSpanTermExtractor to extract terms, but we can't really plug into
                     // it, so, we hack here (and really only support top level queries)
                     Query query = context.parsedQuery().query();
-                    if (query instanceof FunctionScoreQuery) {
-                        query = ((FunctionScoreQuery) query).getSubQuery();
-                    } else if (query instanceof FiltersFunctionScoreQuery) {
-                        query = ((FiltersFunctionScoreQuery) query).getSubQuery();
-                    } else if (query instanceof ConstantScoreQuery) {
-                        ConstantScoreQuery q = (ConstantScoreQuery) query;
-                        if (q.getQuery() != null) {
-                            query = q.getQuery();
+                    while (true) {
+                        boolean extracted = false;
+                        if (query instanceof FunctionScoreQuery) {
+                            query = ((FunctionScoreQuery) query).getSubQuery();
+                            extracted = true;
+                        } else if (query instanceof FiltersFunctionScoreQuery) {
+                            query = ((FiltersFunctionScoreQuery) query).getSubQuery();
+                            extracted = true;
+                        } else if (query instanceof ConstantScoreQuery) {
+                            ConstantScoreQuery q = (ConstantScoreQuery) query;
+                            if (q.getQuery() != null) {
+                                query = q.getQuery();
+                                extracted = true;
+                            }
+                        }
+                        if (!extracted) {
+                            break;
                         }
                     }
+
                     QueryScorer queryScorer = new QueryScorer(query, null);
                     queryScorer.setExpandMultiTermQuery(true);
                     Fragmenter fragmenter;

modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhase.java

@@ -85,6 +85,10 @@ public class QueryPhase implements SearchPhase {
         if (context.queryBoost() != 1.0f) {
             context.parsedQuery(new ParsedQuery(new FunctionScoreQuery(context.query(), new BoostScoreFunction(context.queryBoost())), context.parsedQuery()));
         }
+        Filter searchFilter = context.mapperService().searchFilter(context.types());
+        if (searchFilter != null) {
+            context.parsedQuery(new ParsedQuery(new FilteredQuery(context.query(), context.filterCache().cache(searchFilter)), context.parsedQuery()));
+        }
         facetPhase.preProcess(context);
     }
 
@@ -169,10 +173,6 @@ public void execute(SearchContext searchContext) throws QueryPhaseExecutionExcep
             searchContext.queryResult().size(searchContext.size());
 
             Query query = searchContext.query();
-            Filter searchFilter = searchContext.mapperService().searchFilter(searchContext.types());
-            if (searchFilter != null) {
-                query = new FilteredQuery(query, searchContext.filterCache().cache(searchFilter));
-            }
 
             TopDocs topDocs;
             int numDocs = searchContext.from() + searchContext.size();