You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/08/27 10:56:36 UTC
svn commit: r1620820 - in /lucene/dev/branches/lucene5904/lucene/core/src:
java/org/apache/lucene/index/IndexFileDeleter.java
test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java
test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java
Author: mikemccand
Date: Wed Aug 27 08:56:35 2014
New Revision: 1620820
URL: http://svn.apache.org/r1620820
Log:
LUCENE-5904: fix some false false
Modified:
lucene/dev/branches/lucene5904/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java
lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java
Modified: lucene/dev/branches/lucene5904/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java?rev=1620820&r1=1620819&r2=1620820&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java (original)
+++ lucene/dev/branches/lucene5904/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java Wed Aug 27 08:56:35 2014
@@ -281,7 +281,7 @@ final class IndexFileDeleter implements
Map<String,Long> maxPerSegmentGen = new HashMap<>();
for(String fileName : files) {
- if (fileName.equals(IndexFileNames.SEGMENTS_GEN)) {
+ if (fileName.equals(IndexFileNames.SEGMENTS_GEN) || fileName.equals(IndexWriter.WRITE_LOCK_NAME)) {
// do nothing
} else if (fileName.startsWith(IndexFileNames.SEGMENTS)) {
try {
@@ -291,7 +291,7 @@ final class IndexFileDeleter implements
}
} else {
String segmentName = IndexFileNames.parseSegmentName(fileName);
- assert segmentName.startsWith("_");
+ assert segmentName.startsWith("_"): "wtf? file=" + fileName;
maxSegmentName = Math.max(maxSegmentName, Integer.parseInt(segmentName.substring(1), Character.MAX_RADIX));
Modified: lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java?rev=1620820&r1=1620819&r2=1620820&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java (original)
+++ lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java Wed Aug 27 08:56:35 2014
@@ -28,6 +28,7 @@ import org.apache.lucene.document.Numeri
import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -38,6 +39,10 @@ import org.apache.lucene.util.TestUtil;
public class TestAllFilesHaveChecksumFooter extends LuceneTestCase {
public void test() throws Exception {
Directory dir = newDirectory();
+ if (dir instanceof MockDirectoryWrapper) {
+ // Else we might remove .cfe but not the corresponding .cfs, causing false exc when trying to verify headers:
+ ((MockDirectoryWrapper) dir).setEnableVirusScanner(false);
+ }
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
conf.setCodec(new Lucene410Codec());
RandomIndexWriter riw = new RandomIndexWriter(random(), dir, conf);
Modified: lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java?rev=1620820&r1=1620819&r2=1620820&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java (original)
+++ lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java Wed Aug 27 08:56:35 2014
@@ -28,6 +28,7 @@ import org.apache.lucene.document.Numeri
import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -38,6 +39,12 @@ import org.apache.lucene.util.TestUtil;
public class TestAllFilesHaveCodecHeader extends LuceneTestCase {
public void test() throws Exception {
Directory dir = newDirectory();
+
+ if (dir instanceof MockDirectoryWrapper) {
+ // Else we might remove .cfe but not the corresponding .cfs, causing false exc when trying to verify headers:
+ ((MockDirectoryWrapper) dir).setEnableVirusScanner(false);
+ }
+
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
conf.setCodec(new Lucene410Codec());
RandomIndexWriter riw = new RandomIndexWriter(random(), dir, conf);