You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2016/10/06 18:05:36 UTC
lucene-solr:master: LUCENE-7475: Make Lucene70NormsFormat's
SparseDISI use the slice API rather than RandomAccessSlice.
Repository: lucene-solr
Updated Branches:
refs/heads/master 05f51c85f -> e1370d2c2
LUCENE-7475: Make Lucene70NormsFormat's SparseDISI use the slice API rather than RandomAccessSlice.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e1370d2c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e1370d2c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e1370d2c
Branch: refs/heads/master
Commit: e1370d2c2060463da8baffa19719249db1aa1a7d
Parents: 05f51c8
Author: Adrien Grand <jp...@gmail.com>
Authored: Thu Oct 6 18:43:09 2016 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Thu Oct 6 18:44:25 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/lucene/codecs/lucene70/SparseDISI.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e1370d2c/lucene/core/src/java/org/apache/lucene/codecs/lucene70/SparseDISI.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene70/SparseDISI.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene70/SparseDISI.java
index af71b9e..b924297 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene70/SparseDISI.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene70/SparseDISI.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.RandomAccessInput;
final class SparseDISI extends DocIdSetIterator {
@@ -51,7 +50,7 @@ final class SparseDISI extends DocIdSetIterator {
final int maxDoc;
final int numWords;
final long cost;
- final RandomAccessInput slice;
+ final IndexInput slice;
int doc = -1;
int wordIndex = -1;
long word;
@@ -60,7 +59,7 @@ final class SparseDISI extends DocIdSetIterator {
SparseDISI(int maxDoc, IndexInput in, long offset, long cost) throws IOException {
this.maxDoc = maxDoc;
this.numWords = (int) ((maxDoc + 63L) >>> 6);
- this.slice = in.randomAccessSlice(offset, numWords * 8L);
+ this.slice = in.slice("docs", offset, numWords * 8L);
this.cost = cost;
}
@@ -72,7 +71,7 @@ final class SparseDISI extends DocIdSetIterator {
final int targetWordIndex = target >>> 6;
for (int i = wordIndex + 1; i <= targetWordIndex; ++i) {
- word = slice.readLong(i << 3);
+ word = slice.readLong();
index += Long.bitCount(word);
}
wordIndex = targetWordIndex;
@@ -83,7 +82,7 @@ final class SparseDISI extends DocIdSetIterator {
}
while (++wordIndex < numWords) {
- word = slice.readLong(wordIndex << 3);
+ word = slice.readLong();
if (word != 0) {
index += Long.bitCount(word);
return doc = (wordIndex << 6) + Long.numberOfTrailingZeros(word);