You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/02/01 00:52:48 UTC
svn commit: r1065866 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/analyzers/common/src/java/
lucene/contrib/queries/src/test/org/apache/lucene/search/regex/
lucene/src/test/org/apache/lucene/index/
lucene/src/test/org/apache/lucene/st...
Author: rmuir
Date: Mon Jan 31 23:52:48 2011
New Revision: 1065866
URL: http://svn.apache.org/viewvc?rev=1065866&view=rev
Log:
LUCENE-2902: tests should run checkIndex on indexes they create
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java?rev=1065866&r1=1065865&r2=1065866&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java Mon Jan 31 23:52:48 2011
@@ -110,8 +110,6 @@ public class TestSpanRegexQuery extends
// So it's using term: a1 b1 to search on the second IndexSearcher
// As a result, it won't match the document in the second IndexSearcher
assertEquals(2, numHits);
- indexStoreA.close();
- indexStoreB.close();
}
/** remove in lucene 4.0 */
@@ -171,8 +169,6 @@ public class TestSpanRegexQuery extends
// So it's using term: a1 b1 to search on the second IndexSearcher
// As a result, it won't match the document in the second IndexSearcher
assertEquals(2, numHits);
- indexStoreA.close();
- indexStoreB.close();
}
private void createRAMDirectories() throws CorruptIndexException,
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1065866&r1=1065865&r2=1065866&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Mon Jan 31 23:52:48 2011
@@ -972,7 +972,8 @@ public class TestIndexWriterExceptions e
// latest segments file and make sure we get an
// IOException trying to open the index:
public void testSimulatedCorruptIndex1() throws IOException {
- Directory dir = newDirectory();
+ MockDirectoryWrapper dir = newDirectory();
+ dir.setCheckIndexOnClose(false); // we are corrupting it!
IndexWriter writer = null;
@@ -1019,8 +1020,8 @@ public class TestIndexWriterExceptions e
// files and make sure we get an IOException trying to
// open the index:
public void testSimulatedCorruptIndex2() throws IOException {
- Directory dir = newDirectory();
-
+ MockDirectoryWrapper dir = newDirectory();
+ dir.setCheckIndexOnClose(false); // we are corrupting it!
IndexWriter writer = null;
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=1065866&r1=1065865&r2=1065866&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Mon Jan 31 23:52:48 2011
@@ -63,7 +63,6 @@ public class TestIndexWriterMerging exte
writer.close();
fail = verifyIndex(merged, 0);
- merged.close();
assertFalse("The merged index is invalid", fail);
indexA.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=1065866&r1=1065865&r2=1065866&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Mon Jan 31 23:52:48 2011
@@ -85,7 +85,6 @@ public class TestSegmentTermEnum extends
assertFalse(termEnum.next());
assertEquals("bbb", termEnum.prev().text());
reader.close();
- dir.close();
}
private void verifyDocFreq()
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1065866&r1=1065865&r2=1065866&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java Mon Jan 31 23:52:48 2011
@@ -31,7 +31,9 @@ import java.util.Map;
import java.util.Random;
import java.util.Set;
+import org.apache.lucene.index.IndexReader;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util._TestUtil;
/**
* This is a Directory Wrapper that adds methods
@@ -48,6 +50,7 @@ public class MockDirectoryWrapper extend
Random randomState;
boolean noDeleteOpenFile = true;
boolean preventDoubleWrite = true;
+ boolean checkIndexOnClose = true;
boolean trackDiskUsage = false;
private Set<String> unSyncedFiles;
private Set<String> createdFiles;
@@ -217,6 +220,17 @@ public class MockDirectoryWrapper extend
}
/**
+ * Set whether or not checkindex should be run
+ * on close
+ */
+ public void setCheckIndexOnClose(boolean value) {
+ this.checkIndexOnClose = value;
+ }
+
+ public boolean getCheckIndexOnClose() {
+ return checkIndexOnClose;
+ }
+ /**
* If 0.0, no exceptions will be thrown. Else this should
* be a double 0.0 - 1.0. We will randomly throw an
* IOException on the first write to an OutputStream based
@@ -404,6 +418,9 @@ public class MockDirectoryWrapper extend
throw new RuntimeException("MockDirectoryWrapper: cannot close: there are still open files: " + openFiles, cause);
}
open = false;
+ if (checkIndexOnClose && IndexReader.indexExists(this)) {
+ _TestUtil.checkIndex(this);
+ }
delegate.close();
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java?rev=1065866&r1=1065865&r2=1065866&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java Mon Jan 31 23:52:48 2011
@@ -40,8 +40,10 @@ public class TestFileSwitchDirectory ext
fileExtensions.add(IndexFileNames.FIELDS_EXTENSION);
fileExtensions.add(IndexFileNames.FIELDS_INDEX_EXTENSION);
- Directory primaryDir = new MockDirectoryWrapper(random, new RAMDirectory());
- Directory secondaryDir = new MockDirectoryWrapper(random, new RAMDirectory());
+ MockDirectoryWrapper primaryDir = new MockDirectoryWrapper(random, new RAMDirectory());
+ primaryDir.setCheckIndexOnClose(false); // only part of an index
+ MockDirectoryWrapper secondaryDir = new MockDirectoryWrapper(random, new RAMDirectory());
+ secondaryDir.setCheckIndexOnClose(false); // only part of an index
FileSwitchDirectory fsd = new FileSwitchDirectory(fileExtensions, primaryDir, secondaryDir, true);
IndexWriter writer = new IndexWriter(fsd, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));