You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/07/25 19:28:09 UTC
svn commit: r1507070 - in /lucene/dev/branches/lucene5127/lucene:
codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
Author: rmuir
Date: Thu Jul 25 17:28:08 2013
New Revision: 1507070
URL: http://svn.apache.org/r1507070
Log:
LUCENE-5127: simplify seek-within-block
Modified:
lucene/dev/branches/lucene5127/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
Modified: lucene/dev/branches/lucene5127/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5127/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1507070&r1=1507069&r2=1507070&view=diff
==============================================================================
--- lucene/dev/branches/lucene5127/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/branches/lucene5127/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Thu Jul 25 17:28:08 2013
@@ -313,11 +313,6 @@ public class BlockTermsReader extends Fi
calls next() (which is not "typical"), then we'll do the real seek */
private boolean seekPending;
- /* How many blocks we've read since last seek. Once this
- is >= indexEnum.getDivisor() we set indexIsCurrent to false (since
- the index can no long bracket seek-within-block). */
- private int blocksSinceSeek;
-
private byte[] termSuffixes;
private ByteArrayDataInput termSuffixesReader = new ByteArrayDataInput();
@@ -420,8 +415,7 @@ public class BlockTermsReader extends Fi
assert result;
indexIsCurrent = true;
- didIndexNext = false;
- blocksSinceSeek = 0;
+ didIndexNext = false;
if (doOrd) {
state.ord = indexEnum.ord()-1;
@@ -729,7 +723,6 @@ public class BlockTermsReader extends Fi
indexIsCurrent = true;
didIndexNext = false;
- blocksSinceSeek = 0;
seekPending = false;
state.ord = indexEnum.ord()-1;
@@ -802,8 +795,7 @@ public class BlockTermsReader extends Fi
postingsReader.readTermsBlock(in, fieldInfo, state);
- blocksSinceSeek++;
- indexIsCurrent = indexIsCurrent && (blocksSinceSeek < 1); // nocommit
+ indexIsCurrent = false;
//System.out.println(" indexIsCurrent=" + indexIsCurrent);
return true;
Modified: lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java?rev=1507070&r1=1507069&r2=1507070&view=diff
==============================================================================
--- lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/branches/lucene5127/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java Thu Jul 25 17:28:08 2013
@@ -67,9 +67,9 @@ import org.apache.lucene.util.fst.Util;
* does not support a pluggable terms index
* implementation).
*
- * <p><b>NOTE</b>: this terms dictionary does not support
- * index divisor when opening an IndexReader. Instead, you
- * can change the min/maxItemsPerBlock during indexing.</p>
+ * <p><b>NOTE</b>: this terms dictionary supports
+ * min/maxItemsPerBlock during indexing to control how
+ * much memory the terms index uses.</p>
*
* <p>The data structure used by this implementation is very
* similar to a burst trie