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 2011/10/01 05:05:07 UTC
svn commit: r1177888 [6/16] - in /lucene/dev/branches/lucene2621: ./
dev-tools/eclipse/ dev-tools/idea/lucene/contrib/ dev-tools/maven/ lucene/
lucene/contrib/ lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/demo/src/java/org/apache...
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java Sat Oct 1 03:04:53 2011
@@ -29,10 +29,10 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MultiReader;
-import org.apache.lucene.search.Weight.ScorerContext;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Bits;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.util._TestUtil;
@@ -256,7 +256,8 @@ public class QueryUtils {
try {
if (scorer == null) {
Weight w = s.createNormalizedWeight(q);
- scorer = w.scorer(readerContextArray[leafPtr], ScorerContext.def());
+ AtomicReaderContext context = readerContextArray[leafPtr];
+ scorer = w.scorer(context, true, false, context.reader.getLiveDocs());
}
int op = order[(opidx[0]++) % order.length];
@@ -301,7 +302,8 @@ public class QueryUtils {
final IndexReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader);
Weight w = indexSearcher.createNormalizedWeight(q);
- Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), ScorerContext.def());
+ AtomicReaderContext ctx = (AtomicReaderContext)indexSearcher.getTopReaderContext();
+ Scorer scorer = w.scorer(ctx, true, false, ctx.reader.getLiveDocs());
if (scorer != null) {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
@@ -327,7 +329,8 @@ public class QueryUtils {
final IndexReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader, false);
Weight w = indexSearcher.createNormalizedWeight(q);
- Scorer scorer = w.scorer((AtomicReaderContext)previousReader.getTopReaderContext(), ScorerContext.def());
+ AtomicReaderContext ctx = (AtomicReaderContext)previousReader.getTopReaderContext();
+ Scorer scorer = w.scorer(ctx, true, false, ctx.reader.getLiveDocs());
if (scorer != null) {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
@@ -347,6 +350,7 @@ public class QueryUtils {
s.search(q,new Collector() {
private Scorer scorer;
private int leafPtr;
+ private Bits liveDocs;
@Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
@@ -358,7 +362,7 @@ public class QueryUtils {
long startMS = System.currentTimeMillis();
for (int i=lastDoc[0]+1; i<=doc; i++) {
Weight w = s.createNormalizedWeight(q);
- Scorer scorer = w.scorer(context[leafPtr], ScorerContext.def());
+ Scorer scorer = w.scorer(context[leafPtr], true, false, liveDocs);
Assert.assertTrue("query collected "+doc+" but skipTo("+i+") says no more docs!",scorer.advance(i) != DocIdSetIterator.NO_MORE_DOCS);
Assert.assertEquals("query collected "+doc+" but skipTo("+i+") got to "+scorer.docID(),doc,scorer.docID());
float skipToScore = scorer.score();
@@ -385,7 +389,7 @@ public class QueryUtils {
final IndexReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader);
Weight w = indexSearcher.createNormalizedWeight(q);
- Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), ScorerContext.def());
+ Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), true, false, previousReader.getLiveDocs());
if (scorer != null) {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
@@ -396,6 +400,7 @@ public class QueryUtils {
lastReader[0] = context.reader;
lastDoc[0] = -1;
+ liveDocs = context.reader.getLiveDocs();
}
@Override
public boolean acceptsDocsOutOfOrder() {
@@ -409,7 +414,7 @@ public class QueryUtils {
final IndexReader previousReader = lastReader[0];
IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader);
Weight w = indexSearcher.createNormalizedWeight(q);
- Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), ScorerContext.def());
+ Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), true, false, previousReader.getLiveDocs());
if (scorer != null) {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LineFileDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LineFileDocs.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LineFileDocs.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LineFileDocs.java Sat Oct 1 03:04:53 2011
@@ -128,16 +128,16 @@ public class LineFileDocs implements Clo
ft.setStoreTermVectorOffsets(true);
ft.setStoreTermVectorPositions(true);
- titleTokenized = new Field("titleTokenized", ft, "");
+ titleTokenized = new Field("titleTokenized", "", ft);
doc.add(titleTokenized);
- body = new Field("body", ft, "");
+ body = new Field("body", "", ft);
doc.add(body);
- id = new Field("docid", StringField.TYPE_STORED, "");
+ id = new Field("docid", "", StringField.TYPE_STORED);
doc.add(id);
- date = new Field("date", StringField.TYPE_STORED, "");
+ date = new Field("date", "", StringField.TYPE_STORED);
doc.add(date);
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java Sat Oct 1 03:04:53 2011
@@ -43,7 +43,6 @@ import org.apache.lucene.index.codecs.mo
import org.apache.lucene.index.codecs.mockintblock.MockVariableIntBlockCodec;
import org.apache.lucene.index.codecs.mocksep.MockSepCodec;
import org.apache.lucene.index.codecs.mockrandom.MockRandomCodec;
-import org.apache.lucene.index.codecs.mockrandom.MockRandomDocValuesCodec;
import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
import org.apache.lucene.index.codecs.preflexrw.PreFlexRWCodec;
import org.apache.lucene.index.codecs.pulsing.PulsingCodec;
@@ -281,8 +280,6 @@ public abstract class LuceneTestCase ext
// baseBlockSize cannot be over 127:
swapCodec(new MockVariableIntBlockCodec(codecHasParam && "MockVariableIntBlock".equals(codec) ? codecParam : _TestUtil.nextInt(random, 1, 127)), cp);
swapCodec(new MockRandomCodec(random), cp);
- // give docvalues non-cfs testcoverage
- swapCodec(new MockRandomDocValuesCodec(random), cp);
return cp.lookup(codec);
}
@@ -1159,7 +1156,7 @@ public abstract class LuceneTestCase ext
public static Field newField(Random random, String name, String value, FieldType type) {
if (usually(random) || !type.indexed()) {
// most of the time, don't modify the params
- return new Field(name, type, value);
+ return new Field(name, value, type);
}
FieldType newType = new FieldType(type);
@@ -1186,7 +1183,7 @@ public abstract class LuceneTestCase ext
}
*/
- return new Field(name, newType, value);
+ return new Field(name, value, newType);
}
/** return a random Locale from the available locales on the system */
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java Sat Oct 1 03:04:53 2011
@@ -513,10 +513,7 @@ public class _TestUtil {
for(IndexableField f : doc1) {
Field field1 = (Field) f;
- Field field2 = new Field(field1.name(),
- field1.fieldType(),
- field1.stringValue()
- );
+ Field field2 = new Field(field1.name(), field1.stringValue(), field1.fieldType());
doc2.add(field2);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestAssertions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestAssertions.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestAssertions.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestAssertions.java Sat Oct 1 03:04:53 2011
@@ -19,7 +19,6 @@ package org.apache.lucene;
import java.io.Reader;
-import org.apache.lucene.analysis.ReusableAnalyzerBase;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@@ -35,7 +34,7 @@ public class TestAssertions extends Luce
}
}
- static class TestAnalyzer1 extends ReusableAnalyzerBase {
+ static class TestAnalyzer1 extends Analyzer {
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader aReader) {
@@ -43,7 +42,7 @@ public class TestAssertions extends Luce
}
}
- static final class TestAnalyzer2 extends ReusableAnalyzerBase {
+ static final class TestAnalyzer2 extends Analyzer {
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader aReader) {
@@ -51,7 +50,7 @@ public class TestAssertions extends Luce
}
}
- static class TestAnalyzer3 extends ReusableAnalyzerBase {
+ static class TestAnalyzer3 extends Analyzer {
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader aReader) {
@@ -59,7 +58,7 @@ public class TestAssertions extends Luce
}
}
- static class TestAnalyzer4 extends ReusableAnalyzerBase {
+ static class TestAnalyzer4 extends Analyzer {
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader aReader) {
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java Sat Oct 1 03:04:53 2011
@@ -101,7 +101,7 @@ public class TestMockAnalyzer extends Ba
String testString = "t";
Analyzer analyzer = new MockAnalyzer(random);
- TokenStream stream = analyzer.reusableTokenStream("dummy", new StringReader(testString));
+ TokenStream stream = analyzer.tokenStream("dummy", new StringReader(testString));
stream.reset();
while (stream.incrementToken()) {
// consume
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java Sat Oct 1 03:04:53 2011
@@ -38,7 +38,7 @@ public class TestBinaryDocument extends
FieldType ft = new FieldType();
ft.setStored(true);
IndexableField binaryFldStored = new BinaryField("binaryStored", binaryValStored.getBytes());
- IndexableField stringFldStored = new Field("stringStored", ft, binaryValStored);
+ IndexableField stringFldStored = new Field("stringStored", binaryValStored, ft);
Document doc = new Document();
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestDocument.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestDocument.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestDocument.java Sat Oct 1 03:04:53 2011
@@ -42,7 +42,7 @@ public class TestDocument extends Lucene
FieldType ft = new FieldType();
ft.setStored(true);
- IndexableField stringFld = new Field("string", ft, binaryVal);
+ IndexableField stringFld = new Field("string", binaryVal, ft);
IndexableField binaryFld = new BinaryField("binary", binaryVal.getBytes());
IndexableField binaryFld2 = new BinaryField("binary", binaryVal2.getBytes());
@@ -121,20 +121,20 @@ public class TestDocument extends Lucene
public void testConstructorExceptions() {
FieldType ft = new FieldType();
ft.setStored(true);
- new Field("name", ft, "value"); // okay
+ new Field("name", "value", ft); // okay
new StringField("name", "value"); // okay
try {
- new Field("name", new FieldType(), "value");
+ new Field("name", "value", new FieldType());
fail();
} catch (IllegalArgumentException e) {
// expected exception
}
- new Field("name", ft, "value"); // okay
+ new Field("name", "value", ft); // okay
try {
FieldType ft2 = new FieldType();
ft2.setStored(true);
ft2.setStoreTermVectors(true);
- new Field("name", ft2, "value");
+ new Field("name", "value", ft2);
fail();
} catch (IllegalArgumentException e) {
// expected exception
@@ -178,17 +178,29 @@ public class TestDocument extends Lucene
reader.close();
dir.close();
}
+
+ public void testGetValues() {
+ Document doc = makeDocumentWithFields();
+ assertEquals(new String[] {"test1", "test2"},
+ doc.getValues("keyword"));
+ assertEquals(new String[] {"test1", "test2"},
+ doc.getValues("text"));
+ assertEquals(new String[] {"test1", "test2"},
+ doc.getValues("unindexed"));
+ assertEquals(new String[0],
+ doc.getValues("nope"));
+ }
private Document makeDocumentWithFields() {
Document doc = new Document();
FieldType stored = new FieldType();
stored.setStored(true);
- doc.add(new Field("keyword", StringField.TYPE_STORED, "test1"));
- doc.add(new Field("keyword", StringField.TYPE_STORED, "test2"));
- doc.add(new Field("text", TextField.TYPE_STORED, "test1"));
- doc.add(new Field("text", TextField.TYPE_STORED, "test2"));
- doc.add(new Field("unindexed", stored, "test1"));
- doc.add(new Field("unindexed", stored, "test2"));
+ doc.add(new Field("keyword", "test1", StringField.TYPE_STORED));
+ doc.add(new Field("keyword", "test2", StringField.TYPE_STORED));
+ doc.add(new Field("text", "test1", TextField.TYPE_STORED));
+ doc.add(new Field("text", "test2", TextField.TYPE_STORED));
+ doc.add(new Field("unindexed", "test1", stored));
+ doc.add(new Field("unindexed", "test2", stored));
doc
.add(new TextField("unstored", "test1"));
doc
@@ -227,10 +239,10 @@ public class TestDocument extends Lucene
public void testFieldSetValue() throws Exception {
- Field field = new Field("id", StringField.TYPE_STORED, "id1");
+ Field field = new Field("id", "id1", StringField.TYPE_STORED);
Document doc = new Document();
doc.add(field);
- doc.add(new Field("keyword", StringField.TYPE_STORED, "test"));
+ doc.add(new Field("keyword", "test", StringField.TYPE_STORED));
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
@@ -266,7 +278,7 @@ public class TestDocument extends Lucene
public void testFieldSetValueChangeBinary() {
Field field1 = new BinaryField("field1", new byte[0]);
- Field field2 = new Field("field2", TextField.TYPE_STORED, "");
+ Field field2 = new Field("field2", "", TextField.TYPE_STORED);
try {
field1.setValue("abc");
fail("did not hit expected exception");
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BPostings.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BPostings.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BPostings.java Sat Oct 1 03:04:53 2011
@@ -66,7 +66,7 @@ public class Test2BPostings extends Luce
FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
ft.setOmitNorms(true);
ft.setIndexOptions(IndexOptions.DOCS_ONLY);
- Field field = new Field("field", ft, new MyTokenStream());
+ Field field = new Field("field", new MyTokenStream(), ft);
doc.add(field);
final int numDocs = (Integer.MAX_VALUE / 26) + 1;
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java Sat Oct 1 03:04:53 2011
@@ -180,7 +180,7 @@ public class Test2BTerms extends LuceneT
FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setIndexOptions(IndexOptions.DOCS_ONLY);
customType.setOmitNorms(true);
- Field field = new Field("field", customType, ts);
+ Field field = new Field("field", ts, customType);
doc.add(field);
//w.setInfoStream(System.out);
final int numDocs = (int) (TERM_COUNT/TERMS_PER_DOC);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java Sat Oct 1 03:04:53 2011
@@ -1059,7 +1059,7 @@ public class TestAddIndexes extends Luce
Document d = new Document();
FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setStoreTermVectors(true);
- d.add(new Field("c", customType, "v"));
+ d.add(new Field("c", "v", customType));
w.addDocument(d);
w.close();
}
@@ -1097,7 +1097,7 @@ public class TestAddIndexes extends Luce
new MockAnalyzer(random)).setMergePolicy(lmp2);
IndexWriter w2 = new IndexWriter(src, conf2);
Document doc = new Document();
- doc.add(new Field("c", TextField.TYPE_STORED, "some text"));
+ doc.add(new Field("c", "some text", TextField.TYPE_STORED));
w2.addDocument(doc);
doc = new Document();
doc.add(new StringField("d", "delete"));
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java Sat Oct 1 03:04:53 2011
@@ -95,7 +95,7 @@ public class TestAtomicUpdate extends Lu
// Update all 100 docs...
for(int i=0; i<100; i++) {
Document d = new Document();
- d.add(new Field("id", StringField.TYPE_STORED, Integer.toString(i)));
+ d.add(new Field("id", Integer.toString(i), StringField.TYPE_STORED));
d.add(new TextField("contents", English.intToEnglish(i+10*count)));
writer.updateDocument(new Term("id", Integer.toString(i)), d);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Sat Oct 1 03:04:53 2011
@@ -597,15 +597,15 @@ public class TestBackwardsCompatibility
{
Document doc = new Document();
doc.add(new TextField("content", "aaa"));
- doc.add(new Field("id", StringField.TYPE_STORED, Integer.toString(id)));
+ doc.add(new Field("id", Integer.toString(id), StringField.TYPE_STORED));
FieldType customType2 = new FieldType(TextField.TYPE_STORED);
customType2.setStoreTermVectors(true);
customType2.setStoreTermVectorPositions(true);
customType2.setStoreTermVectorOffsets(true);
- doc.add(new Field("autf8", customType2, "Lu\uD834\uDD1Ece\uD834\uDD60ne \u0000 \u2620 ab\ud917\udc17cd"));
- doc.add(new Field("utf8", customType2, "Lu\uD834\uDD1Ece\uD834\uDD60ne \u0000 \u2620 ab\ud917\udc17cd"));
- doc.add(new Field("content2", customType2, "here is more content with aaa aaa aaa"));
- doc.add(new Field("fie\u2C77ld", customType2, "field with non-ascii name"));
+ doc.add(new Field("autf8", "Lu\uD834\uDD1Ece\uD834\uDD60ne \u0000 \u2620 ab\ud917\udc17cd", customType2));
+ doc.add(new Field("utf8", "Lu\uD834\uDD1Ece\uD834\uDD60ne \u0000 \u2620 ab\ud917\udc17cd", customType2));
+ doc.add(new Field("content2", "here is more content with aaa aaa aaa", customType2));
+ doc.add(new Field("fie\u2C77ld", "field with non-ascii name", customType2));
// add numeric fields, to test if flex preserves encoding
doc.add(new NumericField("trieInt", 4).setIntValue(id));
doc.add(new NumericField("trieLong", 4).setLongValue(id));
@@ -616,12 +616,12 @@ public class TestBackwardsCompatibility
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setIndexOptions(IndexOptions.DOCS_ONLY);
- Field f = new Field("content3", customType, "aaa");
+ Field f = new Field("content3", "aaa", customType);
doc.add(f);
FieldType customType2 = new FieldType();
customType2.setStored(true);
customType2.setIndexOptions(IndexOptions.DOCS_ONLY);
- f = new Field("content4", customType2, "aaa");
+ f = new Field("content4", "aaa", customType2);
doc.add(f);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java Sat Oct 1 03:04:53 2011
@@ -51,7 +51,7 @@ public class TestBinaryTerms extends Luc
Document doc = new Document();
FieldType customType = new FieldType();
customType.setStored(true);
- doc.add(new Field("id", customType, "" + i));
+ doc.add(new Field("id", "" + i, customType));
doc.add(new TextField("bytes", tokenStream));
iw.addDocument(doc);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java Sat Oct 1 03:04:53 2011
@@ -39,8 +39,8 @@ public class TestConsistentFieldNumbers
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(NoMergePolicy.COMPOUND_FILES));
Document d1 = new Document();
- d1.add(new Field("f1", StringField.TYPE_STORED, "first field"));
- d1.add(new Field("f2", StringField.TYPE_STORED, "second field"));
+ d1.add(new Field("f1", "first field", StringField.TYPE_STORED));
+ d1.add(new Field("f2", "second field", StringField.TYPE_STORED));
writer.addDocument(d1);
if (i == 1) {
@@ -54,7 +54,7 @@ public class TestConsistentFieldNumbers
FieldType customType2 = new FieldType(TextField.TYPE_STORED);
customType2.setStoreTermVectors(true);
d2.add(new TextField("f2", "second field"));
- d2.add(new Field("f1", customType2, "first field"));
+ d2.add(new Field("f1", "first field", customType2));
d2.add(new TextField("f3", "third field"));
d2.add(new TextField("f4", "fourth field"));
writer.addDocument(d2);
@@ -102,8 +102,8 @@ public class TestConsistentFieldNumbers
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(NoMergePolicy.COMPOUND_FILES));
Document d1 = new Document();
- d1.add(new Field("f1", TextField.TYPE_STORED, "first field"));
- d1.add(new Field("f2", TextField.TYPE_STORED, "second field"));
+ d1.add(new Field("f1", "first field", TextField.TYPE_STORED));
+ d1.add(new Field("f2", "second field", TextField.TYPE_STORED));
writer.addDocument(d1);
writer.close();
@@ -112,10 +112,10 @@ public class TestConsistentFieldNumbers
Document d2 = new Document();
FieldType customType2 = new FieldType(TextField.TYPE_STORED);
customType2.setStoreTermVectors(true);
- d2.add(new Field("f2", TextField.TYPE_STORED, "second field"));
- d2.add(new Field("f1", customType2, "first field"));
- d2.add(new Field("f3", TextField.TYPE_STORED, "third field"));
- d2.add(new Field("f4", TextField.TYPE_STORED, "fourth field"));
+ d2.add(new Field("f2", "second field", TextField.TYPE_STORED));
+ d2.add(new Field("f1", "first field", customType2));
+ d2.add(new Field("f3", "third field", TextField.TYPE_STORED));
+ d2.add(new Field("f4", "fourth field", TextField.TYPE_STORED));
writer.addDocument(d2);
writer.close();
@@ -168,8 +168,8 @@ public class TestConsistentFieldNumbers
TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(
NoMergePolicy.NO_COMPOUND_FILES));
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d1 first field"));
- d.add(new Field("f2", TextField.TYPE_STORED, "d1 second field"));
+ d.add(new Field("f1", "d1 first field", TextField.TYPE_STORED));
+ d.add(new Field("f2", "d1 second field", TextField.TYPE_STORED));
writer.addDocument(d);
writer.close();
SegmentInfos sis = new SegmentInfos();
@@ -188,7 +188,7 @@ public class TestConsistentFieldNumbers
random.nextBoolean() ? NoMergePolicy.NO_COMPOUND_FILES
: NoMergePolicy.COMPOUND_FILES));
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d2 first field"));
+ d.add(new Field("f1", "d2 first field", TextField.TYPE_STORED));
d.add(new BinaryField("f3", new byte[] { 1, 2, 3 }));
writer.addDocument(d);
writer.close();
@@ -212,8 +212,8 @@ public class TestConsistentFieldNumbers
random.nextBoolean() ? NoMergePolicy.NO_COMPOUND_FILES
: NoMergePolicy.COMPOUND_FILES));
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d3 first field"));
- d.add(new Field("f2", TextField.TYPE_STORED, "d3 second field"));
+ d.add(new Field("f1", "d3 first field", TextField.TYPE_STORED));
+ d.add(new Field("f2", "d3 second field", TextField.TYPE_STORED));
d.add(new BinaryField("f3", new byte[] { 1, 2, 3, 4, 5 }));
writer.addDocument(d);
writer.close();
@@ -385,22 +385,22 @@ public class TestConsistentFieldNumbers
customType15.setStoreTermVectorPositions(true);
switch (mode) {
- case 0: return new Field(fieldName, customType, "some text");
+ case 0: return new Field(fieldName, "some text", customType);
case 1: return new TextField(fieldName, "some text");
- case 2: return new Field(fieldName, customType2, "some text");
- case 3: return new Field(fieldName, customType3, "some text");
- case 4: return new Field(fieldName, customType4, "some text");
- case 5: return new Field(fieldName, customType5, "some text");
- case 6: return new Field(fieldName, customType6, "some text");
- case 7: return new Field(fieldName, customType7, "some text");
- case 8: return new Field(fieldName, customType8, "some text");
- case 9: return new Field(fieldName, customType9, "some text");
- case 10: return new Field(fieldName, customType10, "some text");
- case 11: return new Field(fieldName, customType11, "some text");
- case 12: return new Field(fieldName, customType12, "some text");
- case 13: return new Field(fieldName, customType13, "some text");
- case 14: return new Field(fieldName, customType14, "some text");
- case 15: return new Field(fieldName, customType15, "some text");
+ case 2: return new Field(fieldName, "some text", customType2);
+ case 3: return new Field(fieldName, "some text", customType3);
+ case 4: return new Field(fieldName, "some text", customType4);
+ case 5: return new Field(fieldName, "some text", customType5);
+ case 6: return new Field(fieldName, "some text", customType6);
+ case 7: return new Field(fieldName, "some text", customType7);
+ case 8: return new Field(fieldName, "some text", customType8);
+ case 9: return new Field(fieldName, "some text", customType9);
+ case 10: return new Field(fieldName, "some text", customType10);
+ case 11: return new Field(fieldName, "some text", customType11);
+ case 12: return new Field(fieldName, "some text", customType12);
+ case 13: return new Field(fieldName, "some text", customType13);
+ case 14: return new Field(fieldName, "some text", customType14);
+ case 15: return new Field(fieldName, "some text", customType15);
default: return null;
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java Sat Oct 1 03:04:53 2011
@@ -203,13 +203,13 @@ public class TestDocTermOrds extends Luc
StandardPostingsReader.files(dir, segmentInfo, id, files);
BlockTermsReader.files(dir, segmentInfo, id, files);
FixedGapTermsIndexReader.files(dir, segmentInfo, id, files);
- DefaultDocValuesConsumer.files(dir, segmentInfo, id, files, getDocValuesUseCFS());
+ DefaultDocValuesConsumer.files(dir, segmentInfo, id, files);
}
@Override
public void getExtensions(Set<String> extensions) {
getStandardExtensions(extensions);
- DefaultDocValuesConsumer.getDocValuesExtensions(extensions, getDocValuesUseCFS());
+ DefaultDocValuesConsumer.getExtensions(extensions);
}
public static void getStandardExtensions(Set<String> extensions) {
@@ -221,12 +221,12 @@ public class TestDocTermOrds extends Luc
@Override
public PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException {
- return new DefaultDocValuesConsumer(state, getDocValuesSortComparator(), getDocValuesUseCFS());
+ return new DefaultDocValuesConsumer(state);
}
@Override
public PerDocValues docsProducer(SegmentReadState state) throws IOException {
- return new DefaultDocValuesProducer(state.segmentInfo, state.dir, state.fieldInfos, state.codecId, getDocValuesUseCFS(), getDocValuesSortComparator(), state.context);
+ return new DefaultDocValuesProducer(state);
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java Sat Oct 1 03:04:53 2011
@@ -103,7 +103,7 @@ public class TestDocumentWriter extends
}
public void testPositionIncrementGap() throws IOException {
- Analyzer analyzer = new ReusableAnalyzerBase() {
+ Analyzer analyzer = new Analyzer() {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
return new TokenStreamComponents(new MockTokenizer(reader, MockTokenizer.WHITESPACE, false));
@@ -138,7 +138,7 @@ public class TestDocumentWriter extends
}
public void testTokenReuse() throws IOException {
- Analyzer analyzer = new ReusableAnalyzerBase() {
+ Analyzer analyzer = new Analyzer() {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java Sat Oct 1 03:04:53 2011
@@ -23,6 +23,7 @@ import java.util.*;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.DocumentStoredFieldVisitor;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.NumericField;
@@ -303,8 +304,8 @@ public class TestFieldsReader extends Lu
Document doc = new Document();
FieldType onlyStored = new FieldType();
onlyStored.setStored(true);
- doc.add(new Field("field", onlyStored, "value"));
- doc.add(new Field("field2", StringField.TYPE_STORED, "value"));
+ doc.add(new Field("field", "value", onlyStored));
+ doc.add(new Field("field2", "value", StringField.TYPE_STORED));
w.addDocument(doc);
IndexReader r = w.getReader();
w.close();
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java Sat Oct 1 03:04:53 2011
@@ -50,8 +50,8 @@ public class TestGlobalFieldNumbers exte
new MockAnalyzer(random));
IndexWriter writer = new IndexWriter(dir, config);
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d1 first field"));
- d.add(new Field("f2", TextField.TYPE_STORED, "d1 second field"));
+ d.add(new Field("f1", "d1 first field", TextField.TYPE_STORED));
+ d.add(new Field("f2", "d1 second field", TextField.TYPE_STORED));
writer.addDocument(d);
for (String string : writer.getIndexFileNames()) {
assertFalse(string.endsWith(".fnx"));
@@ -65,7 +65,7 @@ public class TestGlobalFieldNumbers exte
assertFNXFiles(dir, "1.fnx");
d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d2 first field"));
+ d.add(new Field("f1", "d2 first field", TextField.TYPE_STORED));
d.add(new BinaryField("f3", new byte[] { 1, 2, 3 }));
writer.addDocument(d);
writer.commit();
@@ -83,8 +83,8 @@ public class TestGlobalFieldNumbers exte
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d3 first field"));
- d.add(new Field("f2", TextField.TYPE_STORED, "d3 second field"));
+ d.add(new Field("f1", "d3 first field", TextField.TYPE_STORED));
+ d.add(new Field("f2", "d3 second field", TextField.TYPE_STORED));
d.add(new BinaryField("f3", new byte[] { 1, 2, 3, 4, 5 }));
writer.addDocument(d);
writer.close();
@@ -117,13 +117,13 @@ public class TestGlobalFieldNumbers exte
new MockAnalyzer(random));
IndexWriter writer = new IndexWriter(dir, config);
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d1 first field"));
- d.add(new Field("f2", TextField.TYPE_STORED, "d1 second field"));
+ d.add(new Field("f1", "d1 first field", TextField.TYPE_STORED));
+ d.add(new Field("f2", "d1 second field", TextField.TYPE_STORED));
writer.addDocument(d);
writer.commit();
assertFNXFiles(dir, "1.fnx");
d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d2 first field"));
+ d.add(new Field("f1", "d2 first field", TextField.TYPE_STORED));
d.add(new BinaryField("f3", new byte[] { 1, 2, 3 }));
writer.addDocument(d);
writer.commit();
@@ -158,13 +158,13 @@ public class TestGlobalFieldNumbers exte
TEST_VERSION_CURRENT, new MockAnalyzer(random)).setIndexDeletionPolicy(
new KeepAllDeletionPolicy()));
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d1 first field"));
- d.add(new Field("f2", TextField.TYPE_STORED, "d1 second field"));
+ d.add(new Field("f1", "d1 first field", TextField.TYPE_STORED));
+ d.add(new Field("f2", "d1 second field", TextField.TYPE_STORED));
writer.addDocument(d);
writer.commit();
assertFNXFiles(dir, "1.fnx");
d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d2 first field"));
+ d.add(new Field("f1", "d2 first field", TextField.TYPE_STORED));
d.add(new BinaryField("f3", new byte[] { 1, 2, 3 }));
writer.addDocument(d);
writer.commit();
@@ -179,8 +179,8 @@ public class TestGlobalFieldNumbers exte
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d3 first field"));
- d.add(new Field("f2", TextField.TYPE_STORED, "d3 second field"));
+ d.add(new Field("f1", "d3 first field", TextField.TYPE_STORED));
+ d.add(new Field("f2", "d3 second field", TextField.TYPE_STORED));
d.add(new BinaryField("f3", new byte[] { 1, 2, 3, 4, 5 }));
writer.addDocument(d);
writer.close();
@@ -204,13 +204,13 @@ public class TestGlobalFieldNumbers exte
TEST_VERSION_CURRENT, new MockAnalyzer(random)).setIndexDeletionPolicy(
new KeepAllDeletionPolicy()));
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d1 first field"));
- d.add(new Field("f2", TextField.TYPE_STORED, "d1 second field"));
+ d.add(new Field("f1", "d1 first field", TextField.TYPE_STORED));
+ d.add(new Field("f2", "d1 second field", TextField.TYPE_STORED));
writer.addDocument(d);
writer.commit();
assertFNXFiles(dir, "1.fnx");
d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d2 first field"));
+ d.add(new Field("f1", "d2 first field", TextField.TYPE_STORED));
d.add(new BinaryField("f3", new byte[] { 1, 2, 3 }));
writer.addDocument(d);
assertFNXFiles(dir, "1.fnx");
@@ -224,7 +224,7 @@ public class TestGlobalFieldNumbers exte
new KeepAllDeletionPolicy()).setIndexCommit(listCommits.get(0)));
d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d2 first field"));
+ d.add(new Field("f1", "d2 first field", TextField.TYPE_STORED));
d.add(new BinaryField("f3", new byte[] { 1, 2, 3 }));
writer.addDocument(d);
writer.commit();
@@ -475,7 +475,7 @@ public class TestGlobalFieldNumbers exte
}
Document d = new Document();
- d.add(new Field("f1", TextField.TYPE_STORED, "d1 first field"));
+ d.add(new Field("f1", "d1 first field", TextField.TYPE_STORED));
writer.addDocument(d);
writer.prepareCommit();
// the fnx file should still be under control of the SIS
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Sat Oct 1 03:04:53 2011
@@ -27,6 +27,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
+import java.util.Random;
import java.util.Set;
import java.util.SortedSet;
import org.junit.Assume;
@@ -151,9 +152,9 @@ public class TestIndexReader extends Luc
FieldType customType3 = new FieldType();
customType3.setStored(true);
- doc.add(new Field("keyword",StringField.TYPE_STORED,"test1"));
- doc.add(new Field("text",TextField.TYPE_STORED,"test1"));
- doc.add(new Field("unindexed",customType3,"test1"));
+ doc.add(new Field("keyword", "test1", StringField.TYPE_STORED));
+ doc.add(new Field("text", "test1", TextField.TYPE_STORED));
+ doc.add(new Field("unindexed", "test1", customType3));
doc.add(new TextField("unstored","test1"));
writer.addDocument(doc);
@@ -177,18 +178,18 @@ public class TestIndexReader extends Luc
int mergeFactor = ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMergeFactor();
for (int i = 0; i < 5*mergeFactor; i++) {
doc = new Document();
- doc.add(new Field("keyword",StringField.TYPE_STORED,"test1"));
- doc.add(new Field("text",TextField.TYPE_STORED, "test1"));
- doc.add(new Field("unindexed",customType3,"test1"));
+ doc.add(new Field("keyword", "test1", StringField.TYPE_STORED));
+ doc.add(new Field("text", "test1", TextField.TYPE_STORED));
+ doc.add(new Field("unindexed", "test1", customType3));
doc.add(new TextField("unstored","test1"));
writer.addDocument(doc);
}
// new fields are in some different segments (we hope)
for (int i = 0; i < 5*mergeFactor; i++) {
doc = new Document();
- doc.add(new Field("keyword2",StringField.TYPE_STORED,"test1"));
- doc.add(new Field("text2",TextField.TYPE_STORED, "test1"));
- doc.add(new Field("unindexed2",customType3,"test1"));
+ doc.add(new Field("keyword2", "test1", StringField.TYPE_STORED));
+ doc.add(new Field("text2", "test1", TextField.TYPE_STORED));
+ doc.add(new Field("unindexed2", "test1", customType3));
doc.add(new TextField("unstored2","test1"));
writer.addDocument(doc);
}
@@ -209,11 +210,11 @@ public class TestIndexReader extends Luc
for (int i = 0; i < 5*mergeFactor; i++) {
doc = new Document();
- doc.add(new Field("tvnot",TextField.TYPE_STORED,"tvnot"));
- doc.add(new Field("termvector",customType5,"termvector"));
- doc.add(new Field("tvoffset",customType6,"tvoffset"));
- doc.add(new Field("tvposition",customType7,"tvposition"));
- doc.add(new Field("tvpositionoffset",customType8, "tvpositionoffset"));
+ doc.add(new Field("tvnot", "tvnot", TextField.TYPE_STORED));
+ doc.add(new Field("termvector", "termvector", customType5));
+ doc.add(new Field("tvoffset", "tvoffset", customType6));
+ doc.add(new Field("tvposition", "tvposition", customType7));
+ doc.add(new Field("tvpositionoffset", "tvpositionoffset", customType8));
writer.addDocument(doc);
}
@@ -302,11 +303,11 @@ public class TestIndexReader extends Luc
customType8.setStoreTermVectorPositions(true);
for (int i = 0; i < 5 * mergeFactor; i++) {
Document doc = new Document();
- doc.add(new Field("tvnot",TextField.TYPE_STORED,"one two two three three three"));
- doc.add(new Field("termvector",customType5,"one two two three three three"));
- doc.add(new Field("tvoffset",customType6,"one two two three three three"));
- doc.add(new Field("tvposition",customType7,"one two two three three three"));
- doc.add(new Field("tvpositionoffset",customType8, "one two two three three three"));
+ doc.add(new Field("tvnot", "one two two three three three", TextField.TYPE_STORED));
+ doc.add(new Field("termvector", "one two two three three three", customType5));
+ doc.add(new Field("tvoffset", "one two two three three three", customType6));
+ doc.add(new Field("tvposition", "one two two three three three", customType7));
+ doc.add(new Field("tvpositionoffset", "one two two three three three", customType8));
writer.addDocument(doc);
}
@@ -1403,4 +1404,70 @@ public class TestIndexReader extends Luc
r.close();
dir.close();
}
+
+ public void testTryIncRef() throws CorruptIndexException, LockObtainFailedException, IOException {
+ Directory dir = newDirectory();
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ writer.addDocument(new Document());
+ writer.commit();
+ IndexReader r = IndexReader.open(dir);
+ assertTrue(r.tryIncRef());
+ r.decRef();
+ r.close();
+ assertFalse(r.tryIncRef());
+ writer.close();
+ dir.close();
+ }
+
+ public void testStressTryIncRef() throws CorruptIndexException, LockObtainFailedException, IOException, InterruptedException {
+ Directory dir = newDirectory();
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ writer.addDocument(new Document());
+ writer.commit();
+ IndexReader r = IndexReader.open(dir);
+ int numThreads = atLeast(2);
+
+ IncThread[] threads = new IncThread[numThreads];
+ for (int i = 0; i < threads.length; i++) {
+ threads[i] = new IncThread(r, random);
+ threads[i].start();
+ }
+ Thread.sleep(100);
+
+ assertTrue(r.tryIncRef());
+ r.decRef();
+ r.close();
+
+ for (int i = 0; i < threads.length; i++) {
+ threads[i].join();
+ assertNull(threads[i].failed);
+ }
+ assertFalse(r.tryIncRef());
+ writer.close();
+ dir.close();
+ }
+
+ static class IncThread extends Thread {
+ final IndexReader toInc;
+ final Random random;
+ Throwable failed;
+
+ IncThread(IndexReader toInc, Random random) {
+ this.toInc = toInc;
+ this.random = random;
+ }
+
+ @Override
+ public void run() {
+ try {
+ while (toInc.tryIncRef()) {
+ assertFalse(toInc.hasDeletions());
+ toInc.decRef();
+ }
+ assertFalse(toInc.tryIncRef());
+ } catch (Throwable e) {
+ failed = e;
+ }
+ }
+ }
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java Sat Oct 1 03:04:53 2011
@@ -40,8 +40,6 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.similarities.DefaultSimilarity;
-import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.search.similarities.SimilarityProvider;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BitVector;
@@ -969,13 +967,13 @@ public class TestIndexReaderReopen exten
customType2.setOmitNorms(true);
FieldType customType3 = new FieldType();
customType3.setStored(true);
- doc.add(new Field("field1", TextField.TYPE_STORED, sb.toString()));
- doc.add(new Field("fielda", customType2, sb.toString()));
- doc.add(new Field("fieldb", customType3, sb.toString()));
+ doc.add(new Field("field1", sb.toString(), TextField.TYPE_STORED));
+ doc.add(new Field("fielda", sb.toString(), customType2));
+ doc.add(new Field("fieldb", sb.toString(), customType3));
sb.append(" b");
sb.append(n);
for (int i = 1; i < numFields; i++) {
- doc.add(new Field("field" + (i+1), TextField.TYPE_STORED, sb.toString()));
+ doc.add(new Field("field" + (i+1), sb.toString(), TextField.TYPE_STORED));
}
return doc;
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Sat Oct 1 03:04:53 2011
@@ -38,6 +38,7 @@ import org.apache.lucene.document.Binary
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
@@ -303,7 +304,7 @@ public class TestIndexWriter extends Luc
int lastFlushCount = -1;
for(int j=1;j<52;j++) {
Document doc = new Document();
- doc.add(new Field("field", storedTextType, "aaa" + j));
+ doc.add(new Field("field", "aaa" + j, storedTextType));
writer.addDocument(doc);
_TestUtil.syncConcurrentMerges(writer);
int flushCount = writer.getFlushCount();
@@ -357,7 +358,7 @@ public class TestIndexWriter extends Luc
for(int j=1;j<52;j++) {
Document doc = new Document();
- doc.add(new Field("field", storedTextType, "aaa" + j));
+ doc.add(new Field("field", "aaa" + j, storedTextType));
writer.addDocument(doc);
}
@@ -1235,7 +1236,7 @@ public class TestIndexWriter extends Luc
customType.setTokenized(true);
customType.setIndexed(true);
- Field f = new Field("binary", customType, b, 10, 17);
+ Field f = new Field("binary", b, 10, 17, customType);
f.setTokenStream(new MockTokenizer(new StringReader("doc1field1"), MockTokenizer.WHITESPACE, false));
FieldType customType2 = new FieldType(TextField.TYPE_STORED);
@@ -1684,10 +1685,10 @@ public class TestIndexWriter extends Luc
for (int i=0; i<2; i++) {
Document doc = new Document();
- doc.add(new Field("id", customType3, Integer.toString(i)+BIG));
- doc.add(new Field("str", customType2, Integer.toString(i)+BIG));
- doc.add(new Field("str2", storedTextType, Integer.toString(i)+BIG));
- doc.add(new Field("str3", customType, Integer.toString(i)+BIG));
+ doc.add(new Field("id", Integer.toString(i)+BIG, customType3));
+ doc.add(new Field("str", Integer.toString(i)+BIG, customType2));
+ doc.add(new Field("str2", Integer.toString(i)+BIG, storedTextType));
+ doc.add(new Field("str3", Integer.toString(i)+BIG, customType));
indexWriter.addDocument(doc);
}
@@ -1706,7 +1707,7 @@ public class TestIndexWriter extends Luc
dir.close();
}
- static final class StringSplitAnalyzer extends ReusableAnalyzerBase {
+ static final class StringSplitAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
return new TokenStreamComponents(new StringSplitTokenizer(reader));
@@ -1804,7 +1805,7 @@ public class TestIndexWriter extends Luc
doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setTokenized(false);
- Field contentField = new Field("content", customType, "");
+ Field contentField = new Field("content", "", customType);
doc.add(contentField);
w = new RandomIndexWriter(random, dir);
@@ -1870,4 +1871,29 @@ public class TestIndexWriter extends Luc
w.close();
d.close();
}
+
+ public void testNRTReaderVersion() throws Exception {
+ Directory d = new MockDirectoryWrapper(random, new RAMDirectory());
+ IndexWriter w = new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ Document doc = new Document();
+ doc.add(newField("id", "0", StringField.TYPE_STORED));
+ w.addDocument(doc);
+ IndexReader r = w.getReader();
+ long version = r.getVersion();
+ r.close();
+
+ w.addDocument(doc);
+ r = w.getReader();
+ long version2 = r.getVersion();
+ r.close();
+ assert(version2 > version);
+
+ w.deleteDocuments(new Term("id", "0"));
+ r = w.getReader();
+ w.close();
+ long version3 = r.getVersion();
+ r.close();
+ assert(version3 > version2);
+ d.close();
+ }
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java Sat Oct 1 03:04:53 2011
@@ -175,7 +175,7 @@ public class TestIndexWriterCommit exten
Analyzer analyzer;
if (random.nextBoolean()) {
// no payloads
- analyzer = new ReusableAnalyzerBase() {
+ analyzer = new Analyzer() {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
return new TokenStreamComponents(new MockTokenizer(reader, MockTokenizer.WHITESPACE, true));
@@ -184,7 +184,7 @@ public class TestIndexWriterCommit exten
} else {
// fixed length payloads
final int length = random.nextInt(200);
- analyzer = new ReusableAnalyzerBase() {
+ analyzer = new Analyzer() {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, true);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java Sat Oct 1 03:04:53 2011
@@ -899,7 +899,7 @@ public class TestIndexWriterDelete exten
final Random r = random;
Directory dir = newDirectory();
// note this test explicitly disables payloads
- final Analyzer analyzer = new ReusableAnalyzerBase() {
+ final Analyzer analyzer = new Analyzer() {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
return new TokenStreamComponents(new MockTokenizer(reader, MockTokenizer.WHITESPACE, true));
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Sat Oct 1 03:04:53 2011
@@ -386,7 +386,7 @@ public class TestIndexWriterExceptions e
doc.add(newField("field", "a field", TextField.TYPE_STORED));
w.addDocument(doc);
- Analyzer analyzer = new ReusableAnalyzerBase(new ReusableAnalyzerBase.PerFieldReuseStrategy()) {
+ Analyzer analyzer = new Analyzer(new Analyzer.PerFieldReuseStrategy()) {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
MockTokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
@@ -454,7 +454,7 @@ public class TestIndexWriterExceptions e
// LUCENE-1072
public void testExceptionFromTokenStream() throws IOException {
Directory dir = newDirectory();
- IndexWriterConfig conf = newIndexWriterConfig( TEST_VERSION_CURRENT, new ReusableAnalyzerBase() {
+ IndexWriterConfig conf = newIndexWriterConfig( TEST_VERSION_CURRENT, new Analyzer() {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
@@ -591,7 +591,7 @@ public class TestIndexWriterExceptions e
}
public void testDocumentsWriterExceptions() throws IOException {
- Analyzer analyzer = new ReusableAnalyzerBase(new ReusableAnalyzerBase.PerFieldReuseStrategy()) {
+ Analyzer analyzer = new Analyzer(new Analyzer.PerFieldReuseStrategy()) {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
MockTokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
@@ -687,7 +687,7 @@ public class TestIndexWriterExceptions e
}
public void testDocumentsWriterExceptionThreads() throws Exception {
- Analyzer analyzer = new ReusableAnalyzerBase(new ReusableAnalyzerBase.PerFieldReuseStrategy()) {
+ Analyzer analyzer = new Analyzer(new Analyzer.PerFieldReuseStrategy()) {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
MockTokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
@@ -1264,7 +1264,7 @@ public class TestIndexWriterExceptions e
}
Document document = new Document();
- document.add(new Field("field", TextField.TYPE_STORED, "a field"));
+ document.add(new Field("field", "a field", TextField.TYPE_STORED));
w.addDocument(document);
for (int i = 0; i < numDocs; i++) {
@@ -1284,7 +1284,7 @@ public class TestIndexWriterExceptions e
}
}
document = new Document();
- document.add(new Field("field", TextField.TYPE_STORED, "a field"));
+ document.add(new Field("field", "a field", TextField.TYPE_STORED));
w.addDocument(document);
w.close();
IndexReader reader = IndexReader.open(dir);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexableField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexableField.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexableField.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexableField.java Sat Oct 1 03:04:53 2011
@@ -171,8 +171,8 @@ public class TestIndexableField extends
if (numeric()) {
return new NumericField(name()).setIntValue(counter).tokenStream(analyzer);
}
- return readerValue() != null ? analyzer.reusableTokenStream(name(), readerValue()) :
- analyzer.reusableTokenStream(name(), new StringReader(stringValue()));
+ return readerValue() != null ? analyzer.tokenStream(name(), readerValue()) :
+ analyzer.tokenStream(name(), new StringReader(stringValue()));
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java Sat Oct 1 03:04:53 2011
@@ -68,7 +68,7 @@ public class TestLazyProxSkipping extend
private void createIndex(int numHits) throws IOException {
int numDocs = 500;
- final Analyzer analyzer = new ReusableAnalyzerBase() {
+ final Analyzer analyzer = new Analyzer() {
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {
return new TokenStreamComponents(new MockTokenizer(reader, MockTokenizer.WHITESPACE, true));
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java Sat Oct 1 03:04:53 2011
@@ -50,16 +50,26 @@ public class TestLongPostings extends Lu
final TokenStream ts = a.tokenStream("foo", new StringReader(s));
final TermToBytesRefAttribute termAtt = ts.getAttribute(TermToBytesRefAttribute.class);
final BytesRef termBytes = termAtt.getBytesRef();
- int count = 0;
ts.reset();
+
+ int count = 0;
+ boolean changed = false;
+
while(ts.incrementToken()) {
termAtt.fillBytesRef();
if (count == 0 && !termBytes.utf8ToString().equals(s)) {
- break;
+ // The value was changed during analysis. Keep iterating so the
+ // tokenStream is exhausted.
+ changed = true;
}
count++;
}
- if (count == 1) {
+
+ ts.end();
+ ts.close();
+
+ // Did we iterate just once and the value was unchanged?
+ if (!changed && count == 1) {
return s;
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java Sat Oct 1 03:04:53 2011
@@ -111,7 +111,7 @@ public class TestMultiLevelSkipList exte
assertEquals("Wrong payload for the target " + target + ": " + b.bytes[b.offset], (byte) target, b.bytes[b.offset]);
}
- private static class PayloadAnalyzer extends ReusableAnalyzerBase {
+ private static class PayloadAnalyzer extends Analyzer {
private final AtomicInteger payloadCount = new AtomicInteger(-1);
@Override
public TokenStreamComponents createComponents(String fieldName, Reader reader) {