You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2011/05/25 20:02:10 UTC
svn commit: r1127602 - in /lucene/dev/trunk/lucene/src:
java/org/apache/lucene/index/SegmentMerger.java
test/org/apache/lucene/index/TestSegmentMerger.java
Author: shaie
Date: Wed May 25 18:02:10 2011
New Revision: 1127602
URL: http://svn.apache.org/viewvc?rev=1127602&view=rev
Log:
LUCENE-3143: SegmentMerger should assert delet and separate norms file are not passed to createCompoundFile
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1127602&r1=1127601&r2=1127602&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Wed May 25 18:02:10 2011
@@ -120,6 +120,12 @@ final class SegmentMerger {
return mergedDocs;
}
+ /**
+ * NOTE: this method creates a compound file for all files returned by
+ * info.files(). While, generally, this may include separate norms and
+ * deletion files, this SegmentInfo must not reference such files when this
+ * method is called, because they are not allowed within a compound file.
+ */
final Collection<String> createCompoundFile(String fileName, final SegmentInfo info)
throws IOException {
@@ -127,6 +133,10 @@ final class SegmentMerger {
Collection<String> files = info.files();
CompoundFileWriter cfsWriter = new CompoundFileWriter(directory, fileName, checkAbort);
for (String file : files) {
+ assert !IndexFileNames.matchesExtension(file, IndexFileNames.DELETES_EXTENSION)
+ : ".del file is not allowed in .cfs: " + file;
+ assert !file.substring(file.lastIndexOf('.') + 1).startsWith(IndexFileNames.SEPARATE_NORMS_EXTENSION)
+ : "separate norms file (.s*) is not allowed in .cfs: " + file;
cfsWriter.addFile(file);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1127602&r1=1127601&r2=1127602&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java Wed May 25 18:02:10 2011
@@ -20,7 +20,13 @@ package org.apache.lucene.index;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.store.BufferedIndexInput;
import org.apache.lucene.store.Directory;
+import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.util.BytesRef;
@@ -127,4 +133,50 @@ public class TestSegmentMerger extends L
TestSegmentReader.checkNorms(mergedReader);
mergedReader.close();
}
+
+ // LUCENE-3143
+ public void testInvalidFilesToCreateCompound() throws Exception {
+ Directory dir = newDirectory();
+ IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ IndexWriter w = new IndexWriter(dir, iwc);
+
+ // Create an index w/ .del file
+ w.addDocument(new Document());
+ Document doc = new Document();
+ doc.add(new Field("c", "test", Store.NO, Index.ANALYZED));
+ w.addDocument(doc);
+ w.commit();
+ w.deleteDocuments(new Term("c", "test"));
+ w.close();
+
+ // Assert that SM fails if .del exists
+ SegmentMerger sm = new SegmentMerger(dir, 1, "a", null, null, null);
+ try {
+ sm.createCompoundFile("b1", w.segmentInfos.info(0));
+ fail("should not have been able to create a .cfs with .del and .s* files");
+ } catch (AssertionError e) {
+ // expected
+ }
+
+ // 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 Field("c", "test", Store.NO, Index.ANALYZED));
+ 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
+ try {
+ sm.createCompoundFile("b2", w.segmentInfos.info(0));
+ fail("should not have been able to create a .cfs with .del and .s* files");
+ } catch (AssertionError e) {
+ // expected
+ }
+
+ dir.close();
+ }
+
}