You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/04/28 16:47:03 UTC

svn commit: r1590661 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java lucene/core/src/java/org/apache/lucene/index/SegmentReader.java

Author: shaie
Date: Mon Apr 28 14:47:03 2014
New Revision: 1590661

URL: http://svn.apache.org/r1590661
Log:
add DocValuesProducer to the Set once for all fields

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java?rev=1590661&r1=1590660&r2=1590661&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java Mon Apr 28 14:47:03 2014
@@ -537,7 +537,7 @@ class ReadersAndUpdates {
       success = true;
     } finally {
       if (!success) {
-        // Advance only the nextWriteDocValuesGen so that a 2nd
+        // Advance only the nextWriteFieldInfosGen so that a 2nd
         // attempt to write will write to a new file
         info.advanceNextWriteFieldInfosGen();
         

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java?rev=1590661&r1=1590660&r2=1590661&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Mon Apr 28 14:47:03 2014
@@ -189,8 +189,8 @@ public final class SegmentReader extends
       DocValuesProducer dvp = segDocValues.getDocValuesProducer(gen, si, IOContext.READ, dir, dvFormat, infos, getTermInfosIndexDivisor());
       for (FieldInfo fi : infos) {
         dvProducersByField.put(fi.name, dvp);
-        dvProducers.add(dvp);
       }
+      dvProducers.add(dvp);
     }
     
     dvGens.addAll(genInfos.keySet());