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

clean unused memory by SegmentReader 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1529611 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shai Erera 2013-10-06 11:47:56 +00:00
parent 3bdd7f1b16
commit 2529b4799e
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
View File

@ -47,6 +47,18 @@ import org.apache.lucene.util.RefCount;
*/ */
public final class SegmentReader extends AtomicReader { public final class SegmentReader extends AtomicReader {
private static final class DocValuesRefCount extends RefCount<DocValuesProducer> {
public DocValuesRefCount(DocValuesProducer object) {
super(object);
}
@Override
protected void release() throws IOException {
object.close();
}
}
private final SegmentInfoPerCommit si; private final SegmentInfoPerCommit si;
private final Bits liveDocs; private final Bits liveDocs;
@ -261,7 +273,7 @@ public final class SegmentReader extends AtomicReader {
return genInfos; return genInfos;
} }
private RefCount<DocValuesProducer> newDocValuesProducer(SegmentInfoPerCommit si, IOContext context, Directory dir, private RefCount<DocValuesProducer> newDocValuesProducer(SegmentInfoPerCommit si, IOContext context, Directory dir,
DocValuesFormat dvFormat, Long gen, List<FieldInfo> infos) throws IOException { DocValuesFormat dvFormat, Long gen, List<FieldInfo> infos) throws IOException {
Directory dvDir = dir; Directory dvDir = dir;
String segmentSuffix = ""; String segmentSuffix = "";
@ -272,12 +284,7 @@ public final class SegmentReader extends AtomicReader {
// set SegmentReadState to list only the fields that are relevant to that gen // set SegmentReadState to list only the fields that are relevant to that gen
SegmentReadState srs = new SegmentReadState(dvDir, si.info, new FieldInfos(infos.toArray(new FieldInfo[infos.size()])), context, segmentSuffix); SegmentReadState srs = new SegmentReadState(dvDir, si.info, new FieldInfos(infos.toArray(new FieldInfo[infos.size()])), context, segmentSuffix);
return new RefCount<DocValuesProducer>(dvFormat.fieldsProducer(srs)) { return new DocValuesRefCount(dvFormat.fieldsProducer(srs));
@Override
protected void release() throws IOException {
object.close();
}
};
} }
@Override @Override
@ -302,6 +309,10 @@ public final class SegmentReader extends AtomicReader {
} }
} }
} }
genDVProducers.clear();
dvProducers.clear();
docValuesLocal.close();
docsWithFieldLocal.close();
if (t != null) { if (t != null) {
if (t instanceof IOException) throw (IOException) t; if (t instanceof IOException) throw (IOException) t;
if (t instanceof RuntimeException) throw (RuntimeException) t; if (t instanceof RuntimeException) throw (RuntimeException) t;