浏览代码

Release SearchContext releaseables also post match filters / queries.

Martijn van Groningen 12 年之前
父节点
当前提交
682e9548c1

+ 2 - 2
src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java

@@ -206,10 +206,10 @@ public class TopChildrenQuery extends Query {
                 ParentDoc[] _parentDocs = value.v().values().toArray(ParentDoc.class);
                 ParentDoc[] _parentDocs = value.v().values().toArray(ParentDoc.class);
                 Arrays.sort(_parentDocs, PARENT_DOC_COMP);
                 Arrays.sort(_parentDocs, PARENT_DOC_COMP);
                 parentDocs.v().put(keys[i], _parentDocs);
                 parentDocs.v().put(keys[i], _parentDocs);
-                value.release();
+                RecyclerUtils.release(value);
             }
             }
         }
         }
-        parentDocsPerReader.release();
+        RecyclerUtils.release(parentDocsPerReader);
         return parentHitsResolved;
         return parentHitsResolved;
     }
     }
 
 

+ 2 - 0
src/main/java/org/elasticsearch/search/fetch/matchedqueries/MatchedQueriesFetchSubPhase.java

@@ -97,6 +97,8 @@ public class MatchedQueriesFetchSubPhase implements FetchSubPhase {
                 }
                 }
             } catch (IOException e) {
             } catch (IOException e) {
                 // ignore
                 // ignore
+            } finally {
+                SearchContext.current().clearReleasables();
             }
             }
         }
         }
     }
     }