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

LUCENE-4055: tidy up a bit, add a nocommit 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4055@1341617 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-05-22 20:37:56 +00:00
parent aec09e25cd
commit 73b5071b89
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2353,6 +2353,7 @@ 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. */
// nocommit: this gets insanely crazy: if there is any 3.x can we just open a reader and AddIndexes(Reader) ?!
private SegmentInfoPerCommit copySegmentAsIs(SegmentInfoPerCommit info, String segName, private SegmentInfoPerCommit copySegmentAsIs(SegmentInfoPerCommit info, String segName,
Map<String, String> dsNames, Set<String> dsFilesCopied, IOContext context, Map<String, String> dsNames, Set<String> dsFilesCopied, IOContext context,
Set<String> copiedFiles) Set<String> copiedFiles)
@ -2361,7 +2362,7 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
// only relevant for segments that share doc store with others, // only relevant for segments that share doc store with others,
// because the DS might have been copied already, in which case we // because the DS might have been copied already, in which case we
// just want to update the DS name of this SegmentInfo. // just want to update the DS name of this SegmentInfo.
String dsName = info.info.getDocStoreSegment(); final String dsName = info.info.getDocStoreSegment();
assert dsName != null; assert dsName != null;
final String newDsName; final String newDsName;
if (dsNames.containsKey(dsName)) { if (dsNames.containsKey(dsName)) {
@ -2383,13 +2384,13 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
assert info.info.getDocStoreSegment() != null; assert info.info.getDocStoreSegment() != null;
// nocommit what to do.... // nocommit what to do....
if (info.info.getDocStoreIsCompoundFile()) { if (info.info.getDocStoreIsCompoundFile()) {
codecDocStoreFiles.add(IndexFileNames.segmentFileName(info.info.getDocStoreSegment(), "", "cfx")); codecDocStoreFiles.add(IndexFileNames.segmentFileName(dsName, "", "cfx"));
} else { } else {
codecDocStoreFiles.add(IndexFileNames.segmentFileName(info.info.getDocStoreSegment(), "", "fdt")); codecDocStoreFiles.add(IndexFileNames.segmentFileName(dsName, "", "fdt"));
codecDocStoreFiles.add(IndexFileNames.segmentFileName(info.info.getDocStoreSegment(), "", "fdx")); codecDocStoreFiles.add(IndexFileNames.segmentFileName(dsName, "", "fdx"));
codecDocStoreFiles.add(IndexFileNames.segmentFileName(info.info.getDocStoreSegment(), "", "tvx")); codecDocStoreFiles.add(IndexFileNames.segmentFileName(dsName, "", "tvx"));
codecDocStoreFiles.add(IndexFileNames.segmentFileName(info.info.getDocStoreSegment(), "", "tvf")); codecDocStoreFiles.add(IndexFileNames.segmentFileName(dsName, "", "tvf"));
codecDocStoreFiles.add(IndexFileNames.segmentFileName(info.info.getDocStoreSegment(), "", "tvd")); codecDocStoreFiles.add(IndexFileNames.segmentFileName(dsName, "", "tvd"));
} }
} }