Query DSL: Allow to control if filters should be cached, closes #181.

modules/elasticsearch/src/main/java/org/apache/lucene/search/DeletionAwareConstantScoreQuery.java

@@ -0,0 +1,230 @@
+/*
+ * Licensed to Elastic Search and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Elastic Search licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.lucene.search;
+
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+
+import java.io.IOException;
+import java.util.Set;
+
+/**
+ * @author kimchy (shay.banon)
+ */
+// LUCENE MONITOR: Against ConstantScoreQuery, basically added logic in the doc iterator to take deletions into account
+// So it can basically be cached safely even with a reader that changes deletions but remain with teh same cache key
+// See more: https://issues.apache.org/jira/browse/LUCENE-2468
+public class DeletionAwareConstantScoreQuery extends Query {
+    protected final Filter filter;
+    protected final boolean deletionAware;
+
+    public DeletionAwareConstantScoreQuery(Filter filter) {
+        this(filter, false);
+    }
+
+    public DeletionAwareConstantScoreQuery(Filter filter, boolean deletionAware) {
+        this.filter = filter;
+        this.deletionAware = deletionAware;
+    }
+
+    /**
+     * Returns the encapsulated filter
+     */
+    public Filter getFilter() {
+        return filter;
+    }
+
+    @Override
+    public Query rewrite(IndexReader reader) throws IOException {
+        return this;
+    }
+
+    @Override
+    public void extractTerms(Set<Term> terms) {
+        // OK to not add any terms when used for MultiSearcher,
+        // but may not be OK for highlighting
+    }
+
+    protected class ConstantWeight extends Weight {
+        private Similarity similarity;
+        private float queryNorm;
+        private float queryWeight;
+
+        public ConstantWeight(Searcher searcher) {
+            this.similarity = getSimilarity(searcher);
+        }
+
+        @Override
+        public Query getQuery() {
+            return DeletionAwareConstantScoreQuery.this;
+        }
+
+        @Override
+        public float getValue() {
+            return queryWeight;
+        }
+
+        @Override
+        public float sumOfSquaredWeights() throws IOException {
+            queryWeight = getBoost();
+            return queryWeight * queryWeight;
+        }
+
+        @Override
+        public void normalize(float norm) {
+            this.queryNorm = norm;
+            queryWeight *= this.queryNorm;
+        }
+
+        @Override
+        public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException {
+            return new ConstantScorer(similarity, reader, this);
+        }
+
+        @Override
+        public Explanation explain(IndexReader reader, int doc) throws IOException {
+
+            ConstantScorer cs = new ConstantScorer(similarity, reader, this);
+            boolean exists = cs.docIdSetIterator.advance(doc) == doc;
+
+            ComplexExplanation result = new ComplexExplanation();
+
+            if (exists) {
+                result.setDescription("ConstantScoreQuery(" + filter
+                        + "), product of:");
+                result.setValue(queryWeight);
+                result.setMatch(Boolean.TRUE);
+                result.addDetail(new Explanation(getBoost(), "boost"));
+                result.addDetail(new Explanation(queryNorm, "queryNorm"));
+            } else {
+                result.setDescription("ConstantScoreQuery(" + filter
+                        + ") doesn't match id " + doc);
+                result.setValue(0);
+                result.setMatch(Boolean.FALSE);
+            }
+            return result;
+        }
+    }
+
+    protected class ConstantScorer extends Scorer {
+        final IndexReader reader;
+        final DocIdSetIterator docIdSetIterator;
+        final float theScore;
+
+        public ConstantScorer(Similarity similarity, IndexReader reader, Weight w) throws IOException {
+            super(similarity);
+            this.reader = reader;
+            theScore = w.getValue();
+            DocIdSet docIdSet = filter.getDocIdSet(reader);
+            if (docIdSet == null) {
+                docIdSetIterator = DocIdSet.EMPTY_DOCIDSET.iterator();
+            } else {
+                DocIdSetIterator iter = docIdSet.iterator();
+                if (iter == null) {
+                    docIdSetIterator = DocIdSet.EMPTY_DOCIDSET.iterator();
+                } else {
+                    docIdSetIterator = iter;
+                }
+            }
+        }
+
+        @Override
+        public int nextDoc() throws IOException {
+            if (deletionAware) {
+                int nextDoc;
+                while ((nextDoc = docIdSetIterator.nextDoc()) != NO_MORE_DOCS) {
+                    if (!reader.isDeleted(nextDoc)) {
+                        return nextDoc;
+                    }
+                }
+                return nextDoc;
+            } else {
+                return docIdSetIterator.nextDoc();
+            }
+        }
+
+        @Override
+        public int docID() {
+            return docIdSetIterator.docID();
+        }
+
+        @Override
+        public float score() throws IOException {
+            return theScore;
+        }
+
+        @Override
+        public int advance(int target) throws IOException {
+            if (deletionAware) {
+                int doc = docIdSetIterator.advance(target);
+                if (doc == NO_MORE_DOCS) {
+                    return doc;
+                }
+                if (!reader.isDeleted(doc)) {
+                    return doc;
+                }
+                while ((doc = nextDoc()) < target) {
+                    if (!reader.isDeleted(doc)) {
+                        return doc;
+                    }
+                }
+                return doc;
+            } else {
+                return docIdSetIterator.advance(target);
+            }
+        }
+    }
+
+    @Override
+    public Weight createWeight(Searcher searcher) {
+        return new DeletionAwareConstantScoreQuery.ConstantWeight(searcher);
+    }
+
+    /**
+     * Prints a user-readable version of this query.
+     */
+    @Override
+    public String toString(String field) {
+        return "ConstantScore(" + filter.toString()
+                + (getBoost() == 1.0 ? ")" : "^" + getBoost());
+    }
+
+    /**
+     * Returns true if <code>o</code> is equal to this.
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof ConstantScoreQuery)) return false;
+        ConstantScoreQuery other = (ConstantScoreQuery) o;
+        return this.getBoost() == other.getBoost() && filter.equals(other.filter);
+    }
+
+    /**
+     * Returns a hash code value for this object.
+     */
+    @Override
+    public int hashCode() {
+        // Simple add is OK since no existing filter hashcode has a float component.
+        return filter.hashCode() + Float.floatToIntBits(getBoost());
+    }
+
+}
+

modules/elasticsearch/src/main/java/org/apache/lucene/search/OpenFilterClause.java

@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elastic Search and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Elastic Search licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.lucene.search;
+
+/**
+ * @author kimchy (shay.banon)
+ */
+public class OpenFilterClause extends FilterClause {
+
+    public OpenFilterClause(Filter filter, BooleanClause.Occur occur) {
+        super(filter, occur);
+    }
+
+    public void setFilter(Filter filter) {
+        this.filter = filter;
+    }
+}

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/FilterCache.java

@@ -32,6 +32,8 @@ public interface FilterCache extends IndexComponent, CloseableComponent {
 
     Filter cache(Filter filterToCache);
 
+    boolean isCached(Filter filter);
+
     void clear();
 
     /**

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java

@@ -49,6 +49,10 @@ public class NoneFilterCache extends AbstractIndexComponent implements FilterCac
         return filterToCache;
     }
 
+    @Override public boolean isCached(Filter filter) {
+        return false;
+    }
+
     @Override public void clear() {
         // nothing to do here
     }

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/AbstractConcurrentMapFilterCache.java

@@ -81,6 +81,10 @@ protected AbstractConcurrentMapFilterCache(Index index, @IndexSettings Settings
         return new FilterCacheFilterWrapper(filterToCache);
     }
 
+    @Override public boolean isCached(Filter filter) {
+        return filter instanceof FilterCacheFilterWrapper;
+    }
+
     protected ConcurrentMap<Filter, DocIdSet> buildFilterMap() {
         return newConcurrentMap();
     }

modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/IndexEngine.java

@@ -29,5 +29,11 @@
  */
 public interface IndexEngine extends IndexComponent {
 
+    /**
+     * Are readers cloned on deletion? If this is the case, then some specific
+     * needs to be taken.
+     */
+    boolean readerClonedOnDeletion();
+
     void close();
 }

modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngine.java

@@ -26,15 +26,28 @@
 import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.Settings;
 
+import static org.elasticsearch.util.settings.ImmutableSettings.Builder.*;
+
 /**
  * @author kimchy (shay.banon)
  */
 public class RobinIndexEngine extends AbstractIndexComponent implements IndexEngine {
 
+    public RobinIndexEngine(Index index) {
+        this(index, EMPTY_SETTINGS);
+    }
+
     @Inject public RobinIndexEngine(Index index, @IndexSettings Settings indexSettings) {
         super(index, indexSettings);
     }
 
+    /**
+     * With NRT, readers are cloned on deletions... .
+     */
+    @Override public boolean readerClonedOnDeletion() {
+        return true;
+    }
+
     @Override public void close() {
     }
 }

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java

@@ -23,6 +23,7 @@
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.analysis.AnalysisService;
 import org.elasticsearch.index.cache.IndexCache;
+import org.elasticsearch.index.engine.IndexEngine;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser;
 import org.elasticsearch.index.settings.IndexSettings;
@@ -51,13 +52,13 @@ public static final class Defaults {
 
     private final Map<String, IndexQueryParser> indexQueryParsers;
 
-    public IndexQueryParserService(Index index, MapperService mapperService, IndexCache indexCache, AnalysisService analysisService) {
-        this(index, ImmutableSettings.Builder.EMPTY_SETTINGS, mapperService, indexCache, analysisService, null, null);
+    public IndexQueryParserService(Index index, MapperService mapperService, IndexCache indexCache, IndexEngine indexEngine, AnalysisService analysisService) {
+        this(index, ImmutableSettings.Builder.EMPTY_SETTINGS, mapperService, indexCache, indexEngine, analysisService, null, null);
     }
 
     @Inject public IndexQueryParserService(Index index, @IndexSettings Settings indexSettings,
                                            MapperService mapperService, IndexCache indexCache,
-                                           AnalysisService analysisService,
+                                           IndexEngine indexEngine, AnalysisService analysisService,
                                            @Nullable SimilarityService similarityService,
                                            @Nullable Map<String, IndexQueryParserFactory> indexQueryParsersFactories) {
         super(index, indexSettings);
@@ -76,7 +77,7 @@ public IndexQueryParserService(Index index, MapperService mapperService, IndexCa
             }
         }
         if (!qparsers.containsKey(Defaults.DEFAULT)) {
-            IndexQueryParser defaultQueryParser = new XContentIndexQueryParser(index, indexSettings, mapperService, indexCache, analysisService, similarityService, null, null, Defaults.DEFAULT, null);
+            IndexQueryParser defaultQueryParser = new XContentIndexQueryParser(index, indexSettings, mapperService, indexCache, indexEngine, analysisService, similarityService, null, null, Defaults.DEFAULT, null);
             qparsers.put(Defaults.DEFAULT, defaultQueryParser);
         }