You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2015/11/06 14:26:03 UTC
svn commit: r1712961 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
Author: cpoerschke
Date: Fri Nov 6 13:26:02 2015
New Revision: 1712961
URL: http://svn.apache.org/viewvc?rev=1712961&view=rev
Log:
LUCENE-6885: StandardDirectoryReader (initialCapacity) tweaks (merge in revision 1712939 from trunk)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1712961&r1=1712960&r2=1712961&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Fri Nov 6 13:26:02 2015
@@ -105,6 +105,9 @@ Optimizations
* LUCENE-6878: Speed up TopDocs.merge. (Daniel Jelinski via Adrien Grand)
+* LUCENE-6885: StandardDirectoryReader (initialCapacity) tweaks
+ (Christine Poerschke)
+
Bug Fixes
* LUCENE-6817: ComplexPhraseQueryParser.ComplexPhraseQuery does not display
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java?rev=1712961&r1=1712960&r2=1712961&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java Fri Nov 6 13:26:02 2015
@@ -80,7 +80,7 @@ final class StandardDirectoryReader exte
// no need to process segments in reverse order
final int numSegments = infos.size();
- List<SegmentReader> readers = new ArrayList<>();
+ final List<SegmentReader> readers = new ArrayList<>(numSegments);
final Directory dir = writer.getDirectory();
final SegmentInfos segmentInfos = infos.clone();
@@ -136,7 +136,7 @@ final class StandardDirectoryReader exte
// we put the old SegmentReaders in a map, that allows us
// to lookup a reader using its segment name
- final Map<String,Integer> segmentReaders = new HashMap<>();
+ final Map<String,Integer> segmentReaders = (oldReaders == null ? Collections.<String,Integer>emptyMap() : new HashMap<String,Integer>(oldReaders.size()));
if (oldReaders != null) {
// create a Map SegmentName->SegmentReader