You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/09/04 21:33:37 UTC
svn commit: r1380824 - in /lucene/dev/trunk/lucene/core/src:
java/org/apache/lucene/document/ java/org/apache/lucene/index/
test/org/apache/lucene/index/
Author: rmuir
Date: Tue Sep 4 19:33:37 2012
New Revision: 1380824
URL: http://svn.apache.org/viewvc?rev=1380824&view=rev
Log:
LUCENE-4359: allow docvalues to be unstored
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Document.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/FieldType.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/PackedLongDocValuesField.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Document.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Document.java?rev=1380824&r1=1380823&r2=1380824&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Document.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Document.java Tue Sep 4 19:33:37 2012
@@ -313,7 +313,7 @@ public final class Document implements I
return new FilterIterator<Field>(fields.iterator()) {
@Override
protected boolean predicateFunction(Field field) {
- return field.type.stored();
+ return field.type.stored() || field.type.docValueType() != null;
}
};
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/FieldType.java?rev=1380824&r1=1380823&r2=1380824&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/FieldType.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/FieldType.java Tue Sep 4 19:33:37 2012
@@ -424,6 +424,5 @@ public class FieldType implements Indexa
public void setDocValueType(DocValues.Type type) {
checkIfFrozen();
docValueType = type;
- this.stored = true;
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/PackedLongDocValuesField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/PackedLongDocValuesField.java?rev=1380824&r1=1380823&r2=1380824&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/PackedLongDocValuesField.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/PackedLongDocValuesField.java Tue Sep 4 19:33:37 2012
@@ -47,7 +47,6 @@ public class PackedLongDocValuesField ex
public static final FieldType TYPE = new FieldType();
static {
TYPE.setDocValueType(DocValues.Type.VAR_INTS);
- TYPE.setStored(true);
TYPE.freeze();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java?rev=1380824&r1=1380823&r2=1380824&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java Tue Sep 4 19:33:37 2012
@@ -232,9 +232,11 @@ final class DocFieldProcessor extends Do
IndexableFieldType ft = field.fieldType();
DocFieldProcessorPerField fp = processField(fieldInfos, thisFieldGen, fieldName, ft);
- fieldsWriter.addField(field, fp.fieldInfo);
+ if (ft.stored()) {
+ fieldsWriter.addField(field, fp.fieldInfo);
+ }
- final DocValues.Type dvType = field.fieldType().docValueType();
+ final DocValues.Type dvType = ft.docValueType();
if (dvType != null) {
DocValuesConsumerHolder docValuesConsumer = docValuesConsumer(dvType,
docState, fp.fieldInfo);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java?rev=1380824&r1=1380823&r2=1380824&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java Tue Sep 4 19:33:37 2012
@@ -1042,4 +1042,34 @@ public class TestDocValuesIndexing exten
w.close();
d.close();
}
+
+ public void testDocValuesUnstored() throws IOException {
+ Directory dir = newDirectory();
+ IndexWriterConfig iwconfig = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ iwconfig.setMergePolicy(newLogMergePolicy());
+ IndexWriter writer = new IndexWriter(dir, iwconfig);
+ for (int i = 0; i < 50; i++) {
+ Document doc = new Document();
+ doc.add(new PackedLongDocValuesField("dv", i));
+ doc.add(new TextField("docId", "" + i, Field.Store.YES));
+ writer.addDocument(doc);
+ }
+ DirectoryReader r = writer.getReader();
+ SlowCompositeReaderWrapper slow = new SlowCompositeReaderWrapper(r);
+ FieldInfos fi = slow.getFieldInfos();
+ FieldInfo dvInfo = fi.fieldInfo("dv");
+ assertTrue(dvInfo.hasDocValues());
+ DocValues dv = slow.docValues("dv");
+ Source source = dv.getDirectSource();
+ for (int i = 0; i < 50; i++) {
+ assertEquals(i, source.getInt(i));
+ StoredDocument d = slow.document(i);
+ // cannot use d.get("dv") due to another bug!
+ assertNull(d.getField("dv"));
+ assertEquals(Integer.toString(i), d.get("docId"));
+ }
+ slow.close();
+ writer.close();
+ dir.close();
+ }
}