You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/12/11 20:58:33 UTC
[09/27] lucene-solr:jira/http2: Revert "LUCENE-8374 part 4/4: Reduce
reads for sparse DocValues". LUCENE-8374 was committed without consensus and
is expected to be superseded by LUCENE-8585.
Revert "LUCENE-8374 part 4/4: Reduce reads for sparse DocValues".
LUCENE-8374 was committed without consensus and is expected to be superseded by LUCENE-8585.
This reverts commit e356d793caf2a899f23261baba922d4a08b362ed.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3158d0c4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3158d0c4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3158d0c4
Branch: refs/heads/jira/http2
Commit: 3158d0c485449400d35a0095db15acdce9f8db5c
Parents: 870bb11
Author: Toke Eskildsen <to...@apache.org>
Authored: Tue Dec 11 14:13:37 2018 +0100
Committer: Toke Eskildsen <to...@apache.org>
Committed: Tue Dec 11 14:13:37 2018 +0100
----------------------------------------------------------------------
.../apache/lucene/codecs/lucene70/Lucene70NormsProducer.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3158d0c4/lucene/core/src/java/org/apache/lucene/codecs/lucene70/Lucene70NormsProducer.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene70/Lucene70NormsProducer.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene70/Lucene70NormsProducer.java
index 321fcff..c7310e8 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene70/Lucene70NormsProducer.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene70/Lucene70NormsProducer.java
@@ -45,7 +45,6 @@ final class Lucene70NormsProducer extends NormsProducer implements Cloneable {
private final Map<Integer,NormsEntry> norms = new HashMap<>();
private final int maxDoc;
private IndexInput data;
- private final IndexedDISICacheFactory disiCacheFactory = new IndexedDISICacheFactory();
private boolean merging;
private Map<Integer, IndexInput> disiInputs;
private Map<Integer, RandomAccessInput> dataInputs;
@@ -294,9 +293,7 @@ final class Lucene70NormsProducer extends NormsProducer implements Cloneable {
} else {
// sparse
final IndexInput disiInput = getDisiInput(field, entry);
- final IndexedDISI disi = disiCacheFactory.createCachedIndexedDISI(
- disiInput, entry.docsWithFieldOffset + entry.docsWithFieldLength, entry.numDocsWithField, field.name);
-
+ final IndexedDISI disi = new IndexedDISI(disiInput, entry.numDocsWithField);
if (entry.bytesPerNorm == 0) {
return new SparseNormsIterator(disi) {
@Override
@@ -345,12 +342,11 @@ final class Lucene70NormsProducer extends NormsProducer implements Cloneable {
@Override
public void close() throws IOException {
data.close();
- disiCacheFactory.releaseAll();
}
@Override
public long ramBytesUsed() {
- return 64L * norms.size() + disiCacheFactory.ramBytesUsed(); // good enough
+ return 64L * norms.size(); // good enough
}
@Override