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/30 18:12:08 UTC
svn commit: r1392058 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/codecs/ lucene/codecs/src/test/org/apache/lucene/codecs/block/
lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/index/
Author: rmuir
Date: Sun Sep 30 16:12:08 2012
New Revision: 1392058
URL: http://svn.apache.org/viewvc?rev=1392058&view=rev
Log:
LUCENE-4453: test BlockPostings special cases
Added:
lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat2.java
- copied, changed from r1392057, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat2.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
Copied: lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat2.java (from r1392057, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat2.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat2.java?p2=lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat2.java&p1=lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat2.java&r1=1392057&r2=1392058&rev=1392058&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat2.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/test/org/apache/lucene/codecs/block/TestBlockPostingsFormat2.java Sun Sep 30 16:12:08 2012
@@ -29,6 +29,7 @@ import org.apache.lucene.index.FieldInfo
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -89,8 +90,8 @@ public class TestBlockPostingsFormat2 ex
public void testDFBlockSize() throws Exception {
Document doc = newDocument();
for (int i = 0; i < BlockPostingsFormat.BLOCK_SIZE; i++) {
- for (Field f : doc.getFields()) {
- f.setStringValue(f.name() + " " + f.name() + "_2");
+ for (IndexableField f : doc.getFields()) {
+ ((Field)f).setStringValue(f.name() + " " + f.name() + "_2");
}
iw.addDocument(doc);
}
@@ -100,8 +101,8 @@ public class TestBlockPostingsFormat2 ex
public void testDFBlockSizeMultiple() throws Exception {
Document doc = newDocument();
for (int i = 0; i < BlockPostingsFormat.BLOCK_SIZE * 16; i++) {
- for (Field f : doc.getFields()) {
- f.setStringValue(f.name() + " " + f.name() + "_2");
+ for (IndexableField f : doc.getFields()) {
+ ((Field)f).setStringValue(f.name() + " " + f.name() + "_2");
}
iw.addDocument(doc);
}
@@ -111,8 +112,8 @@ public class TestBlockPostingsFormat2 ex
public void testTTFBlockSize() throws Exception {
Document doc = newDocument();
for (int i = 0; i < BlockPostingsFormat.BLOCK_SIZE/2; i++) {
- for (Field f : doc.getFields()) {
- f.setStringValue(f.name() + " " + f.name() + " " + f.name() + "_2 " + f.name() + "_2");
+ for (IndexableField f : doc.getFields()) {
+ ((Field)f).setStringValue(f.name() + " " + f.name() + " " + f.name() + "_2 " + f.name() + "_2");
}
iw.addDocument(doc);
}
@@ -122,7 +123,7 @@ public class TestBlockPostingsFormat2 ex
public void testTTFBlockSizeMultiple() throws Exception {
Document doc = newDocument();
for (int i = 0; i < BlockPostingsFormat.BLOCK_SIZE/2; i++) {
- for (Field f : doc.getFields()) {
+ for (IndexableField f : doc.getFields()) {
String proto = (f.name() + " " + f.name() + " " + f.name() + " " + f.name() + " "
+ f.name() + "_2 " + f.name() + "_2 " + f.name() + "_2 " + f.name() + "_2");
StringBuilder val = new StringBuilder();
@@ -130,7 +131,7 @@ public class TestBlockPostingsFormat2 ex
val.append(proto);
val.append(" ");
}
- f.setStringValue(val.toString());
+ ((Field)f).setStringValue(val.toString());
}
iw.addDocument(doc);
}
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1392058&r1=1392057&r2=1392058&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Sun Sep 30 16:12:08 2012
@@ -126,8 +126,23 @@ public class RandomIndexWriter implement
// any forced merges:
doRandomForceMerge = r.nextBoolean();
}
+
+ private boolean addDocValuesFields = true;
+
+ /**
+ * set to false if you don't want RandomIndexWriter
+ * adding docvalues fields.
+ */
+ public void setAddDocValuesFields(boolean v) {
+ addDocValuesFields = v;
+ switchDoDocValues();
+ }
private void switchDoDocValues() {
+ if (addDocValuesFields == false) {
+ doDocValues = false;
+ return;
+ }
// randomly enable / disable docValues
doDocValues = LuceneTestCase.rarely(r);
if (LuceneTestCase.VERBOSE) {