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 2010/09/12 11:02:13 UTC
svn commit: r996268 [2/4] - in /lucene/dev/trunk/lucene:
contrib/memory/src/test/org/apache/lucene/index/memory/
contrib/misc/src/test/org/apache/lucene/index/
contrib/misc/src/test/org/apache/lucene/index/codecs/appending/
contrib/misc/src/test/org/ap...
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Sun Sep 12 09:02:09 2010
@@ -163,7 +163,14 @@ public class TestIndexReader extends Luc
// set up writer
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
- addDocumentWithFields(writer);
+
+ Document doc = new Document();
+ doc.add(new Field("keyword","test1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(new Field("text","test1", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field("unindexed","test1", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field("unstored","test1", Field.Store.NO, Field.Index.ANALYZED));
+ writer.addDocument(doc);
+
writer.close();
// set up reader
IndexReader reader = IndexReader.open(d, false);
@@ -179,15 +186,31 @@ public class TestIndexReader extends Luc
// want to get some more segments here
int mergeFactor = ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMergeFactor();
for (int i = 0; i < 5*mergeFactor; i++) {
- addDocumentWithFields(writer);
+ doc = new Document();
+ doc.add(new Field("keyword","test1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(new Field("text","test1", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field("unindexed","test1", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field("unstored","test1", Field.Store.NO, Field.Index.ANALYZED));
+ writer.addDocument(doc);
}
// new fields are in some different segments (we hope)
for (int i = 0; i < 5*mergeFactor; i++) {
- addDocumentWithDifferentFields(writer);
+ doc = new Document();
+ doc.add(new Field("keyword2","test1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(new Field("text2","test1", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field("unindexed2","test1", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field("unstored2","test1", Field.Store.NO, Field.Index.ANALYZED));
+ writer.addDocument(doc);
}
// new termvector fields
for (int i = 0; i < 5*mergeFactor; i++) {
- addDocumentWithTermVectorFields(writer);
+ doc = new Document();
+ doc.add(new Field("tvnot","tvnot", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO));
+ doc.add(new Field("termvector","termvector", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.YES));
+ doc.add(new Field("tvoffset","tvoffset", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_OFFSETS));
+ doc.add(new Field("tvposition","tvposition", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS));
+ doc.add(newField("tvpositionoffset","tvpositionoffset", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ writer.addDocument(doc);
}
writer.close();
@@ -869,8 +892,8 @@ public class TestIndexReader extends Luc
IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
for(int i=0;i<157;i++) {
Document d = new Document();
- d.add(new Field("id", Integer.toString(i), Field.Store.YES, Field.Index.NOT_ANALYZED));
- d.add(new Field("content", "aaa " + i, Field.Store.NO, Field.Index.ANALYZED));
+ d.add(newField("id", Integer.toString(i), Field.Store.YES, Field.Index.NOT_ANALYZED));
+ d.add(newField("content", "aaa " + i, Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(d);
if (0==i%10)
writer.commit();
@@ -1137,11 +1160,11 @@ public class TestIndexReader extends Luc
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random, dir);
Document doc = new Document();
- doc.add(new Field("f", "doctor", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("f", "doctor", Field.Store.NO, Field.Index.NOT_ANALYZED));
w.addDocument(doc);
doc = new Document();
w.commit();
- doc.add(new Field("f", "who", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("f", "who", Field.Store.NO, Field.Index.NOT_ANALYZED));
w.addDocument(doc);
IndexReader r = w.getReader();
IndexReader wr = SlowMultiReaderWrapper.wrap(r);
@@ -1267,31 +1290,31 @@ public class TestIndexReader extends Luc
private void addDocumentWithFields(IndexWriter writer) throws IOException
{
Document doc = new Document();
- doc.add(new Field("keyword","test1", Field.Store.YES, Field.Index.NOT_ANALYZED));
- doc.add(new Field("text","test1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("unindexed","test1", Field.Store.YES, Field.Index.NO));
- doc.add(new Field("unstored","test1", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("keyword","test1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("text","test1", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("unindexed","test1", Field.Store.YES, Field.Index.NO));
+ doc.add(newField("unstored","test1", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
}
private void addDocumentWithDifferentFields(IndexWriter writer) throws IOException
{
Document doc = new Document();
- doc.add(new Field("keyword2","test1", Field.Store.YES, Field.Index.NOT_ANALYZED));
- doc.add(new Field("text2","test1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("unindexed2","test1", Field.Store.YES, Field.Index.NO));
- doc.add(new Field("unstored2","test1", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("keyword2","test1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("text2","test1", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("unindexed2","test1", Field.Store.YES, Field.Index.NO));
+ doc.add(newField("unstored2","test1", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
}
private void addDocumentWithTermVectorFields(IndexWriter writer) throws IOException
{
Document doc = new Document();
- doc.add(new Field("tvnot","tvnot", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO));
- doc.add(new Field("termvector","termvector", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.YES));
- doc.add(new Field("tvoffset","tvoffset", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_OFFSETS));
- doc.add(new Field("tvposition","tvposition", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS));
- doc.add(new Field("tvpositionoffset","tvpositionoffset", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("tvnot","tvnot", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO));
+ doc.add(newField("termvector","termvector", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.YES));
+ doc.add(newField("tvoffset","tvoffset", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_OFFSETS));
+ doc.add(newField("tvposition","tvposition", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS));
+ doc.add(newField("tvpositionoffset","tvpositionoffset", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
}
@@ -1299,7 +1322,7 @@ public class TestIndexReader extends Luc
private void addDoc(IndexWriter writer, String value) throws IOException
{
Document doc = new Document();
- doc.add(new Field("content", value, Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("content", value, Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
}
private void rmDir(File dir) {
@@ -1558,7 +1581,7 @@ public class TestIndexReader extends Luc
private Document createDocument(String id) {
Document doc = new Document();
- doc.add(new Field("id", id, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField("id", id, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
return doc;
}
@@ -1608,7 +1631,7 @@ public class TestIndexReader extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("number", "17", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("number", "17", Field.Store.NO, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
writer.close();
@@ -1639,7 +1662,7 @@ public class TestIndexReader extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("number", "17", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("number", "17", Field.Store.NO, Field.Index.NOT_ANALYZED));
((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
writer.addDocument(doc);
writer.commit();
@@ -1673,7 +1696,7 @@ public class TestIndexReader extends Luc
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(-1));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(10);
Document doc = new Document();
- doc.add(new Field("number", "17", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("number", "17", Field.Store.NO, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
writer.commit();
@@ -1714,8 +1737,8 @@ public class TestIndexReader extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
Document doc = new Document();
- doc.add(new Field("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", Field.Store.NO, Field.Index.ANALYZED));
- doc.add(new Field("number", "0 1 2 3 4 5 6 7 8 9", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("number", "0 1 2 3 4 5 6 7 8 9", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
writer.addDocument(doc);
writer.commit();
@@ -1747,8 +1770,8 @@ public class TestIndexReader extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
Document doc = new Document();
- doc.add(new Field("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", Field.Store.NO, Field.Index.ANALYZED));
- doc.add(new Field("number", "0 1 2 3 4 5 6 7 8 9", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("number", "0 1 2 3 4 5 6 7 8 9", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
writer.addDocument(doc);
writer.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java Sun Sep 12 09:02:09 2010
@@ -495,7 +495,7 @@ public class TestIndexReaderClone extend
((LogMergePolicy) w.getConfig().getMergePolicy()).setUseCompoundFile(false);
((LogMergePolicy) w.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
Document doc = new Document();
- doc.add(new Field("field", "yes it's stored", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "yes it's stored", Field.Store.YES, Field.Index.ANALYZED));
w.addDocument(doc);
w.close();
IndexReader r1 = IndexReader.open(dir, false);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java Sun Sep 12 09:02:09 2010
@@ -305,7 +305,7 @@ public class TestIndexReaderCloneNorms e
Document d = new Document();
float boost = nextNorm();
for (int i = 0; i < 10; i++) {
- Field f = new Field("f" + i, "v" + i, Store.NO, Index.NOT_ANALYZED);
+ Field f = newField("f" + i, "v" + i, Store.NO, Index.NOT_ANALYZED);
f.setBoost(boost);
d.add(f);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java Sun Sep 12 09:02:09 2010
@@ -181,9 +181,9 @@ public class TestIndexReaderReopen exten
for (int i=0; i<4; i++) {
for (int j=0; j<M; j++) {
Document doc = new Document();
- doc.add(new Field("id", i+"_"+j, Store.YES, Index.NOT_ANALYZED));
- doc.add(new Field("id2", i+"_"+j, Store.YES, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field("id3", i+"_"+j, Store.YES, Index.NO));
+ doc.add(newField("id", i+"_"+j, Store.YES, Index.NOT_ANALYZED));
+ doc.add(newField("id2", i+"_"+j, Store.YES, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField("id3", i+"_"+j, Store.YES, Index.NO));
iwriter.addDocument(doc);
if (i>0) {
int k = i-1;
@@ -1196,7 +1196,7 @@ public class TestIndexReaderReopen exten
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(10);
for(int i=0;i<4;i++) {
Document doc = new Document();
- doc.add(new Field("id", ""+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("id", ""+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
Map<String,String> data = new HashMap<String,String>();
data.put("index", i+"");
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Sun Sep 12 09:02:09 2010
@@ -148,18 +148,18 @@ public class TestIndexWriter extends Luc
dir.close();
}
- private static void addDoc(IndexWriter writer) throws IOException
+ private void addDoc(IndexWriter writer) throws IOException
{
Document doc = new Document();
- doc.add(new Field("content", "aaa", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("content", "aaa", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
}
private void addDocWithIndex(IndexWriter writer, int index) throws IOException
{
Document doc = new Document();
- doc.add(new Field("content", "aaa " + index, Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "" + index, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("content", "aaa " + index, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("id", "" + index, Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
@@ -555,7 +555,7 @@ public class TestIndexWriter extends Luc
MockDirectoryWrapper dir = newDirectory();
final Document doc = new Document();
- doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("content", "aaa", Field.Store.YES, Field.Index.ANALYZED));
for(int numDocs=38;numDocs<500;numDocs += 38) {
LogDocMergePolicy ldmp = new LogDocMergePolicy();
@@ -596,7 +596,7 @@ public class TestIndexWriter extends Luc
MockDirectoryWrapper dir = newDirectory();
final Document doc = new Document();
- doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("content", "aaa", Field.Store.YES, Field.Index.ANALYZED));
LogDocMergePolicy ldmp = new LogDocMergePolicy();
ldmp.setMinMergeDocs(1);
@@ -1137,12 +1137,12 @@ public class TestIndexWriter extends Luc
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(10));
for(int j=0;j<100;j++) {
Document doc = new Document();
- doc.add(new Field("a"+j, "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("b"+j, "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("c"+j, "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("d"+j, "aaa", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("e"+j, "aaa", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("f"+j, "aaa", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("a"+j, "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("b"+j, "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("c"+j, "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("d"+j, "aaa", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("e"+j, "aaa", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("f"+j, "aaa", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
writer.close();
@@ -1169,7 +1169,7 @@ public class TestIndexWriter extends Luc
int lastNumFile = dir.listAll().length;
for(int j=0;j<9;j++) {
Document doc = new Document();
- doc.add(new Field("field", "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
int numFile = dir.listAll().length;
// Verify that with a tiny RAM buffer we see new
@@ -1198,7 +1198,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", "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
_TestUtil.syncConcurrentMerges(writer);
int flushCount = writer.getFlushCount();
@@ -1255,7 +1255,7 @@ public class TestIndexWriter extends Luc
for(int j=1;j<52;j++) {
Document doc = new Document();
- doc.add(new Field("field", "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "aaa" + j, Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
@@ -1315,7 +1315,7 @@ public class TestIndexWriter extends Luc
for(int j=0;j<100;j++) {
Document doc = new Document();
for(int k=0;k<100;k++) {
- doc.add(new Field("field", Integer.toString(random.nextInt()), Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", Integer.toString(random.nextInt()), Field.Store.YES, Field.Index.ANALYZED));
}
writer.addDocument(doc);
}
@@ -1324,7 +1324,7 @@ public class TestIndexWriter extends Luc
// occurs (heavy on byte blocks)
for(int j=0;j<100;j++) {
Document doc = new Document();
- doc.add(new Field("field", "aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
@@ -1339,7 +1339,7 @@ public class TestIndexWriter extends Luc
String longTerm = b.toString();
Document doc = new Document();
- doc.add(new Field("field", longTerm, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", longTerm, Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
}
@@ -1359,7 +1359,7 @@ public class TestIndexWriter extends Luc
// Enable norms for only 1 doc, pre flush
for(int j=0;j<10;j++) {
Document doc = new Document();
- Field f = new Field("field", "aaa", Field.Store.YES, Field.Index.ANALYZED);
+ Field f = newField("field", "aaa", Field.Store.YES, Field.Index.ANALYZED);
if (j != 8) {
f.setOmitNorms(true);
}
@@ -1380,7 +1380,7 @@ public class TestIndexWriter extends Luc
// Enable norms for only 1 doc, post flush
for(int j=0;j<27;j++) {
Document doc = new Document();
- Field f = new Field("field", "aaa", Field.Store.YES, Field.Index.ANALYZED);
+ Field f = newField("field", "aaa", Field.Store.YES, Field.Index.ANALYZED);
if (j != 26) {
f.setOmitNorms(true);
}
@@ -1412,7 +1412,7 @@ public class TestIndexWriter extends Luc
b.append(" a a a a a a a a");
}
Document doc = new Document();
- doc.add(new Field("field", b.toString(), Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", b.toString(), Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
writer.close();
@@ -1477,7 +1477,7 @@ public class TestIndexWriter extends Luc
TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
Document doc = new Document();
- doc.add(new Field("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
for(int i=0;i<19;i++)
writer.addDocument(doc);
writer.flush(false, true, true);
@@ -1496,7 +1496,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
writer.commit();
writer.addDocument(new Document());
@@ -1520,7 +1520,7 @@ public class TestIndexWriter extends Luc
.setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(2));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(101);
Document doc = new Document();
- doc.add(new Field("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
for(int i=0;i<200;i++)
writer.addDocument(doc);
writer.optimize(false);
@@ -1573,7 +1573,7 @@ public class TestIndexWriter extends Luc
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document document = new Document();
- document.add(new Field("tvtest", "", Store.NO, Index.ANALYZED, TermVector.YES));
+ document.add(newField("tvtest", "", Store.NO, Index.ANALYZED, TermVector.YES));
iw.addDocument(document);
iw.close();
dir.close();
@@ -1585,17 +1585,17 @@ public class TestIndexWriter extends Luc
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document document = new Document();
- document.add(new Field("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
+ document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.YES));
iw.addDocument(document);
document = new Document();
- document.add(new Field("tvtest", "x y z", Field.Store.NO, Field.Index.ANALYZED,
+ document.add(newField("tvtest", "x y z", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.NO));
iw.addDocument(document);
// Make first segment
iw.commit();
- document.add(new Field("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
+ document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.YES));
iw.addDocument(document);
// Make 2nd segment
@@ -1612,13 +1612,13 @@ public class TestIndexWriter extends Luc
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document document = new Document();
- document.add(new Field("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
+ document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.YES));
iw.addDocument(document);
iw.commit();
document = new Document();
- document.add(new Field("tvtest", "x y z", Field.Store.NO, Field.Index.ANALYZED,
+ document.add(newField("tvtest", "x y z", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.NO));
iw.addDocument(document);
// Make first segment
@@ -1626,7 +1626,7 @@ public class TestIndexWriter extends Luc
iw.optimize();
- document.add(new Field("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
+ document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.YES));
iw.addDocument(document);
// Make 2nd segment
@@ -1648,7 +1648,7 @@ public class TestIndexWriter extends Luc
((LogMergePolicy) conf.getMergePolicy()).setMergeFactor(2);
IndexWriter iw = new IndexWriter(dir, conf);
Document document = new Document();
- document.add(new Field("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
+ document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.YES));
Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
for(int i=0;i<4;i++)
@@ -1692,7 +1692,7 @@ public class TestIndexWriter extends Luc
lmp.setMergeFactor(2);
IndexWriter iw = new IndexWriter(dir, conf);
Document document = new Document();
- document.add(new Field("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
+ document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.YES));
for(int i=0;i<177;i++)
iw.addDocument(document);
@@ -1725,7 +1725,7 @@ public class TestIndexWriter extends Luc
Document doc = new Document();
String contents = "aa bb cc dd ee ff gg hh ii jj kk";
- doc.add(new Field("content", contents, Field.Store.NO,
+ doc.add(newField("content", contents, Field.Store.NO,
Field.Index.ANALYZED));
try {
writer.addDocument(doc);
@@ -1735,13 +1735,13 @@ public class TestIndexWriter extends Luc
// Make sure we can add another normal document
doc = new Document();
- doc.add(new Field("content", "aa bb cc dd", Field.Store.NO,
+ doc.add(newField("content", "aa bb cc dd", Field.Store.NO,
Field.Index.ANALYZED));
writer.addDocument(doc);
// Make sure we can add another normal document
doc = new Document();
- doc.add(new Field("content", "aa bb cc dd", Field.Store.NO,
+ doc.add(newField("content", "aa bb cc dd", Field.Store.NO,
Field.Index.ANALYZED));
writer.addDocument(doc);
@@ -1813,7 +1813,7 @@ public class TestIndexWriter extends Luc
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
Document doc = new Document();
String contents = "aa bb cc dd ee ff gg hh ii jj kk";
- doc.add(new Field("content", contents, Field.Store.NO,
+ doc.add(newField("content", contents, Field.Store.NO,
Field.Index.ANALYZED));
boolean hitError = false;
for(int i=0;i<200;i++) {
@@ -1869,13 +1869,13 @@ public class TestIndexWriter extends Luc
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, analyzer));
//writer.setInfoStream(System.out);
Document doc = new Document();
- doc.add(new Field("contents", "here are some contents", Field.Store.YES,
+ doc.add(newField("contents", "here are some contents", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
writer.addDocument(doc);
- doc.add(new Field("crash", "this should crash after 4 terms", Field.Store.YES,
+ doc.add(newField("crash", "this should crash after 4 terms", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
- doc.add(new Field("other", "this will not get indexed", Field.Store.YES,
+ doc.add(newField("other", "this will not get indexed", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
try {
writer.addDocument(doc);
@@ -1885,7 +1885,7 @@ public class TestIndexWriter extends Luc
if (0 == i) {
doc = new Document();
- doc.add(new Field("contents", "here are some contents", Field.Store.YES,
+ doc.add(newField("contents", "here are some contents", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
writer.addDocument(doc);
@@ -1914,7 +1914,7 @@ public class TestIndexWriter extends Luc
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT,
analyzer).setMaxBufferedDocs(10));
doc = new Document();
- doc.add(new Field("contents", "here are some contents", Field.Store.YES,
+ doc.add(newField("contents", "here are some contents", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
for(int j=0;j<17;j++)
writer.addDocument(doc);
@@ -1965,13 +1965,13 @@ public class TestIndexWriter extends Luc
try {
for(int iter=0;iter<NUM_ITER;iter++) {
Document doc = new Document();
- doc.add(new Field("contents", "here are some contents", Field.Store.YES,
+ doc.add(newField("contents", "here are some contents", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
writer.addDocument(doc);
- doc.add(new Field("crash", "this should crash after 4 terms", Field.Store.YES,
+ doc.add(newField("crash", "this should crash after 4 terms", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
- doc.add(new Field("other", "this will not get indexed", Field.Store.YES,
+ doc.add(newField("other", "this will not get indexed", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
try {
writer.addDocument(doc);
@@ -1981,7 +1981,7 @@ public class TestIndexWriter extends Luc
if (0 == finalI) {
doc = new Document();
- doc.add(new Field("contents", "here are some contents", Field.Store.YES,
+ doc.add(newField("contents", "here are some contents", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
writer.addDocument(doc);
@@ -2027,7 +2027,7 @@ public class TestIndexWriter extends Luc
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(10));
Document doc = new Document();
- doc.add(new Field("contents", "here are some contents", Field.Store.YES,
+ doc.add(newField("contents", "here are some contents", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
for(int j=0;j<17;j++)
writer.addDocument(doc);
@@ -2063,21 +2063,21 @@ public class TestIndexWriter extends Luc
if (i == 7) {
// Add empty docs here
- doc.add(new Field("content3", "", Field.Store.NO,
+ doc.add(newField("content3", "", Field.Store.NO,
Field.Index.ANALYZED));
} else {
Field.Store storeVal;
if (i%2 == 0) {
- doc.add(new Field("content4", contents, Field.Store.YES,
+ doc.add(newField("content4", contents, Field.Store.YES,
Field.Index.ANALYZED));
storeVal = Field.Store.YES;
} else
storeVal = Field.Store.NO;
- doc.add(new Field("content1", contents, storeVal,
+ doc.add(newField("content1", contents, storeVal,
Field.Index.ANALYZED));
- doc.add(new Field("content3", "", Field.Store.YES,
+ doc.add(newField("content3", "", Field.Store.YES,
Field.Index.ANALYZED));
- doc.add(new Field("content5", "", storeVal,
+ doc.add(newField("content5", "", storeVal,
Field.Index.ANALYZED));
}
@@ -2105,7 +2105,7 @@ public class TestIndexWriter extends Luc
Directory directory = newDirectory();
final Document doc = new Document();
- Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
+ Field idField = newField("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
doc.add(idField);
for(int pass=0;pass<2;pass++) {
@@ -2206,7 +2206,7 @@ public class TestIndexWriter extends Luc
public void run() {
final Document doc = new Document();
- doc.add(new Field("field", "aaa bbb ccc ddd eee fff ggg hhh iii jjj", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", "aaa bbb ccc ddd eee fff ggg hhh iii jjj", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
int idUpto = 0;
int fullCount = 0;
@@ -2322,7 +2322,7 @@ public class TestIndexWriter extends Luc
.setMaxBufferedDocs(2).setMergeScheduler(new ConcurrentMergeScheduler()));
dir.setMaxSizeInBytes(Math.max(1, dir.getRecomputedActualSizeInBytes()));
final Document doc = new Document();
- doc.add(new Field("field", "aaa bbb ccc ddd eee fff ggg hhh iii jjj", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", "aaa bbb ccc ddd eee fff ggg hhh iii jjj", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
try {
writer.addDocument(doc);
fail("did not hit disk full");
@@ -2419,7 +2419,7 @@ public class TestIndexWriter extends Luc
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer())
.setMaxBufferedDocs(2).setMergeScheduler(new ConcurrentMergeScheduler()));
final Document doc = new Document();
- doc.add(new Field("field", "aaa bbb ccc ddd eee fff ggg hhh iii jjj", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", "aaa bbb ccc ddd eee fff ggg hhh iii jjj", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
for(int i=0;i<6;i++)
writer.addDocument(doc);
@@ -2614,7 +2614,7 @@ public class TestIndexWriter extends Luc
for(int i=0;i<10000;i++)
b.append(" a");
b.append(" x");
- doc.add(new Field("field", b.toString(), Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", b.toString(), Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
writer.close();
@@ -2765,7 +2765,7 @@ public class TestIndexWriter extends Luc
Document document = new Document();
- Field storedField = new Field("stored", "stored", Field.Store.YES,
+ Field storedField = newField("stored", "stored", Field.Store.YES,
Field.Index.NO);
document.add(storedField);
writer.addDocument(document);
@@ -2773,7 +2773,7 @@ public class TestIndexWriter extends Luc
document = new Document();
document.add(storedField);
- Field termVectorField = new Field("termVector", "termVector",
+ Field termVectorField = newField("termVector", "termVector",
Field.Store.NO, Field.Index.NOT_ANALYZED,
Field.TermVector.WITH_POSITIONS_OFFSETS);
@@ -2816,7 +2816,7 @@ public class TestIndexWriter extends Luc
Document document = new Document();
- Field storedField = new Field("stored", "stored", Field.Store.YES,
+ Field storedField = newField("stored", "stored", Field.Store.YES,
Field.Index.NO);
document.add(storedField);
writer.addDocument(document);
@@ -2824,7 +2824,7 @@ public class TestIndexWriter extends Luc
document = new Document();
document.add(storedField);
- Field termVectorField = new Field("termVector", "termVector",
+ Field termVectorField = newField("termVector", "termVector",
Field.Store.NO, Field.Index.NOT_ANALYZED,
Field.TermVector.WITH_POSITIONS_OFFSETS);
document.add(termVectorField);
@@ -2853,10 +2853,10 @@ public class TestIndexWriter extends Luc
Document document = new Document();
document = new Document();
- Field storedField = new Field("stored", "stored", Field.Store.YES,
+ Field storedField = newField("stored", "stored", Field.Store.YES,
Field.Index.NO);
document.add(storedField);
- Field termVectorField = new Field("termVector", "termVector",
+ Field termVectorField = newField("termVector", "termVector",
Field.Store.NO, Field.Index.NOT_ANALYZED,
Field.TermVector.WITH_POSITIONS_OFFSETS);
document.add(termVectorField);
@@ -2896,7 +2896,7 @@ public class TestIndexWriter extends Luc
for(int i=0;i<10000;i++)
b.append(" a");
b.append(" x");
- doc.add(new Field("field", b.toString(), Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", b.toString(), Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
writer.close();
@@ -2919,10 +2919,10 @@ public class TestIndexWriter extends Luc
Document document = new Document();
document = new Document();
- Field storedField = new Field("stored", "stored", Field.Store.YES,
+ Field storedField = newField("stored", "stored", Field.Store.YES,
Field.Index.NO);
document.add(storedField);
- Field termVectorField = new Field("termVector", "termVector",
+ Field termVectorField = newField("termVector", "termVector",
Field.Store.NO, Field.Index.NOT_ANALYZED,
Field.TermVector.WITH_POSITIONS_OFFSETS);
document.add(termVectorField);
@@ -2963,10 +2963,10 @@ public class TestIndexWriter extends Luc
Document document = new Document();
document = new Document();
- Field storedField = new Field("stored", "stored", Field.Store.YES,
+ Field storedField = newField("stored", "stored", Field.Store.YES,
Field.Index.NO);
document.add(storedField);
- Field termVectorField = new Field("termVector", "termVector",
+ Field termVectorField = newField("termVector", "termVector",
Field.Store.NO, Field.Index.NOT_ANALYZED,
Field.TermVector.WITH_POSITIONS_OFFSETS);
document.add(termVectorField);
@@ -3008,10 +3008,10 @@ public class TestIndexWriter extends Luc
Document document = new Document();
document = new Document();
- Field storedField = new Field("stored", "stored", Field.Store.YES,
+ Field storedField = newField("stored", "stored", Field.Store.YES,
Field.Index.NO);
document.add(storedField);
- Field termVectorField = new Field("termVector", "termVector",
+ Field termVectorField = newField("termVector", "termVector",
Field.Store.NO, Field.Index.NOT_ANALYZED,
Field.TermVector.WITH_POSITIONS_OFFSETS);
document.add(termVectorField);
@@ -3044,7 +3044,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("", "a b c", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("", "a b c", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
writer.close();
dir.close();
@@ -3072,7 +3072,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
MockIndexWriter w = new MockIndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("field", "a field", Field.Store.YES,
+ doc.add(newField("field", "a field", Field.Store.YES,
Field.Index.ANALYZED));
w.addDocument(doc);
w.doFail = true;
@@ -3092,7 +3092,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
MockIndexWriter w = new MockIndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
Document doc = new Document();
- doc.add(new Field("field", "a field", Field.Store.YES,
+ doc.add(newField("field", "a field", Field.Store.YES,
Field.Index.ANALYZED));
w.addDocument(doc);
@@ -3104,7 +3104,7 @@ public class TestIndexWriter extends Luc
};
Document crashDoc = new Document();
- crashDoc.add(new Field("crash", "do it on token 4", Field.Store.YES,
+ crashDoc.add(newField("crash", "do it on token 4", Field.Store.YES,
Field.Index.ANALYZED));
try {
w.addDocument(crashDoc, analyzer);
@@ -3146,7 +3146,7 @@ public class TestIndexWriter extends Luc
MockIndexWriter2 w = new MockIndexWriter2(dir, conf);
w.doFail = true;
Document doc = new Document();
- doc.add(new Field("field", "a field", Field.Store.YES,
+ doc.add(newField("field", "a field", Field.Store.YES,
Field.Index.ANALYZED));
for(int i=0;i<10;i++)
try {
@@ -3187,7 +3187,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
MockIndexWriter3 w = new MockIndexWriter3(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("field", "a field", Field.Store.YES,
+ doc.add(newField("field", "a field", Field.Store.YES,
Field.Index.ANALYZED));
w.addDocument(doc);
w.commit();
@@ -3244,7 +3244,7 @@ public class TestIndexWriter extends Luc
FailOnlyInCommit failure = new FailOnlyInCommit();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("field", "a field", Field.Store.YES,
+ doc.add(newField("field", "a field", Field.Store.YES,
Field.Index.ANALYZED));
w.addDocument(doc);
dir.failOn(failure);
@@ -3295,7 +3295,7 @@ public class TestIndexWriter extends Luc
final int count = utf8Data.length/2;
for(int i=0;i<count;i++)
- doc.add(new Field("f" + i, utf8Data[2*i], Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("f" + i, utf8Data[2*i], Field.Store.YES, Field.Index.ANALYZED));
w.addDocument(doc);
w.close();
@@ -3652,7 +3652,7 @@ public class TestIndexWriter extends Luc
dir.close();
}
- private abstract static class RunAddIndexesThreads {
+ private abstract class RunAddIndexesThreads {
Directory dir, dir2;
final static int NUM_INIT_DOCS = 17;
@@ -4094,10 +4094,10 @@ public class TestIndexWriter extends Luc
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- Field f = new Field("field", "abcd", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ Field f = newField("field", "abcd", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
doc.add(f);
doc.add(f);
- Field f2 = new Field("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ Field f2 = newField("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
doc.add(f2);
doc.add(f);
w.addDocument(doc);
@@ -4129,7 +4129,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- Field f = new Field("field", "abcd", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ Field f = newField("field", "abcd", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
doc.add(f);
doc.add(f);
w.addDocument(doc);
@@ -4151,7 +4151,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- Field f = new Field("field", "abcd ", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ Field f = newField("field", "abcd ", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
doc.add(f);
doc.add(f);
w.addDocument(doc);
@@ -4198,7 +4198,7 @@ public class TestIndexWriter extends Luc
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true)));
Document doc = new Document();
- Field f = new Field("field", "abcd the", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ Field f = newField("field", "abcd the", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
doc.add(f);
doc.add(f);
w.addDocument(doc);
@@ -4221,9 +4221,9 @@ public class TestIndexWriter extends Luc
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- Field f = new Field("field", "abcd the ", Field.Store.NO,
+ Field f = newField("field", "abcd the ", Field.Store.NO,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
- Field f2 = new Field("field", "crunch man", Field.Store.NO,
+ Field f2 = newField("field", "crunch man", Field.Store.NO,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
doc.add(f);
doc.add(f2);
@@ -4252,9 +4252,9 @@ public class TestIndexWriter extends Luc
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- Field f = new Field("field", "", Field.Store.NO,
+ Field f = newField("field", "", Field.Store.NO,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
- Field f2 = new Field("field", "crunch man", Field.Store.NO,
+ Field f2 = newField("field", "crunch man", Field.Store.NO,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
doc.add(f);
doc.add(f2);
@@ -4281,12 +4281,12 @@ public class TestIndexWriter extends Luc
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- Field f = new Field("field", "abcd", Field.Store.NO,
+ Field f = newField("field", "abcd", Field.Store.NO,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
doc.add(f);
- doc.add(new Field("field", "", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", "", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
- Field f2 = new Field("field", "crunch", Field.Store.NO,
+ Field f2 = newField("field", "crunch", Field.Store.NO,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
doc.add(f2);
@@ -4333,7 +4333,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
Document doc = new Document();
- doc.add(new Field("content", "aaa bbb ccc ddd eee fff ggg hhh iii", Field.Store.YES,
+ doc.add(newField("content", "aaa bbb ccc ddd eee fff ggg hhh iii", Field.Store.YES,
Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
writer.addDocument(doc);
@@ -4386,7 +4386,7 @@ public class TestIndexWriter extends Luc
w = new IndexWriter(dir, conf);
Document doc = new Document();
- doc.add(new Field("field", "some text contents", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "some text contents", Field.Store.YES, Field.Index.ANALYZED));
for(int i=0;i<100;i++) {
w.addDocument(doc);
if (i%10 == 0) {
@@ -4495,7 +4495,7 @@ public class TestIndexWriter extends Luc
Document doc = new Document();
Field f = new Field("binary", b, 10, 17);
f.setTokenStream(new MockTokenizer(new StringReader("doc1field1"), MockTokenizer.WHITESPACE, false));
- Field f2 = new Field("string", "value", Field.Store.YES,Field.Index.ANALYZED);
+ Field f2 = newField("string", "value", Field.Store.YES,Field.Index.ANALYZED);
f2.setTokenStream(new MockTokenizer(new StringReader("doc1field2"), MockTokenizer.WHITESPACE, false));
doc.add(f);
doc.add(f2);
@@ -4552,9 +4552,9 @@ public class TestIndexWriter extends Luc
Directory d = newDirectory();
IndexWriter w = new IndexWriter(d, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("zzz", "a b c", Field.Store.YES, Field.Index.NO));
- doc.add(new Field("aaa", "a b c", Field.Store.YES, Field.Index.NO));
- doc.add(new Field("zzz", "1 2 3", Field.Store.YES, Field.Index.NO));
+ doc.add(newField("zzz", "a b c", Field.Store.YES, Field.Index.NO));
+ doc.add(newField("aaa", "a b c", Field.Store.YES, Field.Index.NO));
+ doc.add(newField("zzz", "1 2 3", Field.Store.YES, Field.Index.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
doc = r.document(0);
@@ -4584,10 +4584,10 @@ public class TestIndexWriter extends Luc
Directory d = newDirectory();
IndexWriter w = new IndexWriter(d, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("field", "a a\uffffb", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", "a a\uffffb", Field.Store.NO, Field.Index.ANALYZED));
w.addDocument(doc);
doc = new Document();
- doc.add(new Field("field", "a", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", "a", Field.Store.NO, Field.Index.ANALYZED));
w.addDocument(doc);
IndexReader r = w.getReader();
assertEquals(1, r.docFreq(new Term("field", "a\uffffb")));
@@ -4634,7 +4634,7 @@ public class TestIndexWriter extends Luc
try {
final Document doc = new Document();
IndexReader r = IndexReader.open(dir);
- Field f = new Field("f", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
+ Field f = newField("f", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
doc.add(f);
int count = 0;
do {
@@ -4731,7 +4731,7 @@ public class TestIndexWriter extends Luc
RandomIndexWriter writer = new RandomIndexWriter(rnd, dir);
Document d = new Document();
// Single segment
- Field f = new Field("f", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
+ Field f = newField("f", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
d.add(f);
char[] chars = new char[2];
final Set<String> allTerms = new HashSet<String>();
@@ -4799,7 +4799,7 @@ public class TestIndexWriter extends Luc
s.append(' ').append(""+i);
}
Document d = new Document();
- Field f = new Field("field", s.toString(), Field.Store.NO, Field.Index.ANALYZED);
+ Field f = newField("field", s.toString(), Field.Store.NO, Field.Index.ANALYZED);
d.add(f);
w.addDocument(d);
IndexReader r = w.getReader(2).getSequentialSubReaders()[0];
@@ -4824,7 +4824,7 @@ public class TestIndexWriter extends Luc
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
((LogMergePolicy) w.getMergePolicy()).setUseCompoundFile(true);
Document doc = new Document();
- doc.add(new Field("field", "go", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", "go", Field.Store.NO, Field.Index.ANALYZED));
w.addDocument(doc);
IndexReader r;
if (iter == 0) {
@@ -4887,7 +4887,7 @@ public class TestIndexWriter extends Luc
// First commit
Document doc = new Document();
- doc.add(new Field("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
writer.commit();
assertEquals(1, IndexReader.listCommits(dir).size());
@@ -4897,7 +4897,7 @@ public class TestIndexWriter extends Luc
// Second commit - now KeepOnlyLastCommit cannot delete the prev commit.
doc = new Document();
- doc.add(new Field("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
writer.commit();
assertEquals(2, IndexReader.listCommits(dir).size());
@@ -4928,7 +4928,7 @@ public class TestIndexWriter extends Luc
FlushCountingIndexWriter w = new FlushCountingIndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setRAMBufferSizeMB(0.5).setMaxBufferedDocs(-1).setMaxBufferedDeleteTerms(-1));
//w.setInfoStream(System.out);
Document doc = new Document();
- doc.add(new Field("field", "go 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", "go 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20", Field.Store.NO, Field.Index.ANALYZED));
int num = 6 * RANDOM_MULTIPLIER;
for (int iter = 0; iter < num; iter++) {
int count = 0;
@@ -5004,13 +5004,13 @@ public class TestIndexWriter extends Luc
Document doc = new Document();
// create as many files as possible
- doc.add(new Field("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
// Adding just one document does not call flush yet.
assertEquals("only the stored and term vector files should exist in the directory", 5 + extraFileCount, dir.listAll().length);
doc = new Document();
- doc.add(new Field("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
writer.addDocument(doc);
// The second document should cause a flush.
assertTrue("flush should have occurred and files created", dir.listAll().length > 5 + extraFileCount);
@@ -5034,7 +5034,7 @@ public class TestIndexWriter extends Luc
TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
Document doc = new Document();
- doc.add(new Field("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("c", "val", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
w.addDocument(doc);
w.addDocument(doc);
IndexWriter w2 = new IndexWriter(dir, newIndexWriterConfig(
@@ -5140,7 +5140,7 @@ public class TestIndexWriter extends Luc
final List<Integer> fieldIDs = new ArrayList<Integer>();
- Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
+ Field idField = newField("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
for(int i=0;i<fieldCount;i++) {
fieldIDs.add(i);
@@ -5163,7 +5163,7 @@ public class TestIndexWriter extends Luc
final String s;
if (rand.nextInt(4) != 3) {
s = _TestUtil.randomUnicodeString(rand, 1000);
- doc.add(new Field("f"+field, s, Field.Store.YES, Field.Index.NO));
+ doc.add(newField("f"+field, s, Field.Store.YES, Field.Index.NO));
} else {
s = null;
}
@@ -5248,7 +5248,7 @@ public class TestIndexWriter extends Luc
((LogMergePolicy) w.getMergePolicy()).setMergeFactor(2);
Document doc = new Document();
- doc.add(new Field("f", "doctor who", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("f", "doctor who", Field.Store.YES, Field.Index.ANALYZED));
w.addDocument(doc);
w.commit();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java Sun Sep 12 09:02:09 2010
@@ -48,14 +48,14 @@ public class TestIndexWriterDelete exten
for (int i = 0; i < keywords.length; i++) {
Document doc = new Document();
- doc.add(new Field("id", keywords[i], Field.Store.YES,
+ doc.add(newField("id", keywords[i], Field.Store.YES,
Field.Index.NOT_ANALYZED));
- doc.add(new Field("country", unindexed[i], Field.Store.YES,
+ doc.add(newField("country", unindexed[i], Field.Store.YES,
Field.Index.NO));
- doc.add(new Field("contents", unstored[i], Field.Store.NO,
+ doc.add(newField("contents", unstored[i], Field.Store.NO,
Field.Index.ANALYZED));
doc
- .add(new Field("city", text[i], Field.Store.YES,
+ .add(newField("city", text[i], Field.Store.YES,
Field.Index.ANALYZED));
modifier.addDocument(doc);
}
@@ -370,10 +370,10 @@ public class TestIndexWriterDelete exten
private void updateDoc(IndexWriter modifier, int id, int value)
throws IOException {
Document doc = new Document();
- doc.add(new Field("content", "aaa", Field.Store.NO, Field.Index.ANALYZED));
- doc.add(new Field("id", String.valueOf(id), Field.Store.YES,
+ doc.add(newField("content", "aaa", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("id", String.valueOf(id), Field.Store.YES,
Field.Index.NOT_ANALYZED));
- doc.add(new Field("value", String.valueOf(value), Field.Store.NO,
+ doc.add(newField("value", String.valueOf(value), Field.Store.NO,
Field.Index.NOT_ANALYZED));
modifier.updateDocument(new Term("id", String.valueOf(id)), doc);
}
@@ -382,10 +382,10 @@ public class TestIndexWriterDelete exten
private void addDoc(IndexWriter modifier, int id, int value)
throws IOException {
Document doc = new Document();
- doc.add(new Field("content", "aaa", Field.Store.NO, Field.Index.ANALYZED));
- doc.add(new Field("id", String.valueOf(id), Field.Store.YES,
+ doc.add(newField("content", "aaa", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("id", String.valueOf(id), Field.Store.YES,
Field.Index.NOT_ANALYZED));
- doc.add(new Field("value", String.valueOf(value), Field.Store.NO,
+ doc.add(newField("value", String.valueOf(value), Field.Store.NO,
Field.Index.NOT_ANALYZED));
modifier.addDocument(doc);
}
@@ -422,9 +422,9 @@ public class TestIndexWriterDelete exten
IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
for (int i = 0; i < 157; i++) {
Document d = new Document();
- d.add(new Field("id", Integer.toString(i), Field.Store.YES,
+ d.add(newField("id", Integer.toString(i), Field.Store.YES,
Field.Index.NOT_ANALYZED));
- d.add(new Field("content", "aaa " + i, Field.Store.NO,
+ d.add(newField("content", "aaa " + i, Field.Store.NO,
Field.Index.ANALYZED));
writer.addDocument(d);
}
@@ -496,9 +496,9 @@ public class TestIndexWriterDelete exten
for (int i = 0; i < 13; i++) {
if (updates) {
Document d = new Document();
- d.add(new Field("id", Integer.toString(i), Field.Store.YES,
+ d.add(newField("id", Integer.toString(i), Field.Store.YES,
Field.Index.NOT_ANALYZED));
- d.add(new Field("content", "bbb " + i, Field.Store.NO,
+ d.add(newField("content", "bbb " + i, Field.Store.NO,
Field.Index.ANALYZED));
modifier.updateDocument(new Term("id", Integer.toString(docId)), d);
} else { // deletes
@@ -666,13 +666,13 @@ public class TestIndexWriterDelete exten
for (int i = 0; i < keywords.length; i++) {
Document doc = new Document();
- doc.add(new Field("id", keywords[i], Field.Store.YES,
+ doc.add(newField("id", keywords[i], Field.Store.YES,
Field.Index.NOT_ANALYZED));
- doc.add(new Field("country", unindexed[i], Field.Store.YES,
+ doc.add(newField("country", unindexed[i], Field.Store.YES,
Field.Index.NO));
- doc.add(new Field("contents", unstored[i], Field.Store.NO,
+ doc.add(newField("contents", unstored[i], Field.Store.NO,
Field.Index.ANALYZED));
- doc.add(new Field("city", text[i], Field.Store.YES,
+ doc.add(newField("city", text[i], Field.Store.YES,
Field.Index.ANALYZED));
modifier.addDocument(doc);
}
@@ -772,13 +772,13 @@ public class TestIndexWriterDelete exten
for (int i = 0; i < keywords.length; i++) {
Document doc = new Document();
- doc.add(new Field("id", keywords[i], Field.Store.YES,
+ doc.add(newField("id", keywords[i], Field.Store.YES,
Field.Index.NOT_ANALYZED));
- doc.add(new Field("country", unindexed[i], Field.Store.YES,
+ doc.add(newField("country", unindexed[i], Field.Store.YES,
Field.Index.NO));
- doc.add(new Field("contents", unstored[i], Field.Store.NO,
+ doc.add(newField("contents", unstored[i], Field.Store.NO,
Field.Index.ANALYZED));
- doc.add(new Field("city", text[i], Field.Store.YES,
+ doc.add(newField("city", text[i], Field.Store.YES,
Field.Index.ANALYZED));
try {
modifier.addDocument(doc);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Sun Sep 12 09:02:09 2010
@@ -47,17 +47,17 @@ public class TestIndexWriterExceptions e
final Document doc = new Document();
- doc.add(new Field("content1", "aaa bbb ccc ddd", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content6", "aaa bbb ccc ddd", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
- doc.add(new Field("content2", "aaa bbb ccc ddd", Field.Store.YES, Field.Index.NOT_ANALYZED));
- doc.add(new Field("content3", "aaa bbb ccc ddd", Field.Store.YES, Field.Index.NO));
+ doc.add(newField("content1", "aaa bbb ccc ddd", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("content6", "aaa bbb ccc ddd", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("content2", "aaa bbb ccc ddd", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("content3", "aaa bbb ccc ddd", Field.Store.YES, Field.Index.NO));
- doc.add(new Field("content4", "aaa bbb ccc ddd", Field.Store.NO, Field.Index.ANALYZED));
- doc.add(new Field("content5", "aaa bbb ccc ddd", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("content4", "aaa bbb ccc ddd", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("content5", "aaa bbb ccc ddd", Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(new Field("content7", "aaa bbb ccc ddd", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("content7", "aaa bbb ccc ddd", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
- final Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
+ final Field idField = newField("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
doc.add(idField);
final long stopTime = System.currentTimeMillis() + 500;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java Sun Sep 12 09:02:09 2010
@@ -214,7 +214,7 @@ public class TestIndexWriterMergePolicy
private void addDoc(IndexWriter writer) throws IOException {
Document doc = new Document();
- doc.add(new Field("content", "aaa", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("content", "aaa", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Sun Sep 12 09:02:09 2010
@@ -103,7 +103,7 @@ public class TestIndexWriterMerging exte
for (int i = start; i < (start + numDocs); i++)
{
Document temp = new Document();
- temp.add(new Field("count", (""+i), Field.Store.YES, Field.Index.NOT_ANALYZED));
+ temp.add(newField("count", (""+i), Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(temp);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Sun Sep 12 09:02:09 2010
@@ -81,7 +81,7 @@ public class TestIndexWriterReader exten
Document newDoc = r1.document(10);
newDoc.removeField("id");
- newDoc.add(new Field("id", Integer.toString(8000), Store.YES, Index.NOT_ANALYZED));
+ newDoc.add(newField("id", Integer.toString(8000), Store.YES, Index.NOT_ANALYZED));
writer.updateDocument(new Term("id", id10), newDoc);
assertFalse(r1.isCurrent());
@@ -102,7 +102,7 @@ public class TestIndexWriterReader exten
writer = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("field", "a b c", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", "a b c", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
assertTrue(r2.isCurrent());
assertTrue(r3.isCurrent());
@@ -776,8 +776,8 @@ public class TestIndexWriterReader exten
Directory dir = newDirectory();
final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("field", "a b c", Field.Store.NO, Field.Index.ANALYZED));
- Field id = new Field("id", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
+ doc.add(newField("field", "a b c", Field.Store.NO, Field.Index.ANALYZED));
+ Field id = newField("id", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
doc.add(id);
id.setValue("0");
w.addDocument(doc);
@@ -800,8 +800,8 @@ public class TestIndexWriterReader exten
Directory dir = newDirectory();
final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
- doc.add(new Field("field", "a b c", Field.Store.NO, Field.Index.ANALYZED));
- Field id = new Field("id", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
+ doc.add(newField("field", "a b c", Field.Store.NO, Field.Index.ANALYZED));
+ Field id = newField("id", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
doc.add(id);
id.setValue("0");
w.addDocument(doc);
@@ -850,7 +850,7 @@ public class TestIndexWriterReader exten
});
Document doc = new Document();
- doc.add(new Field("foo", "bar", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("foo", "bar", Field.Store.YES, Field.Index.NOT_ANALYZED));
for(int i=0;i<20;i++) {
w.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java Sun Sep 12 09:02:09 2010
@@ -45,7 +45,7 @@ public class TestIsCurrent extends Lucen
// write document
Document doc = new Document();
- doc.add(new Field("UUID", "1", Store.YES, Index.ANALYZED));
+ doc.add(newField("UUID", "1", Store.YES, Index.ANALYZED));
writer.addDocument(doc);
writer.commit();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyBug.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyBug.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyBug.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyBug.java Sun Sep 12 09:02:09 2010
@@ -78,7 +78,7 @@ public class TestLazyBug extends LuceneT
for (int d = 1; d <= NUM_DOCS; d++) {
Document doc = new Document();
for (int f = 1; f <= NUM_FIELDS; f++ ) {
- doc.add(new Field("f"+f,
+ doc.add(newField("f"+f,
data[f % data.length]
+ '#' + data[random.nextInt(data.length)],
Field.Store.YES,
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java Sun Sep 12 09:02:09 2010
@@ -85,7 +85,7 @@ public class TestLazyProxSkipping extend
content = this.term3 + " " + this.term2;
}
- doc.add(new Field(this.field, content, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField(this.field, content, Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
@@ -129,7 +129,7 @@ public class TestLazyProxSkipping extend
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
for (int i = 0; i < 10; i++) {
Document doc = new Document();
- doc.add(new Field(this.field, "a b", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField(this.field, "a b", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiFields.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiFields.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiFields.java Sun Sep 12 09:02:09 2010
@@ -39,9 +39,9 @@ public class TestMultiFields extends Luc
int numDocs = _TestUtil.nextInt(random, 1, 100 * RANDOM_MULTIPLIER);
Document doc = new Document();
- Field f = new Field("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
+ Field f = newField("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
doc.add(f);
- Field id = new Field("id", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
+ Field id = newField("id", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
doc.add(id);
boolean onlyUniqueTerms = random.nextBoolean();
@@ -132,7 +132,7 @@ public class TestMultiFields extends Luc
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document d = new Document();
- d.add(new Field("f", "j", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ d.add(newField("f", "j", Field.Store.NO, Field.Index.NOT_ANALYZED));
w.addDocument(d);
w.commit();
w.addDocument(d);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java Sun Sep 12 09:02:09 2010
@@ -66,7 +66,7 @@ public class TestMultiLevelSkipList exte
Term term = new Term("test", "a");
for (int i = 0; i < 5000; i++) {
Document d1 = new Document();
- d1.add(new Field(term.field(), term.text(), Store.NO, Index.ANALYZED));
+ d1.add(newField(term.field(), term.text(), Store.NO, Index.ANALYZED));
writer.addDocument(d1);
}
writer.commit();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java Sun Sep 12 09:02:09 2010
@@ -79,7 +79,7 @@ public class TestNoDeletionPolicy extend
.setIndexDeletionPolicy(NoDeletionPolicy.INSTANCE));
for (int i = 0; i < 10; i++) {
Document doc = new Document();
- doc.add(new Field("c", "a" + i, Store.YES, Index.ANALYZED));
+ doc.add(newField("c", "a" + i, Store.YES, Index.ANALYZED));
writer.addDocument(doc);
writer.commit();
assertEquals("wrong number of commits !", i + 1, IndexReader.listCommits(dir).size());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java Sun Sep 12 09:02:09 2010
@@ -208,7 +208,7 @@ public class TestNorms extends LuceneTes
Document d = new Document();
float boost = nextNorm();
for (int i = 0; i < 10; i++) {
- Field f = new Field("f"+i,"v"+i,Store.NO,Index.NOT_ANALYZED);
+ Field f = newField("f"+i,"v"+i,Store.NO,Index.NOT_ANALYZED);
f.setBoost(boost);
d.add(f);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java?rev=996268&r1=996267&r2=996268&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java Sun Sep 12 09:02:09 2010
@@ -64,11 +64,11 @@ public class TestOmitTf extends LuceneTe
Document d = new Document();
// this field will have Tf
- Field f1 = new Field("f1", "This field has term freqs", Field.Store.NO, Field.Index.ANALYZED);
+ Field f1 = newField("f1", "This field has term freqs", Field.Store.NO, Field.Index.ANALYZED);
d.add(f1);
// this field will NOT have Tf
- Field f2 = new Field("f2", "This field has NO Tf in all docs", Field.Store.NO, Field.Index.ANALYZED);
+ Field f2 = newField("f2", "This field has NO Tf in all docs", Field.Store.NO, Field.Index.ANALYZED);
f2.setOmitTermFreqAndPositions(true);
d.add(f2);
@@ -113,11 +113,11 @@ public class TestOmitTf extends LuceneTe
Document d = new Document();
// this field will have Tf
- Field f1 = new Field("f1", "This field has term freqs", Field.Store.NO, Field.Index.ANALYZED);
+ Field f1 = newField("f1", "This field has term freqs", Field.Store.NO, Field.Index.ANALYZED);
d.add(f1);
// this field will NOT have Tf
- Field f2 = new Field("f2", "This field has NO Tf in all docs", Field.Store.NO, Field.Index.ANALYZED);
+ Field f2 = newField("f2", "This field has NO Tf in all docs", Field.Store.NO, Field.Index.ANALYZED);
f2.setOmitTermFreqAndPositions(true);
d.add(f2);
@@ -166,11 +166,11 @@ public class TestOmitTf extends LuceneTe
Document d = new Document();
// this field will have Tf
- Field f1 = new Field("f1", "This field has term freqs", Field.Store.NO, Field.Index.ANALYZED);
+ Field f1 = newField("f1", "This field has term freqs", Field.Store.NO, Field.Index.ANALYZED);
d.add(f1);
// this field will NOT have Tf
- Field f2 = new Field("f2", "This field has NO Tf in all docs", Field.Store.NO, Field.Index.ANALYZED);
+ Field f2 = newField("f2", "This field has NO Tf in all docs", Field.Store.NO, Field.Index.ANALYZED);
d.add(f2);
for(int i=0;i<5;i++)
@@ -216,7 +216,7 @@ public class TestOmitTf extends LuceneTe
lmp.setUseCompoundDocStore(false);
Document d = new Document();
- Field f1 = new Field("f1", "This field has term freqs", Field.Store.NO, Field.Index.ANALYZED);
+ Field f1 = newField("f1", "This field has term freqs", Field.Store.NO, Field.Index.ANALYZED);
f1.setOmitTermFreqAndPositions(true);
d.add(f1);
@@ -252,11 +252,11 @@ public class TestOmitTf extends LuceneTe
Document d = new Document();
sb.append(term).append(" ");
String content = sb.toString();
- Field noTf = new Field("noTf", content + (i%2==0 ? "" : " notf"), Field.Store.NO, Field.Index.ANALYZED);
+ Field noTf = newField("noTf", content + (i%2==0 ? "" : " notf"), Field.Store.NO, Field.Index.ANALYZED);
noTf.setOmitTermFreqAndPositions(true);
d.add(noTf);
- Field tf = new Field("tf", content + (i%2==0 ? " tf" : ""), Field.Store.NO, Field.Index.ANALYZED);
+ Field tf = newField("tf", content + (i%2==0 ? " tf" : ""), Field.Store.NO, Field.Index.ANALYZED);
d.add(tf);
writer.addDocument(d);