You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by bu...@apache.org on 2011/02/23 22:02:39 UTC
svn commit: r1073947 - in
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index:
DocFieldProcessor.java FieldInfos.java
Author: buschmi
Date: Wed Feb 23 21:02:39 2011
New Revision: 1073947
URL: http://svn.apache.org/viewvc?rev=1073947&view=rev
Log:
LUCENE-2881: fix intermittent failing test by clearing term vectors bits in FieldInfos for segments that had only docs with non-aborting exceptions
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldInfos.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java?rev=1073947&r1=1073946&r2=1073947&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java Wed Feb 23 21:02:39 2011
@@ -59,6 +59,13 @@ final class DocFieldProcessor extends Do
// FreqProxTermsWriter does this with
// FieldInfo.storePayload.
final String fileName = IndexFileNames.segmentFileName(state.segmentName, "", IndexFileNames.FIELD_INFOS_EXTENSION);
+
+ // If this segment only has docs that hit non-aborting exceptions,
+ // then no term vectors files will have been written; therefore we
+ // need to update the fieldInfos and clear the term vectors bits
+ if (!state.hasVectors) {
+ state.fieldInfos.clearVectors();
+ }
state.fieldInfos.write(state.directory, fileName);
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldInfos.java?rev=1073947&r1=1073946&r2=1073947&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldInfos.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldInfos.java Wed Feb 23 21:02:39 2011
@@ -403,6 +403,14 @@ public final class FieldInfos implements
return false;
}
+ void clearVectors() {
+ for (FieldInfo fi : this) {
+ fi.storeTermVector = false;
+ fi.storeOffsetWithTermVector = false;
+ fi.storePositionWithTermVector = false;
+ }
+ }
+
public boolean hasNorms() {
for (FieldInfo fi : this) {
if (!fi.omitNorms) {