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

LUCENE-3736: Cleanup code a little bit, dont do the same check all the time. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1245897 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-02-18 09:57:22 +00:00
parent 458ff3ead7
commit fc75babcac
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
View File

@ -80,9 +80,15 @@ public final class ParallelAtomicReader extends AtomicReader {
throw new IllegalArgumentException("There must be at least one main reader if storedFieldsReaders are used."); throw new IllegalArgumentException("There must be at least one main reader if storedFieldsReaders are used.");
this.parallelReaders = readers.clone(); this.parallelReaders = readers.clone();
this.storedFieldsReaders = storedFieldsReaders.clone(); this.storedFieldsReaders = storedFieldsReaders.clone();
this.numDocs = (readers.length > 0) ? readers[0].numDocs() : 0; if (parallelReaders.length > 0) {
this.maxDoc = (readers.length > 0) ? readers[0].maxDoc() : 0; final AtomicReader first = parallelReaders[0];
this.hasDeletions = (readers.length > 0) ? readers[0].hasDeletions() : false; this.maxDoc = first.maxDoc();
this.numDocs = first.numDocs();
this.hasDeletions = first.hasDeletions();
} else {
this.maxDoc = this.numDocs = 0;
this.hasDeletions = false;
}
Collections.addAll(completeReaderSet, this.parallelReaders); Collections.addAll(completeReaderSet, this.parallelReaders);
Collections.addAll(completeReaderSet, this.storedFieldsReaders); Collections.addAll(completeReaderSet, this.storedFieldsReaders);
@ -97,7 +103,7 @@ public final class ParallelAtomicReader extends AtomicReader {
final FieldInfos readerFieldInfos = reader.getFieldInfos(); final FieldInfos readerFieldInfos = reader.getFieldInfos();
for(FieldInfo fieldInfo : readerFieldInfos) { // update fieldToReader map for(FieldInfo fieldInfo : readerFieldInfos) { // update fieldToReader map
// NOTE: first reader having a given field "wins": // NOTE: first reader having a given field "wins":
if (fieldToReader.get(fieldInfo.name) == null) { if (!fieldToReader.containsKey(fieldInfo.name)) {
fieldInfos.add(fieldInfo); fieldInfos.add(fieldInfo);
fieldToReader.put(fieldInfo.name, reader); fieldToReader.put(fieldInfo.name, reader);
this.fields.addField(fieldInfo.name, reader.terms(fieldInfo.name)); this.fields.addField(fieldInfo.name, reader.terms(fieldInfo.name));