You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/02/27 12:02:06 UTC
svn commit: r1075023 -
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
Author: mikemccand
Date: Sun Feb 27 11:02:06 2011
New Revision: 1075023
URL: http://svn.apache.org/viewvc?rev=1075023&view=rev
Log:
LUCENE-2940: pass potent reader to mergedSegmentWarmer even if poolReaders is false
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1075023&r1=1075022&r2=1075023&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java Sun Feb 27 11:02:06 2011
@@ -857,14 +857,14 @@ public class IndexWriter implements Clos
private FieldInfos getCurrentFieldInfos() throws IOException {
final FieldInfos fieldInfos;
if (segmentInfos.size() > 0) {
- fieldInfos = new FieldInfos();
- for(SegmentInfo info : segmentInfos) {
- final FieldInfos segFieldInfos = getFieldInfos(info);
+ fieldInfos = new FieldInfos();
+ for(SegmentInfo info : segmentInfos) {
+ final FieldInfos segFieldInfos = getFieldInfos(info);
for (FieldInfo fi : segFieldInfos) {
fieldInfos.add(fi);
- }
}
- } else {
+ }
+ } else {
fieldInfos = new FieldInfos();
}
return fieldInfos;
@@ -3290,7 +3290,7 @@ public class IndexWriter implements Clos
final int termsIndexDivisor;
final boolean loadDocStores;
- if (poolReaders && mergedSegmentWarmer != null) {
+ if (mergedSegmentWarmer != null) {
// Load terms index & doc stores so the segment
// warmer can run searches, load documents/term
// vectors
@@ -3298,7 +3298,6 @@ public class IndexWriter implements Clos
loadDocStores = true;
} else {
termsIndexDivisor = -1;
- loadDocStores = false;
}
// TODO: in the non-realtime case, we may want to only