You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/04/08 11:04:36 UTC
svn commit: r1672037 - in /lucene/dev/branches/branch_5x/lucene/core/src:
java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java
test/org/apache/lucene/search/TestTermRangeQuery.java
Author: mikemccand
Date: Wed Apr 8 09:04:36 2015
New Revision: 1672037
URL: http://svn.apache.org/r1672037
Log:
LUCENE-5879: fix corner case in auto-prefix intersect
Modified:
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java?rev=1672037&r1=1672036&r2=1672037&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java Wed Apr 8 09:04:36 2015
@@ -119,7 +119,7 @@ final class IntersectTermsEnumFrame {
}
void loadNextFloorBlock() throws IOException {
- assert numFollowFloorBlocks > 0;
+ assert numFollowFloorBlocks > 0: "nextFloorLabel=" + nextFloorLabel;
//if (DEBUG) System.out.println(" loadNextFloorBlock transition.min=" + transition.min);
do {
@@ -157,7 +157,7 @@ final class IntersectTermsEnumFrame {
//xif (DEBUG) System.out.println(" load fp=" + fp + " fpOrig=" + fpOrig + " frameIndexData=" + frameIndexData + " trans=" + (transitions.length != 0 ? transitions[0] : "n/a" + " state=" + state));
- if (frameIndexData != null && transitionCount != 0) {
+ if (frameIndexData != null) {
// Floor frame
if (floorData.length < frameIndexData.length) {
this.floorData = new byte[ArrayUtil.oversize(frameIndexData.length, 1)];
@@ -172,9 +172,9 @@ final class IntersectTermsEnumFrame {
nextFloorLabel = floorDataReader.readByte() & 0xff;
//if (DEBUG) System.out.println(" numFollowFloorBlocks=" + numFollowFloorBlocks + " nextFloorLabel=" + nextFloorLabel);
- // If current state is accept, we must process
+ // If current state is not accept, and has transitions, we must process
// first block in case it has empty suffix:
- if (!ite.runAutomaton.isAccept(state)) {
+ if (ite.runAutomaton.isAccept(state) == false && transitionCount != 0) {
// Maybe skip floor blocks:
assert transitionIndex == 0: "transitionIndex=" + transitionIndex;
while (numFollowFloorBlocks != 0 && nextFloorLabel <= transition.min) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=1672037&r1=1672036&r2=1672037&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java Wed Apr 8 09:04:36 2015
@@ -399,9 +399,11 @@ public class TestTermRangeQuery extends
}
}
- //System.out.println("start " + startTerm + " inclusive? " + startInclusive);
- //System.out.println("end " + endTerm + " inclusive? " + endInclusive);
- //System.out.println("actual count " + actualCount);
+ if (VERBOSE) {
+ System.out.println("start " + startTerm + " inclusive? " + startInclusive);
+ System.out.println("end " + endTerm + " inclusive? " + endInclusive);
+ System.out.println("actual count " + actualCount);
+ }
Directory dir = newDirectory();
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
@@ -411,37 +413,52 @@ public class TestTermRangeQuery extends
int minTermsAutoPrefix = TestUtil.nextInt(random(), 2, 100);
int maxTermsAutoPrefix = random().nextBoolean() ? Math.max(2, (minTermsAutoPrefix-1)*2 + random().nextInt(100)) : Integer.MAX_VALUE;
- //System.out.println("minTermsAutoPrefix " + minTermsAutoPrefix);
- //System.out.println("maxTermsAutoPrefix " + maxTermsAutoPrefix);
+ if (VERBOSE) {
+ System.out.println("minTermsAutoPrefix " + minTermsAutoPrefix);
+ System.out.println("maxTermsAutoPrefix " + maxTermsAutoPrefix);
+ }
iwc.setCodec(TestUtil.alwaysPostingsFormat(new AutoPrefixPostingsFormat(minTermsInBlock, maxTermsInBlock,
minTermsAutoPrefix, maxTermsAutoPrefix)));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- //System.out.println("TEST: index terms");
+ if (VERBOSE) {
+ System.out.println("TEST: index terms");
+ }
for (String term : randomTerms) {
Document doc = new Document();
doc.add(new StringField("field", term, Field.Store.NO));
w.addDocument(doc);
- //System.out.println(" " + term);
+ if (VERBOSE) {
+ System.out.println(" " + term);
+ }
+ }
+
+ if (VERBOSE) {
+ System.out.println("TEST: now force merge");
}
- //System.out.println("TEST: now force merge");
w.forceMerge(1);
IndexReader r = w.getReader();
final Terms terms = MultiFields.getTerms(r, "field");
IndexSearcher s = new IndexSearcher(r);
final int finalActualCount = actualCount;
- //System.out.println("start=" + startTerm + " end=" + endTerm + " startIncl=" + startInclusive + " endIncl=" + endInclusive);
+ if (VERBOSE) {
+ System.out.println("start=" + startTerm + " end=" + endTerm + " startIncl=" + startInclusive + " endIncl=" + endInclusive);
+ }
TermRangeQuery q = new TermRangeQuery("field", new BytesRef(startTerm), new BytesRef(endTerm), startInclusive, endInclusive) {
public TermRangeQuery checkTerms() throws IOException {
TermsEnum termsEnum = getTermsEnum(terms, new AttributeSource());
int count = 0;
while (termsEnum.next() != null) {
- //System.out.println("got term: " + termsEnum.term().utf8ToString());
+ if (VERBOSE) {
+ System.out.println("got term: " + termsEnum.term().utf8ToString());
+ }
count++;
}
- //System.out.println("count " + count + " vs finalActualCount=" + finalActualCount);
+ if (VERBOSE) {
+ System.out.println("count " + count + " vs finalActualCount=" + finalActualCount);
+ }
// Auto-prefix term(s) should have kicked in, so we should have visited fewer than the total number of aa* terms:
assertTrue(count < finalActualCount);
@@ -456,6 +473,9 @@ public class TestTermRangeQuery extends
q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_REWRITE);
}
+ if (VERBOSE) {
+ System.out.println("TEST: use rewrite method " + q.getRewriteMethod());
+ }
assertEquals(actualCount, s.search(q, 1).totalHits);
// Test when min == max: