diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 1df24c6da41..6664b825094 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -462,14 +462,6 @@ Optimizations seek the term dictionary in TermQuery / TermWeight. (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 * LUCENE-2633: PackedInts Packed32 and Packed64 did not support internal @@ -485,7 +477,14 @@ Bug fixes ======================= 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 ======================= diff --git a/lucene/src/java/org/apache/lucene/index/SegmentInfo.java b/lucene/src/java/org/apache/lucene/index/SegmentInfo.java index 661b4755498..e25f0807a28 100644 --- a/lucene/src/java/org/apache/lucene/index/SegmentInfo.java +++ b/lucene/src/java/org/apache/lucene/index/SegmentInfo.java @@ -619,7 +619,7 @@ public final class SegmentInfo implements Cloneable { if (useCompoundFile) { 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, "", IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION)); }