You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2011/01/23 12:11:42 UTC
svn commit: r1062388 - in
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index: SegmentInfo.java
SegmentReader.java
Author: shaie
Date: Sun Jan 23 11:11:42 2011
New Revision: 1062388
URL: http://svn.apache.org/viewvc?rev=1062388&view=rev
Log:
remove nocommit in SegmentReader and simplify code which gets the DocStoreSegment
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1062388&r1=1062387&r2=1062388&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfo.java Sun Jan 23 11:11:42 2011
@@ -103,6 +103,7 @@ public final class SegmentInfo {
delGen = NO;
this.isCompoundFile = isCompoundFile;
this.docStoreOffset = -1;
+ this.docStoreSegment = name;
this.hasProx = hasProx;
this.segmentCodecs = segmentCodecs;
this.hasVectors = hasVectors;
@@ -121,6 +122,7 @@ public final class SegmentInfo {
dir = src.dir;
delGen = src.delGen;
docStoreOffset = src.docStoreOffset;
+ docStoreSegment = src.docStoreSegment;
docStoreIsCompoundFile = src.docStoreIsCompoundFile;
hasVectors = src.hasVectors;
hasProx = src.hasProx;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1062388&r1=1062387&r2=1062388&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java Sun Jan 23 11:11:42 2011
@@ -226,14 +226,7 @@ public class SegmentReader extends Index
assert storeDir != null;
}
- // nocommit: this can be simplified to always be si.getDocStoreSegment()
- final String storesSegment;
- if (si.getDocStoreOffset() != -1) {
- storesSegment = si.getDocStoreSegment();
- } else {
- storesSegment = segment;
- }
-
+ final String storesSegment = si.getDocStoreSegment();
fieldsReaderOrig = new FieldsReader(storeDir, storesSegment, fieldInfos, readBufferSize,
si.getDocStoreOffset(), si.docCount);