LUCENE-3218: update changes and segment info after backport to 3.4

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1138454 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Willnauer 2011-06-22 13:20:48 +00:00
parent c6d9ef4c9f
commit c54a21ee98
2 changed files with 9 additions and 10 deletions

View File

@ -462,14 +462,6 @@ Optimizations
seek the term dictionary in TermQuery / TermWeight. seek the term dictionary in TermQuery / TermWeight.
(Simon Willnauer, Mike McCandless, Robert Muir) (Simon Willnauer, Mike McCandless, Robert Muir)
* LUCENE-3201, LUCENE-3218: CompoundFileSystem code has been consolidated
into a Directory implementation. Reading is optimized for MMapDirectory,
NIOFSDirectory and SimpleFSDirectory to only map requested parts of the
CFS into an IndexInput. Writing to a CFS now tries to append to the CF
directly if possible and merges separately written files on the fly instead
of during close. (Simon Willnauer, Robert Muir)
Bug fixes Bug fixes
* LUCENE-2633: PackedInts Packed32 and Packed64 did not support internal * LUCENE-2633: PackedInts Packed32 and Packed64 did not support internal
@ -485,7 +477,14 @@ Bug fixes
======================= Lucene 3.x (not yet released) ================ ======================= Lucene 3.x (not yet released) ================
(No changes) Optimizations
* LUCENE-3201, LUCENE-3218: CompoundFileSystem code has been consolidated
into a Directory implementation. Reading is optimized for MMapDirectory,
NIOFSDirectory and SimpleFSDirectory to only map requested parts of the
CFS into an IndexInput. Writing to a CFS now tries to append to the CF
directly if possible and merges separately written files on the fly instead
of during close. (Simon Willnauer, Robert Muir)
======================= Lucene 3.3.0 ======================= ======================= Lucene 3.3.0 =======================

View File

@ -619,7 +619,7 @@ public final class SegmentInfo implements Cloneable {
if (useCompoundFile) { if (useCompoundFile) {
fileSet.add(IndexFileNames.segmentFileName(name, "", IndexFileNames.COMPOUND_FILE_EXTENSION)); fileSet.add(IndexFileNames.segmentFileName(name, "", IndexFileNames.COMPOUND_FILE_EXTENSION));
if (version != null && StringHelper.getVersionComparator().compare("4.0", version) <= 0) { if (version != null && StringHelper.getVersionComparator().compare("3.4", version) <= 0) {
fileSet.add(IndexFileNames.segmentFileName(name, "", fileSet.add(IndexFileNames.segmentFileName(name, "",
IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION)); IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION));
} }