svn commit: r1687515 - in /lucene/dev/trunk: ./ lucene/ lucene/CHANGES.txt

[jp...@apache.org]

Author: jpountz
Date: Thu Jun 25 13:23:51 2015
New Revision: 1687515

URL: http://svn.apache.org/r1687515
Log:
LUCENE-6601: Backport CHANGES entries to trunk.

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/CHANGES.txt   (contents, props changed)

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1687515&r1=1687514&r2=1687515&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Thu Jun 25 13:23:51 2015
@@ -128,6 +128,10 @@ API Changes
 * LUCENE-6525: Deprecate IndexWriterConfig's writeLockTimeout.
   (Robert Muir)
 
+* LUCENE-6583: FilteredQuery is deprecated and will be removed in 6.0. It should
+  be replaced with a BooleanQuery which handle the query as a MUST clause and
+  the filter as a FILTER clause. (Adrien Grand)
+
 Bug fixes
 
 * LUCENE-6500: ParallelCompositeReader did not always call
@@ -194,6 +198,15 @@ Changes in Runtime Behavior
 * LUCENE-2880: Span queries now score more consistently with regular queries.
   (Robert Muir, Adrien Grand)
 
+* LUCENE-6601: FilteredQuery now always rewrites to a BooleanQuery which handles
+  the query as a MUST clause and the filter as a FILTER clause.
+  LEAP_FROG_QUERY_FIRST_STRATEGY and LEAP_FROG_FILTER_FIRST_STRATEGY do not
+  guarantee anymore which iterator will be advanced first, it will depend on the
+  respective costs of the iterators. QUERY_FIRST_FILTER_STRATEGY and
+  RANDOM_ACCESS_FILTER_STRATEGY still consume the filter using its random-access
+  API, however the returned bits may be called on different documents compared
+  to before. (Adrien Grand)
+
 Optimizations
 
 * LUCENE-6548: Some optimizations for BlockTree's intersect with very