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

[us...@apache.org]

Author: uschindler
Date: Fri Dec  9 17:54:08 2011
New Revision: 1212545

URL: http://svn.apache.org/viewvc?rev=1212545&view=rev
Log:
LUCENE-3606: merge changes

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

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1212545&r1=1212544&r2=1212545&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Fri Dec  9 17:54:08 2011
@@ -217,7 +217,11 @@ Changes in backwards compatibility polic
   instances. Furthermore, IndexReader.setNorm() was removed. If you need
   customized norm values, the recommended way to do this is by modifying
   SimilarityProvider to use an external byte[] or one of the new DocValues
-  fields (LUCENE-3108).  (Uwe Schindler, Robert Muir)
+  fields (LUCENE-3108). If you want to dynamically change norms (boost
+  *and* length norm) at query time, wrap your IndexReader using
+  FilterIndexReader, overriding FilterIndexReader.norms(). To persist the
+  changes on disk, copy the FilteredIndexReader to a new index using
+  IndexWriter.addIndexes().  (Uwe Schindler, Robert Muir)
   
 Changes in Runtime Behavior
 
@@ -676,6 +680,22 @@ Security fixes
   prevents this as best as it can by throwing AlreadyClosedException
   also on clones.  (Uwe Schindler, Robert Muir)
 
+API Changes
+
+* LUCENE-3606: IndexReader will be made read-only in Lucene 4.0, so all
+  methods allowing to delete or undelete documents using IndexReader were
+  deprecated; you should use IndexWriter now. Consequently
+  IndexReader.commit() and all open(), openIfChanged(), clone() methods
+  taking readOnly booleans (or IndexDeletionPolicy instances) were
+  deprecated. IndexReader.setNorm() is superfluous and was deprecated.
+  If you have to change per-document boost use CustomScoreQuery.
+  If you want to dynamically change norms (boost *and* length norm) at
+  query time, wrap your IndexReader using FilterIndexReader, overriding
+  FilterIndexReader.norms(). To persist the changes on disk, copy the
+  FilteredIndexReader to a new index using IndexWriter.addIndexes().
+  In Lucene 4.0, SimilarityProvider will allow you to customize scoring
+  using external norms, too.  (Uwe Schindler, Robert Muir)
+
 New Features
 
 * LUCENE-3593: Added a FieldValueFilter that accepts all documents that either

Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=1212545&r1=1212544&r2=1212545&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Fri Dec  9 17:54:08 2011
@@ -76,6 +76,11 @@ API Changes
  * LUCENE-3308: DuplicateFilter keepMode and processingMode have been converted to
    enums DuplicateFilter.KeepMode and DuplicateFilter.ProcessingMode repsectively.
    
+* LUCENE-3606: FieldNormModifier was deprecated, because IndexReader's
+  setNorm() was deprecated. Furthermore, this class is broken, as it does
+  not take position overlaps into account while recalculating norms.
+  (Uwe Schindler, Robert Muir)
+
 Bug Fixes
 
  * LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was