Skip to content

Commit 2880cd0

Browse files
committed
Upgrade to Lucene 4.1
* Removed CustmoMemoryIndex in favor of MemoryIndex which as of 4.1 supports adding the same field twice * Replaced duplicated logic in X[*]FSDirectory for rate limiting with a RateLimitedFSDirectory wrapper * Remove hacks to find out merge context in rate limiting in favor of IOContext * replaced Scorer#freq() return type (from float to int) * Upgraded FVHighlighter to new 'centered' highlighting * Fixed RobinEngine to use seperate setCommitData
1 parent 20f43bf commit 2880cd0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+354
-2273
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</parent>
3131

3232
<properties>
33-
<lucene.version>4.0.0</lucene.version>
33+
<lucene.version>4.1.0</lucene.version>
3434
</properties>
3535

3636
<repositories>
@@ -617,4 +617,4 @@
617617
</plugins>
618618
</pluginManagement>
619619
</build>
620-
</project>
620+
</project>

src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,8 @@ protected void doMerge(MergePolicy.OneMerge merge) throws IOException {
8787
logger.trace("merge [{}] starting..., merging [{}] segments, [{}] docs, [{}] size, into [{}] estimated_size", merge.info == null ? "_na_" : merge.info.info.name, merge.segments.size(), totalNumDocs, new ByteSizeValue(totalSizeInBytes), new ByteSizeValue(merge.estimatedMergeBytes));
8888
}
8989
try {
90-
TrackingMergeScheduler.setCurrentMerge(merge);
9190
super.doMerge(merge);
9291
} finally {
93-
TrackingMergeScheduler.removeCurrentMerge();
9492
long took = System.currentTimeMillis() - time;
9593

9694
currentMerges.dec();

src/main/java/org/apache/lucene/index/TrackingMergeScheduler.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/main/java/org/apache/lucene/index/TrackingSerialMergeScheduler.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,8 @@ synchronized public void merge(IndexWriter writer) throws CorruptIndexException,
9999
logger.trace("merge [{}] starting..., merging [{}] segments, [{}] docs, [{}] size, into [{}] estimated_size", merge.info == null ? "_na_" : merge.info.info.name, merge.segments.size(), totalNumDocs, new ByteSizeValue(totalSizeInBytes), new ByteSizeValue(merge.estimatedMergeBytes));
100100
}
101101
try {
102-
TrackingMergeScheduler.setCurrentMerge(merge);
103102
writer.merge(merge);
104103
} finally {
105-
TrackingMergeScheduler.removeCurrentMerge();
106104
long took = System.currentTimeMillis() - time;
107105

108106
currentMerges.dec();

0 commit comments

Comments
 (0)