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

SOLR-9878: fix ReversedWildcardFilterFactory caching in query parser

This commit is contained in:
Mikhail Khludnev 2016-12-21 00:01:27 +03:00
parent b5cfb17bd0
commit f1e636f561
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/CHANGES.txt
View File

@ -322,6 +322,7 @@ Other Changes
* SOLR-9874: Solr will reject CREATEALIAS requests if target collections don't exist (Tomás Fernández Löbbe)
* SOLR-9878: fixing lazy logic for retrieving ReversedWildcardFilterFactory in SolrQueryParserBase (Mikhail Khludnev)
================== 6.3.0 ==================

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

@ -787,7 +787,7 @@ public abstract class SolrQueryParserBase extends QueryBuilder {
protected ReversedWildcardFilterFactory getReversedWildcardFilterFactory(FieldType fieldType) {
if (leadingWildcards == null) leadingWildcards = new HashMap<>();
ReversedWildcardFilterFactory fac = leadingWildcards.get(fieldType);
if (fac != null || leadingWildcards.containsKey(fac)) {
if (fac != null || leadingWildcards.containsKey(fieldType)) {
return fac;
}

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

@ -15,6 +15,11 @@
* limitations under the License.
*/
package org.apache.solr.analysis;
import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@ -26,18 +31,23 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.Operations;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.parser.CharStream;
import org.apache.solr.parser.ParseException;
import org.apache.solr.parser.SolrQueryParserBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.IndexSchemaFactory;
import org.apache.solr.search.QParser;
import org.apache.solr.search.SolrQueryParser;
import org.apache.solr.search.SyntaxError;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import static org.apache.lucene.analysis.BaseTokenStreamTestCase.*;
public class TestReversedWildcardFilterFactory extends SolrTestCaseJ4 {
Map<String,String> args = new HashMap<>();
IndexSchema schema;
@ -183,4 +193,36 @@ public class TestReversedWildcardFilterFactory extends SolrTestCaseJ4 {
req("+id:1 +one:*omez*"),
"//result[@numFound=1]");
}
private static final class SolrQParser extends SolrQueryParserBase {
@Override
public Query TopLevelQuery(String field) throws ParseException, SyntaxError {
return null;
}
@Override
public void ReInit(CharStream stream) {}
@Override
protected ReversedWildcardFilterFactory getReversedWildcardFilterFactory(FieldType fieldType) {
return super.getReversedWildcardFilterFactory(fieldType);
}
}
@Test
public void testCachingInQueryParser() {
SolrQParser parser = new SolrQParser();
SolrQueryRequest req = req();
String[] fields = new String[]{"one", "two", "three"};
String aField = fields[random().nextInt(fields.length)];
FieldType type = req.getSchema().getField(aField).getType();
FieldType typeSpy = spy(type);
// calling twice
parser.getReversedWildcardFilterFactory(typeSpy);
parser.getReversedWildcardFilterFactory(typeSpy);
// but it should reach only once
verify(typeSpy, times(1)).getIndexAnalyzer();
}
}