Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix over-copying of CFX files during addIndexes(Directory[]) 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1340521 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2012-05-19 17:24:36 +00:00
parent a0493e5570
commit 419a026c06
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
View File

@ -2159,6 +2159,8 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
sis.read(dir); sis.read(dir);
final Set<String> dsFilesCopied = new HashSet<String>(); final Set<String> dsFilesCopied = new HashSet<String>();
final Map<String, String> dsNames = new HashMap<String, String>(); final Map<String, String> dsNames = new HashMap<String, String>();
final Set<String> copiedFiles = new HashSet<String>();
for (SegmentInfo info : sis) { for (SegmentInfo info : sis) {
assert !infos.contains(info): "dup info dir=" + info.dir + " name=" + info.name; assert !infos.contains(info): "dup info dir=" + info.dir + " name=" + info.name;
@ -2171,7 +2173,7 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
IOContext context = new IOContext(new MergeInfo(info.docCount, info.sizeInBytes(), true, -1)); IOContext context = new IOContext(new MergeInfo(info.docCount, info.sizeInBytes(), true, -1));
copySegmentAsIs(info, newSegName, dsNames, dsFilesCopied, context); copySegmentAsIs(info, newSegName, dsNames, dsFilesCopied, context, copiedFiles);
infos.add(info); infos.add(info);
} }
@ -2282,7 +2284,8 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
/** Copies the segment files as-is into the IndexWriter's directory. */ /** Copies the segment files as-is into the IndexWriter's directory. */
private void copySegmentAsIs(SegmentInfo info, String segName, private void copySegmentAsIs(SegmentInfo info, String segName,
Map<String, String> dsNames, Set<String> dsFilesCopied, IOContext context) Map<String, String> dsNames, Set<String> dsFilesCopied, IOContext context,
Set<String> copiedFiles)
throws IOException { throws IOException {
// Determine if the doc store of this segment needs to be copied. It's // Determine if the doc store of this segment needs to be copied. It's
// only relevant for segments that share doc store with others, // only relevant for segments that share doc store with others,
@ -2301,8 +2304,8 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
Set<String> codecDocStoreFiles = new HashSet<String>(); Set<String> codecDocStoreFiles = new HashSet<String>();
if (info.getDocStoreOffset() != -1) { if (info.getDocStoreOffset() != -1) {
// only violate the codec this way if its preflex // only violate the codec this way if its preflex
codec.storedFieldsFormat().files(info, codecDocStoreFiles); info.getCodec().storedFieldsFormat().files(info, codecDocStoreFiles);
codec.termVectorsFormat().files(info, codecDocStoreFiles); info.getCodec().termVectorsFormat().files(info, codecDocStoreFiles);
} }
// Copy the segment files // Copy the segment files
@ -2319,6 +2322,8 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
} }
assert !directory.fileExists(newFileName): "file \"" + newFileName + "\" already exists"; assert !directory.fileExists(newFileName): "file \"" + newFileName + "\" already exists";
assert !copiedFiles.contains(file): "file \"" + file + "\" is being copied more than once";
copiedFiles.add(file);
info.dir.copy(directory, file, newFileName, context); info.dir.copy(directory, file, newFileName, context);
} }