Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5752: move det to the testcase; clarify javadocs that getCommonPrefix requires det automaton 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5752@1602279 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2014-06-12 19:53:15 +00:00
parent fe6ba518c9
commit acf8672b4d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lucene/core/src/java/org/apache/lucene/util/automaton/SpecialOperations.java
View File

@ -96,13 +96,12 @@ final public class SpecialOperations {
/** /**
* Returns the longest string that is a prefix of all accepted strings and * Returns the longest string that is a prefix of all accepted strings and
* visits each state at most once. * visits each state at most once. The automaton must be deterministic.
* *
* @return common prefix * @return common prefix
*/ */
// nocommit a must be det? we should document if so?
public static String getCommonPrefix(LightAutomaton a) { public static String getCommonPrefix(LightAutomaton a) {
//a.writeDot("cp"); assert BasicOperations.isDeterministic(a);
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
HashSet<Integer> visited = new HashSet<>(); HashSet<Integer> visited = new HashSet<>();
int s = 0; int s = 0;

2
lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
View File

@ -127,6 +127,8 @@ public class TestAutomatonQuery extends LuceneTestCase {
assertAutomatonHits(1, BasicOperations.minusLight(BasicAutomata.makeCharRangeLight('a', 'b'), assertAutomatonHits(1, BasicOperations.minusLight(BasicAutomata.makeCharRangeLight('a', 'b'),
BasicAutomata.makeCharLight('a'))); BasicAutomata.makeCharLight('a')));
} }
// nocommit make a testRandomAutomaton like TestRR2
/** /**
* Test that a nondeterministic automaton works correctly. (It should will be * Test that a nondeterministic automaton works correctly. (It should will be

3
solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java
View File

@ -782,8 +782,6 @@ public abstract class SolrQueryParserBase extends QueryBuilder {
if (factory.shouldReverse(termStr)) { if (factory.shouldReverse(termStr)) {
automaton = BasicOperations.concatenateLight(automaton, BasicAutomata.makeCharLight(factory.getMarkerChar())); automaton = BasicOperations.concatenateLight(automaton, BasicAutomata.makeCharLight(factory.getMarkerChar()));
automaton = SpecialOperations.reverse(automaton); automaton = SpecialOperations.reverse(automaton);
// nocommit why did i have to insert det here? reverse didn't det before
automaton = BasicOperations.determinize(automaton);
} else { } else {
// reverse wildcardfilter is active: remove false positives // reverse wildcardfilter is active: remove false positives
// fsa representing false positives (markerChar*) // fsa representing false positives (markerChar*)
@ -792,7 +790,6 @@ public abstract class SolrQueryParserBase extends QueryBuilder {
BasicAutomata.makeAnyStringLight()); BasicAutomata.makeAnyStringLight());
// subtract these away // subtract these away
automaton = BasicOperations.minusLight(automaton, falsePositives); automaton = BasicOperations.minusLight(automaton, falsePositives);
// nocommit and do i need to det here?
} }
return new AutomatonQuery(term, automaton) { return new AutomatonQuery(term, automaton) {
// override toString so its completely transparent // override toString so its completely transparent

6
solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java
View File

@ -26,6 +26,7 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.search.AutomatonQuery; import org.apache.lucene.search.AutomatonQuery;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.util.automaton.BasicOperations;
import org.apache.lucene.util.automaton.LightAutomaton; import org.apache.lucene.util.automaton.LightAutomaton;
import org.apache.lucene.util.automaton.SpecialOperations; import org.apache.lucene.util.automaton.SpecialOperations;
import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.SolrTestCaseJ4;
@ -157,10 +158,11 @@ public class TestReversedWildcardFilterFactory extends SolrTestCaseJ4 {
/** fragile assert: depends on our implementation, but cleanest way to check for now */ /** fragile assert: depends on our implementation, but cleanest way to check for now */
private boolean wasReversed(SolrQueryParser qp, String query) throws Exception { private boolean wasReversed(SolrQueryParser qp, String query) throws Exception {
Query q = qp.parse(query); Query q = qp.parse(query);
if (!(q instanceof AutomatonQuery)) if (!(q instanceof AutomatonQuery)) {
return false; return false;
}
LightAutomaton automaton = ((AutomatonQuery) q).getLightAutomaton(); LightAutomaton automaton = ((AutomatonQuery) q).getLightAutomaton();
String prefix = SpecialOperations.getCommonPrefix(automaton); String prefix = SpecialOperations.getCommonPrefix(BasicOperations.determinize(automaton));
return prefix.length() > 0 && prefix.charAt(0) == '\u0001'; return prefix.length() > 0 && prefix.charAt(0) == '\u0001';
} }