You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2011/12/15 06:11:30 UTC
svn commit: r1214623 [9/17] - in /lucene/dev/branches/solrcloud: ./
dev-tools/idea/lucene/contrib/ lucene/ lucene/contrib/
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight...
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java Thu Dec 15 05:11:14 2011
@@ -51,25 +51,23 @@ public class TestIndexWriterCommit exten
writer.close();
Term searchTerm = new Term("content", "aaa");
- IndexReader reader = IndexReader.open(dir, false);
+ IndexReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("first number of hits", 14, hits.length);
- searcher.close();
reader.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
for(int i=0;i<3;i++) {
for(int j=0;j<11;j++) {
TestIndexWriter.addDoc(writer);
}
- IndexReader r = IndexReader.open(dir, false);
+ IndexReader r = IndexReader.open(dir);
searcher = new IndexSearcher(r);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("reader incorrectly sees changes from writer", 14, hits.length);
- searcher.close();
r.close();
assertTrue("reader should have still been current", reader.isCurrent());
}
@@ -78,11 +76,10 @@ public class TestIndexWriterCommit exten
writer.close();
assertFalse("reader should not be current now", reader.isCurrent());
- IndexReader r = IndexReader.open(dir, false);
+ IndexReader r = IndexReader.open(dir);
searcher = new IndexSearcher(r);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("reader did not see changes after writer was closed", 47, hits.length);
- searcher.close();
r.close();
reader.close();
dir.close();
@@ -105,11 +102,10 @@ public class TestIndexWriterCommit exten
writer.close();
Term searchTerm = new Term("content", "aaa");
- IndexReader reader = IndexReader.open(dir, false);
+ IndexReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("first number of hits", 14, hits.length);
- searcher.close();
reader.close();
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))
@@ -120,11 +116,10 @@ public class TestIndexWriterCommit exten
// Delete all docs:
writer.deleteDocuments(searchTerm);
- reader = IndexReader.open(dir, false);
+ reader = IndexReader.open(dir);
searcher = new IndexSearcher(reader);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("reader incorrectly sees changes from writer", 14, hits.length);
- searcher.close();
reader.close();
// Now, close the writer:
@@ -132,11 +127,10 @@ public class TestIndexWriterCommit exten
TestIndexWriter.assertNoUnreferencedFiles(dir, "unreferenced files remain after rollback()");
- reader = IndexReader.open(dir, false);
+ reader = IndexReader.open(dir);
searcher = new IndexSearcher(reader);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("saw changes after writer.abort", 14, hits.length);
- searcher.close();
reader.close();
// Now make sure we can re-open the index, add docs,
@@ -152,20 +146,18 @@ public class TestIndexWriterCommit exten
for(int j=0;j<17;j++) {
TestIndexWriter.addDoc(writer);
}
- IndexReader r = IndexReader.open(dir, false);
+ IndexReader r = IndexReader.open(dir);
searcher = new IndexSearcher(r);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("reader incorrectly sees changes from writer", 14, hits.length);
- searcher.close();
r.close();
}
writer.close();
- IndexReader r = IndexReader.open(dir, false);
+ IndexReader r = IndexReader.open(dir);
searcher = new IndexSearcher(r);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("didn't see changes after close", 218, hits.length);
- searcher.close();
r.close();
dir.close();
@@ -243,7 +235,7 @@ public class TestIndexWriterCommit exten
writer.forceMerge(1);
writer.close();
- IndexReader.open(dir, true).close();
+ IndexReader.open(dir).close();
long endDiskUsage = dir.getMaxUsedSizeInBytes();
@@ -287,7 +279,7 @@ public class TestIndexWriterCommit exten
writer.forceMerge(1);
// Open a reader before closing (commiting) the writer:
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
// Reader should see index as multi-seg at this
// point:
@@ -299,7 +291,7 @@ public class TestIndexWriterCommit exten
TestIndexWriter.assertNoUnreferencedFiles(dir, "aborted writer after forceMerge");
// Open a reader after aborting writer:
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
// Reader should still see index as multi-segment
assertTrue("Reader incorrectly sees one segment", reader.getSequentialSubReaders().length > 1);
@@ -318,7 +310,7 @@ public class TestIndexWriterCommit exten
TestIndexWriter.assertNoUnreferencedFiles(dir, "aborted writer after forceMerge");
// Open a reader after aborting writer:
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
// Reader should see index as one segment
assertEquals("Reader incorrectly sees more than one segment", 1, reader.getSequentialSubReaders().length);
@@ -398,7 +390,7 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 23; i++)
TestIndexWriter.addDoc(writer);
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
writer.commit();
IndexReader reader2 = IndexReader.openIfChanged(reader);
@@ -411,12 +403,12 @@ public class TestIndexWriterCommit exten
TestIndexWriter.addDoc(writer);
assertEquals(23, reader2.numDocs());
reader2.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(23, reader.numDocs());
reader.close();
writer.commit();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(40, reader.numDocs());
reader.close();
writer.close();
@@ -473,33 +465,10 @@ public class TestIndexWriterCommit exten
assertNotNull(commit);
- IndexReader r = IndexReader.open(commit, true);
- assertEquals(2, r.numDocs());
- r.close();
-
- // open "second", w/ writeable IndexReader & commit
- r = IndexReader.open(commit, NoDeletionPolicy.INSTANCE, false);
- assertEquals(2, r.numDocs());
- r.deleteDocument(0);
- r.deleteDocument(1);
- commitData.put("tag", "fourth");
- r.commit(commitData);
- r.close();
-
- // make sure "third" commit is still there
- commit = null;
- for(IndexCommit c : IndexReader.listCommits(dir)) {
- if (c.getUserData().get("tag").equals("third")) {
- commit = c;
- break;
- }
- }
- assertNotNull(commit);
-
dir.close();
}
- public void testNoCommits() throws Exception {
+ public void testZeroCommits() throws Exception {
// Tests that if we don't call commit(), the directory has 0 commits. This has
// changed since LUCENE-2386, where before IW would always commit on a fresh
// new index.
@@ -532,12 +501,12 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 23; i++)
TestIndexWriter.addDoc(writer);
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
writer.prepareCommit();
- IndexReader reader2 = IndexReader.open(dir, true);
+ IndexReader reader2 = IndexReader.open(dir);
assertEquals(0, reader2.numDocs());
writer.commit();
@@ -555,18 +524,18 @@ public class TestIndexWriterCommit exten
assertEquals(23, reader3.numDocs());
reader3.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(23, reader.numDocs());
reader.close();
writer.prepareCommit();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(23, reader.numDocs());
reader.close();
writer.commit();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(40, reader.numDocs());
reader.close();
writer.close();
@@ -589,12 +558,12 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 23; i++)
TestIndexWriter.addDoc(writer);
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
writer.prepareCommit();
- IndexReader reader2 = IndexReader.open(dir, true);
+ IndexReader reader2 = IndexReader.open(dir);
assertEquals(0, reader2.numDocs());
writer.rollback();
@@ -610,18 +579,18 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 17; i++)
TestIndexWriter.addDoc(writer);
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
reader.close();
writer.prepareCommit();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
reader.close();
writer.commit();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(17, reader.numDocs());
reader.close();
writer.close();
@@ -637,7 +606,7 @@ public class TestIndexWriterCommit exten
writer.commit();
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
reader.close();
dir.close();
@@ -653,7 +622,7 @@ public class TestIndexWriterCommit exten
assertEquals(0, IndexReader.getCommitUserData(dir).size());
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
// commit(Map) never called for this index
assertEquals(0, r.getCommitUserData().size());
r.close();
@@ -668,7 +637,7 @@ public class TestIndexWriterCommit exten
assertEquals("test1", IndexReader.getCommitUserData(dir).get("label"));
- r = IndexReader.open(dir, true);
+ r = IndexReader.open(dir);
assertEquals("test1", r.getCommitUserData().get("label"));
r.close();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java Thu Dec 15 05:11:14 2011
@@ -106,7 +106,7 @@ public class TestIndexWriterDelete exten
modifier.commit();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(7, reader.numDocs());
reader.close();
@@ -114,7 +114,7 @@ public class TestIndexWriterDelete exten
modifier.commit();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
reader.close();
modifier.close();
@@ -166,7 +166,7 @@ public class TestIndexWriterDelete exten
assertEquals(0, modifier.getSegmentCount());
modifier.commit();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(1, reader.numDocs());
int hitCount = getHitCount(dir, new Term("id", String.valueOf(id)));
@@ -204,7 +204,7 @@ public class TestIndexWriterDelete exten
modifier.commit();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(5, reader.numDocs());
modifier.close();
reader.close();
@@ -226,7 +226,7 @@ public class TestIndexWriterDelete exten
}
modifier.commit();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(7, reader.numDocs());
reader.close();
@@ -236,7 +236,7 @@ public class TestIndexWriterDelete exten
modifier.commit();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(5, reader.numDocs());
reader.close();
@@ -246,7 +246,7 @@ public class TestIndexWriterDelete exten
}
modifier.deleteDocuments(terms);
modifier.commit();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(2, reader.numDocs());
reader.close();
@@ -269,7 +269,7 @@ public class TestIndexWriterDelete exten
}
modifier.commit();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(7, reader.numDocs());
reader.close();
@@ -280,7 +280,7 @@ public class TestIndexWriterDelete exten
modifier.deleteAll();
// Delete all shouldn't be on disk yet
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(7, reader.numDocs());
reader.close();
@@ -292,7 +292,7 @@ public class TestIndexWriterDelete exten
modifier.commit();
// Validate there are no docs left
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(2, reader.numDocs());
reader.close();
@@ -317,7 +317,7 @@ public class TestIndexWriterDelete exten
addDoc(modifier, ++id, value);
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(7, reader.numDocs());
reader.close();
@@ -329,7 +329,7 @@ public class TestIndexWriterDelete exten
modifier.close();
// Validate that the docs are still there
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(7, reader.numDocs());
reader.close();
@@ -372,7 +372,7 @@ public class TestIndexWriterDelete exten
modifier.close();
// Validate that the docs are still there
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(7, reader.numDocs());
reader.close();
@@ -403,7 +403,6 @@ public class TestIndexWriterDelete exten
IndexReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
int hitCount = searcher.search(new TermQuery(term), null, 1000).totalHits;
- searcher.close();
reader.close();
return hitCount;
}
@@ -567,7 +566,7 @@ public class TestIndexWriterDelete exten
// changed (transactional semantics):
IndexReader newReader = null;
try {
- newReader = IndexReader.open(dir, true);
+ newReader = IndexReader.open(dir);
}
catch (IOException e) {
e.printStackTrace();
@@ -612,7 +611,6 @@ public class TestIndexWriterDelete exten
+ result2 + " instead of expected " + START_COUNT + " or " + END_COUNT);
}
}
- searcher.close();
newReader.close();
if (result2 == END_COUNT) {
break;
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Thu Dec 15 05:11:14 2011
@@ -254,7 +254,7 @@ public class TestIndexWriterExceptions e
}
// Confirm that when doc hits exception partway through tokenization, it's deleted:
- IndexReader r2 = IndexReader.open(dir, true);
+ IndexReader r2 = IndexReader.open(dir);
final int count = r2.docFreq(new Term("content4", "aaa"));
final int count2 = r2.docFreq(new Term("content4", "ddd"));
assertEquals(count, count2);
@@ -300,7 +300,7 @@ public class TestIndexWriterExceptions e
}
// Confirm that when doc hits exception partway through tokenization, it's deleted:
- IndexReader r2 = IndexReader.open(dir, true);
+ IndexReader r2 = IndexReader.open(dir);
final int count = r2.docFreq(new Term("content4", "aaa"));
final int count2 = r2.docFreq(new Term("content4", "ddd"));
assertEquals(count, count2);
@@ -494,7 +494,7 @@ public class TestIndexWriterExceptions e
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
final Term t = new Term("content", "aa");
assertEquals(3, reader.docFreq(t));
@@ -576,7 +576,7 @@ public class TestIndexWriterExceptions e
}
assertTrue(hitError);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(198, reader.docFreq(new Term("content", "aa")));
reader.close();
dir.close();
@@ -631,7 +631,7 @@ public class TestIndexWriterExceptions e
if (VERBOSE) {
System.out.println("TEST: open reader");
}
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
if (i == 0) {
int expected = 5;
assertEquals(expected, reader.docFreq(new Term("contents", "here")));
@@ -660,7 +660,7 @@ public class TestIndexWriterExceptions e
writer.forceMerge(1);
writer.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
int expected = 19+(1-i)*2;
assertEquals(expected, reader.docFreq(new Term("contents", "here")));
assertEquals(expected, reader.maxDoc());
@@ -746,7 +746,7 @@ public class TestIndexWriterExceptions e
writer.close();
}
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
int expected = (3+(1-i)*2)*NUM_THREAD*NUM_ITER;
assertEquals("i=" + i, expected, reader.docFreq(new Term("contents", "here")));
assertEquals(expected, reader.maxDoc());
@@ -774,7 +774,7 @@ public class TestIndexWriterExceptions e
writer.forceMerge(1);
writer.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
expected += 17-NUM_THREAD*NUM_ITER;
assertEquals(expected, reader.docFreq(new Term("contents", "here")));
assertEquals(expected, reader.maxDoc());
@@ -845,7 +845,7 @@ public class TestIndexWriterExceptions e
failure.clearDoFail();
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(23, reader.numDocs());
reader.close();
dir.close();
@@ -1058,7 +1058,7 @@ public class TestIndexWriterExceptions e
IndexReader reader = null;
try {
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
} catch (IOException e) {
e.printStackTrace(System.out);
fail("segmentInfos failed to retry fallback to correct segments_N file");
@@ -1105,7 +1105,7 @@ public class TestIndexWriterExceptions e
IndexReader reader = null;
try {
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
fail("reader did not hit IOException on opening a corrupt index");
} catch (Exception e) {
}
@@ -1154,7 +1154,7 @@ public class TestIndexWriterExceptions e
IndexReader reader = null;
try {
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
fail("reader did not hit IOException on opening a corrupt index");
} catch (Exception e) {
}
@@ -1205,7 +1205,7 @@ public class TestIndexWriterExceptions e
IndexReader reader = null;
try {
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
} catch (Exception e) {
fail("reader failed to open on a crashed index");
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java Thu Dec 15 05:11:14 2011
@@ -186,7 +186,7 @@ public class TestIndexWriterForceMerge e
if (0 == pass) {
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals(1, reader.getSequentialSubReaders().length);
reader.close();
} else {
@@ -196,7 +196,7 @@ public class TestIndexWriterForceMerge e
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertTrue(reader.getSequentialSubReaders().length > 1);
reader.close();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java Thu Dec 15 05:11:14 2011
@@ -192,9 +192,14 @@ public class TestIndexWriterMergePolicy
}
writer.close();
- IndexReader reader = IndexReader.open(dir, false);
- reader.deleteDocuments(new Term("content", "aaa"));
- reader.close();
+ // delete some docs without merging
+ writer = new IndexWriter(
+ dir,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
+ setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES)
+ );
+ writer.deleteDocuments(new Term("content", "aaa"));
+ writer.close();
ldmp = new LogDocMergePolicy();
ldmp.setMergeFactor(5);
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Thu Dec 15 05:11:14 2011
@@ -78,7 +78,7 @@ public class TestIndexWriterMerging exte
private boolean verifyIndex(Directory directory, int startAt) throws IOException
{
boolean fail = false;
- IndexReader reader = IndexReader.open(directory, true);
+ IndexReader reader = IndexReader.open(directory);
int max = reader.maxDoc();
for (int i = 0; i < max; i++)
@@ -126,8 +126,6 @@ public class TestIndexWriterMerging exte
IndexWriterConfig.DISABLE_AUTO_FLUSH));
Document document = new Document();
- document = new Document();
-
FieldType customType = new FieldType();
customType.setStored(true);
@@ -137,19 +135,31 @@ public class TestIndexWriterMerging exte
customType1.setStoreTermVectorPositions(true);
customType1.setStoreTermVectorOffsets(true);
+ Field idField = newField("id", "", StringField.TYPE_UNSTORED);
+ document.add(idField);
Field storedField = newField("stored", "stored", customType);
document.add(storedField);
Field termVectorField = newField("termVector", "termVector", customType1);
document.add(termVectorField);
- for(int i=0;i<10;i++)
+ for(int i=0;i<10;i++) {
+ idField.setValue("" + i);
writer.addDocument(document);
+ }
writer.close();
- IndexReader ir = IndexReader.open(dir, false);
+ IndexReader ir = IndexReader.open(dir);
assertEquals(10, ir.maxDoc());
assertEquals(10, ir.numDocs());
- ir.deleteDocument(0);
- ir.deleteDocument(7);
+ ir.close();
+
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ .setMergePolicy(NoMergePolicy.COMPOUND_FILES);
+ writer = new IndexWriter(dir, dontMergeConfig);
+ writer.deleteDocuments(new Term("id", "0"));
+ writer.deleteDocuments(new Term("id", "7"));
+ writer.close();
+
+ ir = IndexReader.open(dir);
assertEquals(8, ir.numDocs());
ir.close();
@@ -159,7 +169,7 @@ public class TestIndexWriterMerging exte
writer.forceMergeDeletes();
assertEquals(8, writer.numDocs());
writer.close();
- ir = IndexReader.open(dir, true);
+ ir = IndexReader.open(dir);
assertEquals(8, ir.maxDoc());
assertEquals(8, ir.numDocs());
ir.close();
@@ -192,15 +202,28 @@ public class TestIndexWriterMerging exte
document.add(storedField);
Field termVectorField = newField("termVector", "termVector", customType1);
document.add(termVectorField);
- for(int i=0;i<98;i++)
+ Field idField = newField("id", "", StringField.TYPE_UNSTORED);
+ document.add(idField);
+ for(int i=0;i<98;i++) {
+ idField.setValue("" + i);
writer.addDocument(document);
+ }
writer.close();
- IndexReader ir = IndexReader.open(dir, false);
+ IndexReader ir = IndexReader.open(dir);
assertEquals(98, ir.maxDoc());
assertEquals(98, ir.numDocs());
- for(int i=0;i<98;i+=2)
- ir.deleteDocument(i);
+ ir.close();
+
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ .setMergePolicy(NoMergePolicy.COMPOUND_FILES);
+ writer = new IndexWriter(dir, dontMergeConfig);
+ for(int i=0;i<98;i+=2) {
+ writer.deleteDocuments(new Term("id", "" + i));
+ }
+ writer.close();
+
+ ir = IndexReader.open(dir);
assertEquals(49, ir.numDocs());
ir.close();
@@ -212,7 +235,7 @@ public class TestIndexWriterMerging exte
assertEquals(49, writer.numDocs());
writer.forceMergeDeletes();
writer.close();
- ir = IndexReader.open(dir, true);
+ ir = IndexReader.open(dir);
assertEquals(49, ir.maxDoc());
assertEquals(49, ir.numDocs());
ir.close();
@@ -245,15 +268,27 @@ public class TestIndexWriterMerging exte
document.add(storedField);
Field termVectorField = newField("termVector", "termVector", customType1);
document.add(termVectorField);
- for(int i=0;i<98;i++)
+ Field idField = newField("id", "", StringField.TYPE_UNSTORED);
+ document.add(idField);
+ for(int i=0;i<98;i++) {
+ idField.setValue("" + i);
writer.addDocument(document);
+ }
writer.close();
- IndexReader ir = IndexReader.open(dir, false);
+ IndexReader ir = IndexReader.open(dir);
assertEquals(98, ir.maxDoc());
assertEquals(98, ir.numDocs());
- for(int i=0;i<98;i+=2)
- ir.deleteDocument(i);
+ ir.close();
+
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ .setMergePolicy(NoMergePolicy.COMPOUND_FILES);
+ writer = new IndexWriter(dir, dontMergeConfig);
+ for(int i=0;i<98;i+=2) {
+ writer.deleteDocuments(new Term("id", "" + i));
+ }
+ writer.close();
+ ir = IndexReader.open(dir);
assertEquals(49, ir.numDocs());
ir.close();
@@ -264,7 +299,7 @@ public class TestIndexWriterMerging exte
);
writer.forceMergeDeletes(false);
writer.close();
- ir = IndexReader.open(dir, true);
+ ir = IndexReader.open(dir);
assertEquals(49, ir.maxDoc());
assertEquals(49, ir.numDocs());
ir.close();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java Thu Dec 15 05:11:14 2011
@@ -113,7 +113,7 @@ public class TestIndexWriterOnDiskFull e
assertNoUnreferencedFiles(dir, "after disk full during addDocument");
// Make sure reader can open the index:
- IndexReader.open(dir, true).close();
+ IndexReader.open(dir).close();
}
dir.close();
@@ -189,13 +189,12 @@ public class TestIndexWriterOnDiskFull e
// Make sure starting index seems to be working properly:
Term searchTerm = new Term("content", "aaa");
- IndexReader reader = IndexReader.open(startDir, true);
+ IndexReader reader = IndexReader.open(startDir);
assertEquals("first docFreq", 57, reader.docFreq(searchTerm));
IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("first number of hits", 57, hits.length);
- searcher.close();
reader.close();
// Iterate with larger and larger amounts of free
@@ -306,7 +305,7 @@ public class TestIndexWriterOnDiskFull e
} else if (1 == method) {
IndexReader readers[] = new IndexReader[dirs.length];
for(int i=0;i<dirs.length;i++) {
- readers[i] = IndexReader.open(dirs[i], true);
+ readers[i] = IndexReader.open(dirs[i]);
}
try {
writer.addIndexes(readers);
@@ -355,7 +354,7 @@ public class TestIndexWriterOnDiskFull e
// failed, we see either all docs or no docs added
// (transactional semantics):
try {
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
} catch (IOException e) {
e.printStackTrace(System.out);
fail(testName + ": exception when creating IndexReader: " + e);
@@ -395,7 +394,6 @@ public class TestIndexWriterOnDiskFull e
}
}
- searcher.close();
reader.close();
if (VERBOSE) {
System.out.println(" count is " + result);
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Thu Dec 15 05:11:14 2011
@@ -159,7 +159,7 @@ public class TestIndexWriterReader exten
writer.close();
assertTrue(r2.isCurrent());
- IndexReader r3 = IndexReader.open(dir1, true);
+ IndexReader r3 = IndexReader.open(dir1);
assertTrue(r3.isCurrent());
assertTrue(r2.isCurrent());
assertEquals(0, count(new Term("id", id10), r3));
@@ -384,7 +384,7 @@ public class TestIndexWriterReader exten
_TestUtil.checkIndex(mainDir);
- IndexReader reader = IndexReader.open(mainDir, true);
+ IndexReader reader = IndexReader.open(mainDir);
assertEquals(addDirThreads.count.intValue(), reader.numDocs());
//assertEquals(100 + numDirs * (3 * numIter / 4) * addDirThreads.numThreads
// * addDirThreads.NUM_INIT_DOCS, reader.numDocs());
@@ -420,7 +420,7 @@ public class TestIndexWriterReader exten
readers = new IndexReader[numDirs];
for (int i = 0; i < numDirs; i++)
- readers[i] = IndexReader.open(addDir, false);
+ readers[i] = IndexReader.open(addDir);
}
void joinThreads() {
@@ -695,7 +695,6 @@ public class TestIndexWriterReader exten
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
assertEquals(100, searcher.search(q, 10).totalHits);
- searcher.close();
try {
IndexReader.openIfChanged(r);
fail("failed to hit AlreadyClosedException");
@@ -761,7 +760,6 @@ public class TestIndexWriterReader exten
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
final int count = searcher.search(q, 10).totalHits;
- searcher.close();
assertTrue(count >= lastCount);
lastCount = count;
}
@@ -778,7 +776,6 @@ public class TestIndexWriterReader exten
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
final int count = searcher.search(q, 10).totalHits;
- searcher.close();
assertTrue(count >= lastCount);
assertEquals(0, excs.size());
@@ -850,7 +847,6 @@ public class TestIndexWriterReader exten
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
sum += searcher.search(q, 10).totalHits;
- searcher.close();
}
for(int i=0;i<numThreads;i++) {
@@ -865,7 +861,6 @@ public class TestIndexWriterReader exten
Query q = new TermQuery(new Term("indexname", "test"));
IndexSearcher searcher = newSearcher(r);
sum += searcher.search(q, 10).totalHits;
- searcher.close();
assertTrue("no documents found at all", sum > 0);
assertEquals(0, excs.size());
@@ -892,7 +887,7 @@ public class TestIndexWriterReader exten
w.forceMergeDeletes();
w.close();
r.close();
- r = IndexReader.open(dir, true);
+ r = IndexReader.open(dir);
assertEquals(1, r.numDocs());
assertFalse(r.hasDeletions());
r.close();
@@ -954,7 +949,6 @@ public class TestIndexWriterReader exten
TopDocs hits = s.search(new TermQuery(new Term("foo", "bar")), 10);
assertEquals(20, hits.totalHits);
didWarm.set(true);
- s.close();
}
}).
setMergePolicy(newLogMergePolicy(10))
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java Thu Dec 15 05:11:14 2011
@@ -260,7 +260,7 @@ public class TestIndexWriterUnicode exte
w.addDocument(doc);
w.close();
- IndexReader ir = IndexReader.open(dir, true);
+ IndexReader ir = IndexReader.open(dir);
Document doc2 = ir.document(0);
for(int i=0;i<count;i++) {
assertEquals("field " + i + " was not indexed correctly", 1, ir.docFreq(new Term("f"+i, utf8Data[2*i+1])));
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java Thu Dec 15 05:11:14 2011
@@ -209,7 +209,7 @@ public class TestIndexWriterWithThreads
}
// Quick test to make sure index is not corrupt:
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
DocsEnum tdocs = _TestUtil.docs(random, reader,
"field",
new BytesRef("aaa"),
@@ -276,7 +276,7 @@ public class TestIndexWriterWithThreads
}
if (success) {
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
final Bits delDocs = MultiFields.getLiveDocs(reader);
for(int j=0;j<reader.maxDoc();j++) {
if (delDocs == null || !delDocs.get(j)) {
@@ -447,7 +447,7 @@ public class TestIndexWriterWithThreads
assertFalse("Failed due to: " + thread1.failure, thread1.failed);
assertFalse("Failed due to: " + thread2.failure, thread2.failed);
// now verify that we have two documents in the index
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertEquals("IndexReader should have one document per thread running", 2,
reader.numDocs());
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexableField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexableField.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexableField.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexableField.java Thu Dec 15 05:11:14 2011
@@ -28,8 +28,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.NumericField.DataType;
import org.apache.lucene.document.NumericField;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.values.PerDocFieldValues;
-import org.apache.lucene.index.values.ValueType;
+import org.apache.lucene.index.DocValues;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
@@ -157,12 +156,12 @@ public class TestIndexableField extends
// TODO: randomly enable doc values
@Override
- public PerDocFieldValues docValues() {
+ public DocValue docValue() {
return null;
}
@Override
- public ValueType docValuesType() {
+ public DocValues.Type docValueType() {
return null;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java Thu Dec 15 05:11:14 2011
@@ -105,7 +105,7 @@ public class TestLazyProxSkipping extend
writer.forceMerge(1);
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(directory, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(directory));
this.searcher = newSearcher(reader);
}
@@ -138,9 +138,7 @@ public class TestLazyProxSkipping extend
// test whether only the minimum amount of seeks()
// are performed
performTest(5);
- searcher.close();
performTest(10);
- searcher.close();
}
public void testSeek() throws IOException {
@@ -153,7 +151,7 @@ public class TestLazyProxSkipping extend
}
writer.close();
- IndexReader reader = IndexReader.open(directory, true);
+ IndexReader reader = IndexReader.open(directory);
DocsAndPositionsEnum tp = MultiFields.getTermPositionsEnum(reader,
MultiFields.getLiveDocs(reader),
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestMultiReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestMultiReader.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestMultiReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestMultiReader.java Thu Dec 15 05:11:14 2011
@@ -38,8 +38,8 @@ public class TestMultiReader extends Tes
IndexReader reader;
sis.read(dir);
- SegmentReader reader1 = SegmentReader.get(false, sis.info(0), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
- SegmentReader reader2 = SegmentReader.get(false, sis.info(1), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ SegmentReader reader1 = SegmentReader.get(sis.info(0), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ SegmentReader reader2 = SegmentReader.get(sis.info(1), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
readers[0] = reader1;
readers[1] = reader2;
assertTrue(reader1 != null);
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java Thu Dec 15 05:11:14 2011
@@ -100,7 +100,6 @@ public class TestNRTThreads extends Thre
if (s != fixedSearcher) {
// Final searcher:
s.getIndexReader().close();
- s.close();
}
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNorms.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNorms.java Thu Dec 15 05:11:14 2011
@@ -39,213 +39,6 @@ import org.apache.lucene.util.LuceneTest
* separate norms, addDocument, addIndexes, forceMerge.
*/
public class TestNorms extends LuceneTestCase {
-
- private class SimilarityProviderOne extends DefaultSimilarityProvider {
- @Override
- public Similarity get(String field) {
- return new DefaultSimilarity() {
- @Override
- public byte computeNorm(FieldInvertState state) {
- // diable length norm
- return encodeNormValue(state.getBoost());
- }
- };
- }
- }
-
- private static final int NUM_FIELDS = 10;
-
- private SimilarityProvider similarityProviderOne;
- private Analyzer anlzr;
- private int numDocNorms;
- private ArrayList<Float> norms;
- private ArrayList<Float> modifiedNorms;
- private float lastNorm = 0;
- private float normDelta = (float) 0.001;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- similarityProviderOne = new SimilarityProviderOne();
- anlzr = new MockAnalyzer(random);
- }
-
- /**
- * Test that norms values are preserved as the index is maintained.
- * Including separate norms.
- * Including merging indexes with seprate norms.
- * Including forceMerge.
- */
- public void testNorms() throws IOException {
- Directory dir1 = newDirectory();
-
- norms = new ArrayList<Float>();
- modifiedNorms = new ArrayList<Float>();
-
- createIndex(random, dir1);
- doTestNorms(random, dir1);
-
- // test with a single index: index2
- ArrayList<Float> norms1 = norms;
- ArrayList<Float> modifiedNorms1 = modifiedNorms;
- int numDocNorms1 = numDocNorms;
-
- norms = new ArrayList<Float>();
- modifiedNorms = new ArrayList<Float>();
- numDocNorms = 0;
-
- Directory dir2 = newDirectory();
-
- createIndex(random, dir2);
- doTestNorms(random, dir2);
-
- // add index1 and index2 to a third index: index3
- Directory dir3 = newDirectory();
-
- createIndex(random, dir3);
- IndexWriter iw = new IndexWriter(
- dir3,
- newIndexWriterConfig(TEST_VERSION_CURRENT, anlzr).
- setOpenMode(OpenMode.APPEND).
- setMaxBufferedDocs(5).
- setMergePolicy(newLogMergePolicy(3))
- );
- iw.addIndexes(dir1,dir2);
- iw.forceMerge(1);
- iw.close();
-
- norms1.addAll(norms);
- norms = norms1;
- modifiedNorms1.addAll(modifiedNorms);
- modifiedNorms = modifiedNorms1;
- numDocNorms += numDocNorms1;
-
- // test with index3
- verifyIndex(dir3);
- doTestNorms(random, dir3);
-
- // now with single segment
- iw = new IndexWriter(
- dir3,
- newIndexWriterConfig(TEST_VERSION_CURRENT, anlzr).
- setOpenMode(OpenMode.APPEND).
- setMaxBufferedDocs(5).
- setMergePolicy(newLogMergePolicy(3))
- );
- iw.forceMerge(1);
- iw.close();
- verifyIndex(dir3);
-
- dir1.close();
- dir2.close();
- dir3.close();
- }
-
- private void doTestNorms(Random random, Directory dir) throws IOException {
- int num = atLeast(1);
- for (int i=0; i<num; i++) {
- addDocs(random, dir,12,true);
- verifyIndex(dir);
- modifyNormsForF1(dir);
- verifyIndex(dir);
- addDocs(random, dir,12,false);
- verifyIndex(dir);
- modifyNormsForF1(dir);
- verifyIndex(dir);
- }
- }
-
- private void createIndex(Random random, Directory dir) throws IOException {
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.CREATE)
- .setMaxBufferedDocs(5).setSimilarityProvider(similarityProviderOne).setMergePolicy(newLogMergePolicy()));
- LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
- lmp.setMergeFactor(3);
- lmp.setUseCompoundFile(true);
- iw.close();
- }
-
- private void modifyNormsForF1(Directory dir) throws IOException {
- IndexReader ir = IndexReader.open(dir, false);
- int n = ir.maxDoc();
- for (int i = 0; i < n; i+=3) { // modify for every third doc
- int k = (i*3) % modifiedNorms.size();
- float origNorm = modifiedNorms.get(i).floatValue();
- float newNorm = modifiedNorms.get(k).floatValue();
- //System.out.println("Modifying: for "+i+" from "+origNorm+" to "+newNorm);
- //System.out.println(" and: for "+k+" from "+newNorm+" to "+origNorm);
- modifiedNorms.set(i, Float.valueOf(newNorm));
- modifiedNorms.set(k, Float.valueOf(origNorm));
- DefaultSimilarity sim = new DefaultSimilarity();
- ir.setNorm(i, "f"+1, sim.encodeNormValue(newNorm));
- ir.setNorm(k, "f"+1, sim.encodeNormValue(origNorm));
- }
- ir.close();
- }
-
-
- private void verifyIndex(Directory dir) throws IOException {
- IndexReader ir = IndexReader.open(dir, false);
- for (int i = 0; i < NUM_FIELDS; i++) {
- String field = "f"+i;
- byte b[] = MultiNorms.norms(ir, field);
- assertEquals("number of norms mismatches",numDocNorms,b.length);
- ArrayList<Float> storedNorms = (i==1 ? modifiedNorms : norms);
- DefaultSimilarity sim = (DefaultSimilarity) similarityProviderOne.get(field);
- for (int j = 0; j < b.length; j++) {
- float norm = sim.decodeNormValue(b[j]);
- float norm1 = storedNorms.get(j).floatValue();
- assertEquals("stored norm value of "+field+" for doc "+j+" is "+norm+" - a mismatch!", norm, norm1, 0.000001);
- }
- }
- ir.close();
- }
-
- private void addDocs(Random random, Directory dir, int ndocs, boolean compound) throws IOException {
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.APPEND)
- .setMaxBufferedDocs(5).setSimilarityProvider(similarityProviderOne).setMergePolicy(newLogMergePolicy()));
- LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
- lmp.setMergeFactor(3);
- lmp.setUseCompoundFile(compound);
- for (int i = 0; i < ndocs; i++) {
- iw.addDocument(newDoc());
- }
- iw.close();
- }
-
- // create the next document
- private Document newDoc() {
- Document d = new Document();
- float boost = nextNorm("anyfield"); // in this test the same similarity is used for all fields so it does not matter what field is passed
- for (int i = 0; i < 10; i++) {
- Field f = newField("f"+i,"v"+i,TextField.TYPE_UNSTORED);
- f.setBoost(boost);
- d.add(f);
- }
- return d;
- }
-
- // return unique norm values that are unchanged by encoding/decoding
- private float nextNorm(String fname) {
- float norm = lastNorm + normDelta;
- DefaultSimilarity similarity = (DefaultSimilarity) similarityProviderOne.get(fname);
- do {
- float norm1 = similarity.decodeNormValue(similarity.encodeNormValue(norm));
- if (norm1 > lastNorm) {
- //System.out.println(norm1+" > "+lastNorm);
- norm = norm1;
- break;
- }
- norm += normDelta;
- } while (true);
- norms.add(numDocNorms, Float.valueOf(norm));
- modifiedNorms.add(numDocNorms, Float.valueOf(norm));
- //System.out.println("creating norm("+numDocNorms+"): "+norm);
- numDocNorms ++;
- lastNorm = (norm>10 ? 0 : norm); //there's a limit to how many distinct values can be stored in a ingle byte
- return norm;
- }
class CustomNormEncodingSimilarity extends DefaultSimilarity {
@Override
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java Thu Dec 15 05:11:14 2011
@@ -66,7 +66,7 @@ public class TestOmitNorms extends Lucen
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f1").omitNorms);
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f2").omitNorms);
@@ -120,7 +120,7 @@ public class TestOmitNorms extends Lucen
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f1").omitNorms);
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f2").omitNorms);
@@ -168,7 +168,7 @@ public class TestOmitNorms extends Lucen
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertTrue("OmitNorms field bit should not be set.", !fi.fieldInfo("f1").omitNorms);
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f2").omitNorms);
@@ -180,7 +180,8 @@ public class TestOmitNorms extends Lucen
private void assertNoNrm(Directory dir) throws Throwable {
final String[] files = dir.listAll();
for (int i = 0; i < files.length; i++) {
- assertFalse(files[i].endsWith(".nrm"));
+ // TODO: this relies upon filenames
+ assertFalse(files[i].endsWith(".nrm") || files[i].endsWith(".len"));
}
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitPositions.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitPositions.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitPositions.java Thu Dec 15 05:11:14 2011
@@ -153,7 +153,7 @@ public class TestOmitPositions extends L
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
// docs + docs = docs
assertEquals(IndexOptions.DOCS_ONLY, fi.fieldInfo("f1").indexOptions);
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitTf.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitTf.java Thu Dec 15 05:11:14 2011
@@ -100,7 +100,7 @@ public class TestOmitTf extends LuceneTe
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f1").indexOptions);
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f2").indexOptions);
@@ -152,7 +152,7 @@ public class TestOmitTf extends LuceneTe
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f1").indexOptions);
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f2").indexOptions);
@@ -195,7 +195,7 @@ public class TestOmitTf extends LuceneTe
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertEquals("OmitTermFreqAndPositions field bit should not be set.", IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, fi.fieldInfo("f1").indexOptions);
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f2").indexOptions);
@@ -400,8 +400,7 @@ public class TestOmitTf extends LuceneTe
}
});
assertEquals(15, CountingHitCollector.getCount());
-
- searcher.close();
+
reader.close();
dir.close();
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReader.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReader.java Thu Dec 15 05:11:14 2011
@@ -46,9 +46,7 @@ public class TestParallelReader extends
@Override
public void tearDown() throws Exception {
single.getIndexReader().close();
- single.close();
parallel.getIndexReader().close();
- parallel.close();
dir.close();
dir1.close();
dir2.close();
@@ -75,8 +73,8 @@ public class TestParallelReader extends
Directory dir1 = getDir1(random);
Directory dir2 = getDir2(random);
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- pr.add(IndexReader.open(dir2, false));
+ pr.add(IndexReader.open(dir1));
+ pr.add(IndexReader.open(dir2));
Collection<String> fieldNames = pr.getFieldNames(IndexReader.FieldOption.ALL);
assertEquals(4, fieldNames.size());
assertTrue(fieldNames.contains("f1"));
@@ -102,8 +100,8 @@ public class TestParallelReader extends
w2.close();
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- IndexReader ir = IndexReader.open(dir2, false);
+ pr.add(IndexReader.open(dir1));
+ IndexReader ir = IndexReader.open(dir2);
try {
pr.add(ir);
fail("didn't get exptected exception: indexes don't have same number of documents");
@@ -115,34 +113,6 @@ public class TestParallelReader extends
dir1.close();
dir2.close();
}
-
- public void testIsCurrent() throws IOException {
- Directory dir1 = getDir1(random);
- Directory dir2 = getDir2(random);
- ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- pr.add(IndexReader.open(dir2, false));
-
- assertTrue(pr.isCurrent());
- IndexReader modifier = IndexReader.open(dir1, false);
- DefaultSimilarity sim = new DefaultSimilarity();
- modifier.setNorm(0, "f1", sim.encodeNormValue(100f));
- modifier.close();
-
- // one of the two IndexReaders which ParallelReader is using
- // is not current anymore
- assertFalse(pr.isCurrent());
-
- modifier = IndexReader.open(dir2, false);
- modifier.setNorm(0, "f3", sim.encodeNormValue(100f));
- modifier.close();
-
- // now both are not current anymore
- assertFalse(pr.isCurrent());
- pr.close();
- dir1.close();
- dir2.close();
- }
private void queryTest(Query query) throws IOException {
ScoreDoc[] parallelHits = parallel.search(query, null, 1000).scoreDocs;
@@ -177,7 +147,7 @@ public class TestParallelReader extends
w.addDocument(d2);
w.close();
- IndexReader ir = IndexReader.open(dir, false);
+ IndexReader ir = IndexReader.open(dir);
return newSearcher(ir);
}
@@ -186,8 +156,8 @@ public class TestParallelReader extends
dir1 = getDir1(random);
dir2 = getDir2(random);
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- pr.add(IndexReader.open(dir2, false));
+ pr.add(IndexReader.open(dir1));
+ pr.add(IndexReader.open(dir2));
return newSearcher(pr);
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java Thu Dec 15 05:11:14 2011
@@ -24,6 +24,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -52,8 +53,8 @@ public class TestParallelReaderEmptyInde
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(rd1,true));
- pr.add(IndexReader.open(rd2,true));
+ pr.add(IndexReader.open(rd1));
+ pr.add(IndexReader.open(rd2));
// When unpatched, Lucene crashes here with a NoSuchElementException (caused by ParallelTermEnum)
iwOut.addIndexes(pr);
@@ -75,16 +76,27 @@ public class TestParallelReaderEmptyInde
{
IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
+ Field idField = newField("id", "", TextField.TYPE_UNSTORED);
+ doc.add(idField);
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
doc.add(newField("test", "", customType));
+ idField.setValue("1");
iw.addDocument(doc);
doc.add(newField("test", "", TextField.TYPE_UNSTORED));
+ idField.setValue("2");
iw.addDocument(doc);
iw.close();
- IndexReader ir = IndexReader.open(rd1,false);
- ir.deleteDocument(0);
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ .setMergePolicy(NoMergePolicy.COMPOUND_FILES);
+ IndexWriter writer = new IndexWriter(rd1, dontMergeConfig);
+
+ writer.deleteDocuments(new Term("id", "1"));
+ writer.close();
+ IndexReader ir = IndexReader.open(rd1);
+ assertEquals(2, ir.maxDoc());
+ assertEquals(1, ir.numDocs());
ir.close();
iw = new IndexWriter(rd1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND));
@@ -104,8 +116,8 @@ public class TestParallelReaderEmptyInde
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(rd1,true));
- pr.add(IndexReader.open(rd2,true));
+ pr.add(IndexReader.open(rd1));
+ pr.add(IndexReader.open(rd2));
// When unpatched, Lucene crashes here with an ArrayIndexOutOfBoundsException (caused by TermVectorsWriter)
iwOut.addIndexes(pr);
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java Thu Dec 15 05:11:14 2011
@@ -58,8 +58,8 @@ public class TestParallelTermEnum extend
iw2.close();
- this.ir1 = IndexReader.open(rd1, true);
- this.ir2 = IndexReader.open(rd2, true);
+ this.ir1 = IndexReader.open(rd1);
+ this.ir2 = IndexReader.open(rd2);
}
@Override
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestPayloads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestPayloads.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestPayloads.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestPayloads.java Thu Dec 15 05:11:14 2011
@@ -111,7 +111,7 @@ public class TestPayloads extends Lucene
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertFalse("Payload field bit should not be set.", fi.fieldInfo("f1").storePayloads);
assertTrue("Payload field bit should be set.", fi.fieldInfo("f2").storePayloads);
@@ -138,7 +138,7 @@ public class TestPayloads extends Lucene
// flush
writer.close();
- reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ reader = getOnlySegmentReader(IndexReader.open(ram));
fi = reader.fieldInfos();
assertFalse("Payload field bit should not be set.", fi.fieldInfo("f1").storePayloads);
assertTrue("Payload field bit should be set.", fi.fieldInfo("f2").storePayloads);
@@ -213,7 +213,7 @@ public class TestPayloads extends Lucene
* Verify the index
* first we test if all payloads are stored correctly
*/
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
byte[] verifyPayloadData = new byte[payloadDataLength];
offset = 0;
@@ -326,7 +326,7 @@ public class TestPayloads extends Lucene
// flush
writer.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
tp = MultiFields.getTermPositionsEnum(reader,
MultiFields.getLiveDocs(reader),
fieldName,
@@ -526,7 +526,7 @@ public class TestPayloads extends Lucene
ingesters[i].join();
}
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
TermsEnum terms = MultiFields.getFields(reader).terms(field).iterator(null);
Bits liveDocs = MultiFields.getLiveDocs(reader);
DocsAndPositionsEnum tp = null;
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java Thu Dec 15 05:11:14 2011
@@ -61,7 +61,6 @@ public class TestReaderClosed extends Lu
public void test() throws Exception {
TermRangeQuery query = TermRangeQuery.newStringRange("field", "a", "z", true, true);
searcher.search(query, 5);
- searcher.close();
reader.close();
try {
searcher.search(query, 5);
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollback.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollback.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollback.java Thu Dec 15 05:11:14 2011
@@ -48,7 +48,7 @@ public class TestRollback extends Lucene
}
w.rollback();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
assertEquals("index should contain same number of docs post rollback", 5, r.numDocs());
r.close();
dir.close();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java Thu Dec 15 05:11:14 2011
@@ -54,8 +54,8 @@ public class TestSegmentMerger extends L
SegmentInfo info1 = DocHelper.writeDoc(random, merge1Dir, doc1);
DocHelper.setupDoc(doc2);
SegmentInfo info2 = DocHelper.writeDoc(random, merge2Dir, doc2);
- reader1 = SegmentReader.get(true, info1, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
- reader2 = SegmentReader.get(true, info2, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ reader1 = SegmentReader.get(info1, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ reader2 = SegmentReader.get(info2, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
}
@Override
@@ -86,7 +86,7 @@ public class TestSegmentMerger extends L
assertTrue(docsMerged == 2);
final FieldInfos fieldInfos = mergeState.fieldInfos;
//Should be able to open a new SegmentReader against the new directory
- SegmentReader mergedReader = SegmentReader.get(false, mergedDir, new SegmentInfo(mergedSegment, docsMerged, mergedDir, false,
+ SegmentReader mergedReader = SegmentReader.getRW(new SegmentInfo(mergedSegment, docsMerged, mergedDir, false,
codec, fieldInfos),
true, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
assertTrue(mergedReader != null);
@@ -158,27 +158,6 @@ public class TestSegmentMerger extends L
}
assertFalse("should not have been able to create a .cfs with .del and .s* files", doFail);
- // Create an index w/ .s*
- w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE));
- doc = new Document();
- doc.add(new TextField("c", "test"));
- w.addDocument(doc);
- w.close();
- IndexReader r = IndexReader.open(dir, false);
- r.setNorm(0, "c", (byte) 1);
- r.close();
-
- // Assert that SM fails if .s* exists
- SegmentInfos sis = new SegmentInfos();
- sis.read(dir);
- try {
- IndexWriter.createCompoundFile(dir, "b2", MergeState.CheckAbort.NONE, sis.info(0), newIOContext(random));
- doFail = true; // should never get here
- } catch (AssertionError e) {
- // expected
- }
- assertFalse("should not have been able to create a .cfs with .del and .s* files", doFail);
-
dir.close();
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java Thu Dec 15 05:11:14 2011
@@ -41,7 +41,7 @@ public class TestSegmentReader extends L
dir = newDirectory();
DocHelper.setupDoc(testDoc);
SegmentInfo info = DocHelper.writeDoc(random, dir, testDoc);
- reader = SegmentReader.get(true, info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, IOContext.READ);
+ reader = SegmentReader.get(info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, IOContext.READ);
}
@Override
@@ -77,15 +77,45 @@ public class TestSegmentReader extends L
Document docToDelete = new Document();
DocHelper.setupDoc(docToDelete);
SegmentInfo info = DocHelper.writeDoc(random, dir, docToDelete);
- SegmentReader deleteReader = SegmentReader.get(false, info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
- assertTrue(deleteReader != null);
- assertTrue(deleteReader.numDocs() == 1);
+ SegmentReader deleteReader = SegmentReader.getRW(info, true, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ assertNotNull(deleteReader);
+ assertEquals(1, deleteReader.numDocs());
+ final Object combKey = deleteReader.getCombinedCoreAndDeletesKey();
+ final Object coreKey = deleteReader.getCoreCacheKey();
+ assertNotNull(combKey);
+ assertNotNull(coreKey);
+ assertNotSame(combKey, coreKey);
+
+ SegmentReader clone1 = (SegmentReader) deleteReader.clone();
+ assertSame(coreKey, clone1.getCoreCacheKey());
+ assertSame(combKey, clone1.getCombinedCoreAndDeletesKey());
+
deleteReader.deleteDocument(0);
+ final Object newCombKey = deleteReader.getCombinedCoreAndDeletesKey();
+ assertNotNull(newCombKey);
+ assertNotSame(combKey, newCombKey);
+ assertSame(coreKey, deleteReader.getCoreCacheKey());
assertFalse(deleteReader.getLiveDocs().get(0));
- assertTrue(deleteReader.hasDeletions() == true);
+ assertTrue(deleteReader.hasDeletions());
assertTrue(deleteReader.numDocs() == 0);
+
+ SegmentReader clone2 = (SegmentReader) deleteReader.clone();
+ assertSame(coreKey, clone2.getCoreCacheKey());
+ assertSame(newCombKey, clone2.getCombinedCoreAndDeletesKey());
+ assertFalse(clone2.getLiveDocs().get(0));
+ assertTrue(clone2.hasDeletions());
+ assertEquals(0, clone2.numDocs());
+ clone2.close();
+
+ assertSame(coreKey, clone1.getCoreCacheKey());
+ assertSame(combKey, clone1.getCombinedCoreAndDeletesKey());
+ assertNull(clone1.getLiveDocs());
+ assertFalse(clone1.hasDeletions());
+ assertEquals(1, clone2.numDocs());
+ clone1.close();
+
deleteReader.close();
- }
+ }
public void testGetFieldNameVariations() {
Collection<String> result = reader.getFieldNames(IndexReader.FieldOption.ALL);
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Thu Dec 15 05:11:14 2011
@@ -56,7 +56,7 @@ public class TestSegmentTermDocs extends
public void testTermDocs(int indexDivisor) throws IOException {
//After adding the document, we should be able to read it back in
- SegmentReader reader = SegmentReader.get(true, info, indexDivisor, newIOContext(random));
+ SegmentReader reader = SegmentReader.get(info, indexDivisor, newIOContext(random));
assertTrue(reader != null);
assertEquals(indexDivisor, reader.getTermInfosIndexDivisor());
@@ -79,7 +79,7 @@ public class TestSegmentTermDocs extends
public void testBadSeek(int indexDivisor) throws IOException {
{
//After adding the document, we should be able to read it back in
- SegmentReader reader = SegmentReader.get(true, info, indexDivisor, newIOContext(random));
+ SegmentReader reader = SegmentReader.get(info, indexDivisor, newIOContext(random));
assertTrue(reader != null);
DocsEnum termDocs = _TestUtil.docs(random, reader,
"textField2",
@@ -93,7 +93,7 @@ public class TestSegmentTermDocs extends
}
{
//After adding the document, we should be able to read it back in
- SegmentReader reader = SegmentReader.get(true, info, indexDivisor, newIOContext(random));
+ SegmentReader reader = SegmentReader.get(info, indexDivisor, newIOContext(random));
assertTrue(reader != null);
DocsEnum termDocs = _TestUtil.docs(random, reader,
"junk",
@@ -130,7 +130,7 @@ public class TestSegmentTermDocs extends
writer.forceMerge(1);
writer.close();
- IndexReader reader = IndexReader.open(dir, null, true, indexDivisor);
+ IndexReader reader = IndexReader.open(dir, indexDivisor);
DocsEnum tdocs = _TestUtil.docs(random, reader,
ta.field(),
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Thu Dec 15 05:11:14 2011
@@ -78,7 +78,7 @@ public class TestSegmentTermEnum extends
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene40PostingsFormat())));
addDoc(writer, "aaa bbb");
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(dir, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(dir));
TermsEnum terms = reader.fields().terms("content").iterator(null);
assertNotNull(terms.next());
assertEquals("aaa", terms.term().utf8ToString());
@@ -102,7 +102,7 @@ public class TestSegmentTermEnum extends
private void verifyDocFreq()
throws IOException
{
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
TermsEnum termEnum = MultiFields.getTerms(reader, "content").iterator(null);
// create enumeration of all terms
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java Thu Dec 15 05:11:14 2011
@@ -20,6 +20,8 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
@@ -27,8 +29,15 @@ import org.apache.lucene.util.LuceneTest
public class TestSizeBoundedForceMerge extends LuceneTestCase {
private void addDocs(IndexWriter writer, int numDocs) throws IOException {
+ addDocs(writer, numDocs, false);
+ }
+
+ private void addDocs(IndexWriter writer, int numDocs, boolean withID) throws IOException {
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
+ if (withID) {
+ doc.add(new Field("id", "" + i, StringField.TYPE_UNSTORED));
+ }
writer.addDocument(doc);
}
writer.commit();
@@ -286,12 +295,9 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 5);
addDocs(writer, 3);
- writer.close();
-
// delete the last document, so that the last segment is merged.
- IndexReader r = IndexReader.open(dir, false);
- r.deleteDocument(r.numDocs() - 1);
- r.close();
+ writer.deleteDocuments(new Term("id", "10"));
+ writer.close();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -315,7 +321,7 @@ public class TestSizeBoundedForceMerge e
IndexWriterConfig conf = newWriterConfig();
IndexWriter writer = new IndexWriter(dir, conf);
- addDocs(writer, 3);
+ addDocs(writer, 3, true);
writer.close();
@@ -340,14 +346,12 @@ public class TestSizeBoundedForceMerge e
IndexWriterConfig conf = newWriterConfig();
IndexWriter writer = new IndexWriter(dir, conf);
- addDocs(writer, 5);
+ addDocs(writer, 5, true);
- writer.close();
-
// delete the last document
- IndexReader r = IndexReader.open(dir, false);
- r.deleteDocument(r.numDocs() - 1);
- r.close();
+
+ writer.deleteDocuments(new Term("id", "4"));
+ writer.close();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java Thu Dec 15 05:11:14 2011
@@ -54,7 +54,7 @@ public class TestSnapshotDeletionPolicy
}
protected void checkMaxDoc(IndexCommit commit, int expectedMaxDoc) throws Exception {
- IndexReader reader = IndexReader.open(commit, true);
+ IndexReader reader = IndexReader.open(commit);
try {
assertEquals(expectedMaxDoc, reader.maxDoc());
} finally {
@@ -245,7 +245,7 @@ public class TestSnapshotDeletionPolicy
assertSnapshotExists(dir, sdp, numSnapshots);
// open a reader on a snapshot - should succeed.
- IndexReader.open(sdp.getSnapshot("snapshot0"), true).close();
+ IndexReader.open(sdp.getSnapshot("snapshot0")).close();
// open a new IndexWriter w/ no snapshots to keep and assert that all snapshots are gone.
sdp = getDeletionPolicy();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java Thu Dec 15 05:11:14 2011
@@ -103,9 +103,8 @@ public class TestStressIndexing extends
@Override
public void doWork() throws Throwable {
for (int i=0; i<100; i++) {
- IndexReader ir = IndexReader.open(directory, true);
+ IndexReader ir = IndexReader.open(directory);
IndexSearcher is = new IndexSearcher(ir);
- is.close();
ir.close();
}
count += 100;
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Thu Dec 15 05:11:14 2011
@@ -272,8 +272,8 @@ public class TestStressIndexing2 extends
}
public static void verifyEquals(Directory dir1, Directory dir2, String idField) throws Throwable {
- IndexReader r1 = IndexReader.open(dir1, true);
- IndexReader r2 = IndexReader.open(dir2, true);
+ IndexReader r1 = IndexReader.open(dir1);
+ IndexReader r2 = IndexReader.open(dir2);
verifyEquals(r1, r2, idField);
r1.close();
r2.close();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java Thu Dec 15 05:11:14 2011
@@ -17,9 +17,9 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -38,11 +38,14 @@ public class TestSumDocFreq extends Luce
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
+ Field id = newField("id", "", StringField.TYPE_UNSTORED);
Field field1 = newField("foo", "", TextField.TYPE_UNSTORED);
Field field2 = newField("bar", "", TextField.TYPE_UNSTORED);
+ doc.add(id);
doc.add(field1);
doc.add(field2);
for (int i = 0; i < numDocs; i++) {
+ id.setValue("" + i);
char ch1 = (char) _TestUtil.nextInt(random, 'a', 'z');
char ch2 = (char) _TestUtil.nextInt(random, 'a', 'z');
field1.setValue("" + ch1 + " " + ch2);
@@ -53,26 +56,20 @@ public class TestSumDocFreq extends Luce
}
IndexReader ir = writer.getReader();
- writer.close();
assertSumDocFreq(ir);
ir.close();
- ir = IndexReader.open(dir, false);
int numDeletions = atLeast(20);
for (int i = 0; i < numDeletions; i++) {
- ir.deleteDocument(random.nextInt(ir.maxDoc()));
+ writer.deleteDocuments(new Term("id", "" + random.nextInt(numDocs)));
}
- ir.close();
-
- IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- w.forceMerge(1);
- w.close();
+ writer.forceMerge(1);
+ writer.close();
- ir = IndexReader.open(dir, true);
+ ir = IndexReader.open(dir);
assertSumDocFreq(ir);
ir.close();
-
dir.close();
}