Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Noble Paul 2016-04-21 20:38:43 +05:30
parent e8cc19eb88 2ee8426d5e
commit dac6fe09bb
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -73,6 +73,9 @@ Optimizations
* LUCENE-7235: LRUQueryCache should not take a lock for segments that it will * LUCENE-7235: LRUQueryCache should not take a lock for segments that it will
not cache on anyway. (Adrien Grand) not cache on anyway. (Adrien Grand)
* LUCENE-7238: Explicitly disable the query cache in MemoryIndex#createSearcher.
(Adrien Grand)
Bug Fixes Bug Fixes
* LUCENE-7127: Fix corner case bugs in GeoPointDistanceQuery. (Robert Muir) * LUCENE-7127: Fix corner case bugs in GeoPointDistanceQuery. (Robert Muir)

1
lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
View File

@ -666,6 +666,7 @@ public class MemoryIndex {
MemoryIndexReader reader = new MemoryIndexReader(); MemoryIndexReader reader = new MemoryIndexReader();
IndexSearcher searcher = new IndexSearcher(reader); // ensures no auto-close !! IndexSearcher searcher = new IndexSearcher(reader); // ensures no auto-close !!
searcher.setSimilarity(normSimilarity); searcher.setSimilarity(normSimilarity);
searcher.setQueryCache(null);
return searcher; return searcher;
} }