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/05/12 15:49:02 UTC
svn commit: r1337544 - in
/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index:
TestAddIndexes.java TestDocValuesIndexing.java
Author: rmuir
Date: Sat May 12 13:49:02 2012
New Revision: 1337544
URL: http://svn.apache.org/viewvc?rev=1337544&view=rev
Log:
move dv addindexes test so we can remove the assume
Modified:
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1337544&r1=1337543&r2=1337544&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java Sat May 12 13:49:02 2012
@@ -1256,43 +1256,4 @@ public class TestAddIndexes extends Luce
r3.close();
d3.close();
}
-
- public void testDocValues() throws IOException {
- assumeFalse("preflex does not support docvalues", Codec.getDefault().getName().equals("Lucene3x"));
- Directory d1 = newDirectory();
- RandomIndexWriter w = new RandomIndexWriter(random(), d1);
- Document doc = new Document();
- doc.add(newField("id", "1", StringField.TYPE_STORED));
- doc.add(new PackedLongDocValuesField("dv", 1));
- w.addDocument(doc);
- IndexReader r1 = w.getReader();
- w.close();
-
- Directory d2 = newDirectory();
- w = new RandomIndexWriter(random(), d2);
- doc = new Document();
- doc.add(newField("id", "2", StringField.TYPE_STORED));
- doc.add(new PackedLongDocValuesField("dv", 2));
- w.addDocument(doc);
- IndexReader r2 = w.getReader();
- w.close();
-
- Directory d3 = newDirectory();
- w = new RandomIndexWriter(random(), d3);
- w.addIndexes(SlowCompositeReaderWrapper.wrap(r1), SlowCompositeReaderWrapper.wrap(r2));
- r1.close();
- d1.close();
- r2.close();
- d2.close();
-
- w.forceMerge(1);
- DirectoryReader r3 = w.getReader();
- w.close();
- AtomicReader sr = getOnlySegmentReader(r3);
- assertEquals(2, sr.numDocs());
- DocValues docValues = sr.docValues("dv");
- assertNotNull(docValues);
- r3.close();
- d3.close();
- }
}
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=1337544&r1=1337543&r2=1337544&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 Sat May 12 13:49:02 2012
@@ -22,6 +22,7 @@ import java.util.*;
import java.util.Map.Entry;
import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.ByteDocValuesField;
import org.apache.lucene.document.DerefBytesDocValuesField;
import org.apache.lucene.document.Document;
@@ -121,6 +122,44 @@ public class TestDocValuesIndexing exten
}
public void testAddIndexes() throws IOException {
+ Directory d1 = newDirectory();
+ RandomIndexWriter w = new RandomIndexWriter(random(), d1);
+ Document doc = new Document();
+ doc.add(newField("id", "1", StringField.TYPE_STORED));
+ doc.add(new PackedLongDocValuesField("dv", 1));
+ w.addDocument(doc);
+ IndexReader r1 = w.getReader();
+ w.close();
+
+ Directory d2 = newDirectory();
+ w = new RandomIndexWriter(random(), d2);
+ doc = new Document();
+ doc.add(newField("id", "2", StringField.TYPE_STORED));
+ doc.add(new PackedLongDocValuesField("dv", 2));
+ w.addDocument(doc);
+ IndexReader r2 = w.getReader();
+ w.close();
+
+ Directory d3 = newDirectory();
+ w = new RandomIndexWriter(random(), d3);
+ w.addIndexes(SlowCompositeReaderWrapper.wrap(r1), SlowCompositeReaderWrapper.wrap(r2));
+ r1.close();
+ d1.close();
+ r2.close();
+ d2.close();
+
+ w.forceMerge(1);
+ DirectoryReader r3 = w.getReader();
+ w.close();
+ AtomicReader sr = getOnlySegmentReader(r3);
+ assertEquals(2, sr.numDocs());
+ DocValues docValues = sr.docValues("dv");
+ assertNotNull(docValues);
+ r3.close();
+ d3.close();
+ }
+
+ public void testAddIndexesRandom() throws IOException {
int valuesPerIndex = 10;
List<Type> values = Arrays.asList(Type.values());
Collections.shuffle(values, random());