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

LUCENE-2378: add ability to populate BytesRef instances while filling PagedBytes, and make UnInvertedField's TermIndex use this to share a byte[] 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@955785 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-06-17 23:23:22 +00:00
parent 9fed2f7e13
commit 04765f68d1
4 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java
View File

@ -137,7 +137,7 @@ public class SimpleStandardTermsIndexReader extends StandardTermsIndexReader {
if (success) {
indexLoaded = true;
}
termBytesReader = termBytes.freeze();
termBytesReader = termBytes.freeze(true);
} else {
this.in = in;
}
@ -413,7 +413,7 @@ public class SimpleStandardTermsIndexReader extends StandardTermsIndexReader {
indexLoaded = true;
in.close();
termBytesReader = termBytes.freeze();
termBytesReader = termBytes.freeze(true);
}
}

4
lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java
View File

@ -866,7 +866,7 @@ class FieldCacheImpl implements FieldCache {
}
// maybe an int-only impl?
return new DocTermsIndexImpl(bytes.freeze(), termOrdToBytesOffset.getMutable(), docToTermOrd.getMutable(), termOrd);
return new DocTermsIndexImpl(bytes.freeze(true), termOrdToBytesOffset.getMutable(), docToTermOrd.getMutable(), termOrd);
}
}
@ -971,7 +971,7 @@ class FieldCacheImpl implements FieldCache {
}
// maybe an int-only impl?
return new DocTermsImpl(bytes.freeze(), docToOffset.getMutable());
return new DocTermsImpl(bytes.freeze(true), docToOffset.getMutable());
}
}
private volatile PrintStream infoStream;

29
lucene/src/java/org/apache/lucene/util/PagedBytes.java
View File

@ -203,8 +203,33 @@ public final class PagedBytes {
}
}
/** Commits final byte[], trimming it if necessary. */
public Reader freeze() {
/** Copy BytesRef in, setting BytesRef out to the result.
* Do not use this if you will use freeze(true).
* This only supports bytes.length <= blockSize */
public void copy(BytesRef bytes, BytesRef out) throws IOException {
int left = blockSize - upto;
if (bytes.length > left) {
if (currentBlock != null) {
blocks.add(currentBlock);
blockEnd.add(upto);
}
currentBlock = new byte[blockSize];
upto = 0;
left = blockSize;
assert bytes.length <= blockSize;
// TODO: we could also support variable block sizes
}
out.bytes = currentBlock;
out.offset = upto;
out.length = bytes.length;
System.arraycopy(bytes.bytes, bytes.offset, currentBlock, upto, bytes.length);
upto += bytes.length;
}
/** Commits final byte[], trimming it if necessary and if trim=true */
public Reader freeze(boolean trim) {
if (upto < blockSize) {
final byte[] newBlock = new byte[upto];
System.arraycopy(currentBlock, 0, newBlock, 0, upto);

7
solr/src/java/org/apache/solr/request/UnInvertedField.java
View File

@ -27,6 +27,7 @@ import org.apache.lucene.index.Terms;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.util.PagedBytes;
import org.apache.noggit.CharArr;
import org.apache.solr.common.params.FacetParams;
import org.apache.solr.common.util.NamedList;
@ -1097,6 +1098,7 @@ class TermIndex {
NumberedTermsEnum getEnumerator(IndexReader reader) throws IOException {
if (index==null) return new NumberedTermsEnum(reader,this, prefix==null?new BytesRef():prefix, 0) {
ArrayList<BytesRef> lst;
PagedBytes bytes;
protected BytesRef setTerm() throws IOException {
BytesRef br = super.setTerm();
@ -1104,8 +1106,11 @@ class TermIndex {
sizeOfStrings += br.length;
if (lst==null) {
lst = new ArrayList<BytesRef>();
bytes = new PagedBytes(15);
}
lst.add(new BytesRef(br));
BytesRef out = new BytesRef();
bytes.copy(br, out);
lst.add(out);
}
return br;
}