honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Query Parser caching does not take types into account

This commit is contained in:
Igor Motov 2012-07-11 13:45:22 -04:00 committed by Shay Banon
parent 5517df6353
commit 51ff83942c
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/apache/lucene/queryParser/QueryParserSettings.java
View File

@ -24,6 +24,7 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.FuzzyQuery;
import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.MultiTermQuery;
import java.util.Collection;
import java.util.List; import java.util.List;
/** /**
@ -60,6 +61,7 @@ public class QueryParserSettings {
List<String> fields = null; List<String> fields = null;
Collection<String> queryTypes = null;
TObjectFloatHashMap<String> boosts = null; TObjectFloatHashMap<String> boosts = null;
float tieBreaker = 0.0f; float tieBreaker = 0.0f;
boolean useDisMax = true; boolean useDisMax = true;
@ -256,6 +258,14 @@ public class QueryParserSettings {
this.fields = fields; this.fields = fields;
} }
public Collection<String> queryTypes() {
return queryTypes;
}
public void queryTypes(Collection<String> queryTypes) {
this.queryTypes = queryTypes;
}
public TObjectFloatHashMap<String> boosts() { public TObjectFloatHashMap<String> boosts() {
return boosts; return boosts;
} }
@ -325,6 +335,7 @@ public class QueryParserSettings {
if (useDisMax != that.useDisMax) return false; if (useDisMax != that.useDisMax) return false;
if (boosts != null ? !boosts.equals(that.boosts) : that.boosts != null) return false; if (boosts != null ? !boosts.equals(that.boosts) : that.boosts != null) return false;
if (fields != null ? !fields.equals(that.fields) : that.fields != null) return false; if (fields != null ? !fields.equals(that.fields) : that.fields != null) return false;
if (queryTypes != null ? !queryTypes.equals(that.queryTypes) : that.queryTypes != null) return false;
return true; return true;
} }
@ -350,6 +361,7 @@ public class QueryParserSettings {
result = 31 * result + (analyzeWildcard ? 1 : 0); result = 31 * result + (analyzeWildcard ? 1 : 0);
result = 31 * result + (fields != null ? fields.hashCode() : 0); result = 31 * result + (fields != null ? fields.hashCode() : 0);
result = 31 * result + (queryTypes != null ? queryTypes.hashCode() : 0);
result = 31 * result + (boosts != null ? boosts.hashCode() : 0); result = 31 * result + (boosts != null ? boosts.hashCode() : 0);
result = 31 * result + (tieBreaker != +0.0f ? Float.floatToIntBits(tieBreaker) : 0); result = 31 * result + (tieBreaker != +0.0f ? Float.floatToIntBits(tieBreaker) : 0);
result = 31 * result + (useDisMax ? 1 : 0); result = 31 * result + (useDisMax ? 1 : 0);

2
src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java
View File

@ -199,6 +199,8 @@ public class QueryStringQueryParser implements QueryParser {
qpSettings.queryString(org.apache.lucene.queryParser.QueryParser.escape(qpSettings.queryString())); qpSettings.queryString(org.apache.lucene.queryParser.QueryParser.escape(qpSettings.queryString()));
} }
qpSettings.queryTypes(parseContext.queryTypes());
Query query = parseContext.indexCache().queryParserCache().get(qpSettings); Query query = parseContext.indexCache().queryParserCache().get(qpSettings);
if (query != null) { if (query != null) {
return query; return query;