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 2013/08/29 14:03:21 UTC
svn commit: r1518616 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/
lucene/core/src/test/org/apache/lucene/index/
Author: shaie
Date: Thu Aug 29 12:03:20 2013
New Revision: 1518616
URL: http://svn.apache.org/r1518616
Log:
LUCENE-5192: FieldInfos.Builder failed to catch adding field with different DV type under some circumstances
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1518616&r1=1518615&r2=1518616&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Thu Aug 29 12:03:20 2013
@@ -107,6 +107,9 @@ Bug Fixes
implementing end() then be sure it calls super.end(). (Robert Muir,
Mike McCandless)
+* LUCENE-5192: IndexWriter could allow adding same field name with different
+ DocValueTypes under some circumstances. (Shai Erera)
+
API Changes
* LUCENE-5094: Add ramBytesUsed() to MultiDocValues.OrdinalMap.
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java?rev=1518616&r1=1518615&r2=1518616&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java Thu Aug 29 12:03:20 2013
@@ -210,7 +210,10 @@ final class DocFieldProcessor extends Do
rehash();
}
} else {
- fp.fieldInfo.update(field.fieldType());
+ // need to addOrUpdate so that FieldInfos can update globalFieldNumbers
+ // with the correct DocValue type (LUCENE-5192)
+ FieldInfo fi = fieldInfos.addOrUpdate(fieldName, field.fieldType());
+ assert fi == fp.fieldInfo : "should only have updated an existing FieldInfo instance";
}
if (thisFieldGen != fp.lastGen) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java?rev=1518616&r1=1518615&r2=1518616&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java Thu Aug 29 12:03:20 2013
@@ -288,6 +288,8 @@ public class FieldInfos implements Itera
if (docValues != null) {
fi.setDocValuesType(docValues);
+ // must also update docValuesType map so it's aware of this field's DocValueType
+ globalFieldNumbers.docValuesType.put(name, docValues);
}
if (!fi.omitsNorms() && normType != null) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java?rev=1518616&r1=1518615&r2=1518616&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java Thu Aug 29 12:03:20 2013
@@ -26,9 +26,11 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.store.Directory;
@@ -753,4 +755,30 @@ public class TestDocValuesIndexing exten
dir.close();
}
+ public void testSameFieldNameForPostingAndDocValue() throws Exception {
+ // LUCENE-5192: FieldInfos.Builder neglected to update
+ // globalFieldNumbers.docValuesType map if the field existed, resulting in
+ // potentially adding the same field with different DV types.
+ Directory dir = newDirectory();
+ IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriter writer = new IndexWriter(dir, conf);
+
+ Document doc = new Document();
+ doc.add(new StringField("f", "mock-value", Store.NO));
+ doc.add(new NumericDocValuesField("f", 5));
+ writer.addDocument(doc);
+ writer.commit();
+
+ doc = new Document();
+ doc.add(new BinaryDocValuesField("f", new BytesRef("mock")));
+ try {
+ writer.addDocument(doc);
+ fail("should not have succeeded to add a field with different DV type than what already exists");
+ } catch (IllegalArgumentException e) {
+ writer.rollback();
+ }
+
+ dir.close();
+ }
+
}