Search API: filter element should not be applied to global facets, cl…

…oses elastic#888.
jev001 · Apr 28, 2011 · fb31f3c · fb31f3c
1 parent 3ff0134
commit fb31f3c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...s/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/...s/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
@@ -138,9 +138,10 @@ public void processedScope() {
     }
 
     @Override public void search(Weight weight, Filter filter, Collector collector) throws IOException {
-        if (searchContext.parsedFilter() != null) {
+        if (searchContext.parsedFilter() != null && Scopes.MAIN.equals(processingScope)) {
             // this will only get applied to the actual search collector and not
-            // to any scoped collectors
+            // to any scoped collectors, also, it will only be applied to the main collector
+            // since that is where the filter should only work
             collector = new FilteredCollector(collector, searchContext.parsedFilter());
         }
         if (searchContext.timeout() != null) {