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 2011/08/04 18:09:25 UTC
svn commit: r1153916 - in /lucene/dev/branches/blocktree_3030/lucene/src:
java/org/apache/lucene/index/AutomatonTermsEnum.java
test/org/apache/lucene/search/TestRegexpRandom2.java
Author: rmuir
Date: Thu Aug 4 16:09:25 2011
New Revision: 1153916
URL: http://svn.apache.org/viewvc?rev=1153916&view=rev
Log:
remove obselete nocommit: we are on utf-8 bytes, this should be ok
Modified:
lucene/dev/branches/blocktree_3030/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java
lucene/dev/branches/blocktree_3030/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
Modified: lucene/dev/branches/blocktree_3030/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/blocktree_3030/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java?rev=1153916&r1=1153915&r2=1153916&view=diff
==============================================================================
--- lucene/dev/branches/blocktree_3030/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java (original)
+++ lucene/dev/branches/blocktree_3030/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java Thu Aug 4 16:09:25 2011
@@ -48,8 +48,7 @@ import org.apache.lucene.util.automaton.
* </p>
* @lucene.experimental
*/
-// nocommit should this be package private...?
-public class AutomatonTermsEnum extends FilteredTermsEnum {
+class AutomatonTermsEnum extends FilteredTermsEnum {
// a tableized array-based form of the DFA
private final ByteRunAutomaton runAutomaton;
// common suffix of the automaton
Modified: lucene/dev/branches/blocktree_3030/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/blocktree_3030/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java?rev=1153916&r1=1153915&r2=1153916&view=diff
==============================================================================
--- lucene/dev/branches/blocktree_3030/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java (original)
+++ lucene/dev/branches/blocktree_3030/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java Thu Aug 4 16:09:25 2011
@@ -26,7 +26,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.AutomatonTermsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
@@ -157,19 +156,7 @@ public class TestRegexpRandom2 extends L
protected void assertSame(String regexp) throws IOException {
RegexpQuery smart = new RegexpQuery(new Term("field", regexp), RegExp.NONE);
DumbRegexpQuery dumb = new DumbRegexpQuery(new Term("field", regexp), RegExp.NONE);
-
- // we can't compare the two if automaton rewrites to a simpler enum.
- // for example: "a\uda07\udcc7?.*?" gets rewritten to a simpler query:
- // a\uda07* prefixquery. Prefixquery then does the "wrong" thing, which
- // isn't really wrong as the query was undefined to begin with... but not
- // automatically comparable.
-
- // TODO: does this check even matter anymore?!
- // nocommit: we'll find out!!
- Terms terms = MultiFields.getTerms(searcher1.getIndexReader(), "field");
- if (!(smart.getTermsEnum(terms) instanceof AutomatonTermsEnum))
- return;
-
+
TopDocs smartDocs = searcher1.search(smart, 25);
TopDocs dumbDocs = searcher2.search(dumb, 25);