Also delegate rewrite the the wrapped IndexSearcher.

In the the AssertingIndexSearcher is used we then also have extra validation when rewritting the query.
martijnvg · Aug 14, 2015 · 0688ddd · 0688ddd
1 parent 2fecc7e
commit 0688ddd
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/core/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/core/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
@@ -63,6 +63,16 @@ public void dfSource(CachedDfSource dfSource) {
         this.dfSource = dfSource;
     }
 
+    @Override
+    public Query rewrite(Query original) throws IOException {
+        try {
+            return in.rewrite(original);
+        } catch (Throwable t) {
+            searchContext.clearReleasables(Lifetime.COLLECTION);
+            throw ExceptionsHelper.convertToElastic(t);
+        }
+    }
+
     @Override
     public Weight createNormalizedWeight(Query query, boolean needsScores) throws IOException {
         try {