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 2013/01/29 01:05:51 UTC
svn commit: r1439709 - in /lucene/dev/branches/lucene4547/lucene/core/src:
java/org/apache/lucene/index/SortedDocValuesTermsEnum.java
test/org/apache/lucene/search/TestFieldCache.java
Author: mikemccand
Date: Tue Jan 29 00:05:50 2013
New Revision: 1439709
URL: http://svn.apache.org/viewvc?rev=1439709&view=rev
Log:
fix nocommits
Modified:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java?rev=1439709&r1=1439708&r2=1439709&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java Tue Jan 29 00:05:50 2013
@@ -39,7 +39,6 @@ public class SortedDocValuesTermsEnum ex
@Override
public SeekStatus seekCeil(BytesRef text, boolean useCache /* ignored */) throws IOException {
int ord = values.lookupTerm(text, term);
- // nocommit >= 0!?
if (ord >= 0) {
currentOrd = ord;
term.offset = 0;
@@ -50,7 +49,7 @@ public class SortedDocValuesTermsEnum ex
if (currentOrd == values.getValueCount()) {
return SeekStatus.END;
} else {
- // nocommit hmm can we avoid this "extra" lookup?:
+ // TODO: hmm can we avoid this "extra" lookup?:
values.lookupOrd(currentOrd, term);
return SeekStatus.NOT_FOUND;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java?rev=1439709&r1=1439708&r2=1439709&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java Tue Jan 29 00:05:50 2013
@@ -206,7 +206,6 @@ public class TestFieldCache extends Luce
}
int nTerms = termsIndex.getValueCount();
- // System.out.println("nTerms="+nTerms);
TermsEnum tenum = new SortedDocValuesTermsEnum(termsIndex);
BytesRef val = new BytesRef();
@@ -218,14 +217,21 @@ public class TestFieldCache extends Luce
}
// seek the enum around (note this isn't a great test here)
+ // nocommit
int num = atLeast(100);
for (int i = 0; i < num; i++) {
- int k = _TestUtil.nextInt(random(), 1, nTerms-1);
+ int k = random().nextInt(nTerms);
termsIndex.lookupOrd(k, val);
assertEquals(TermsEnum.SeekStatus.FOUND, tenum.seekCeil(val));
assertEquals(val, tenum.term());
}
-
+
+ for(int i=0;i<nTerms;i++) {
+ termsIndex.lookupOrd(i, val);
+ assertEquals(TermsEnum.SeekStatus.FOUND, tenum.seekCeil(val));
+ assertEquals(val, tenum.term());
+ }
+
// test bad field
termsIndex = cache.getTermsIndex(reader, "bogusfield");