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

Internal: remove unused code from query_string parser and settings 

Closes #13098
This commit is contained in:
javanna 2015-08-25 10:22:42 +02:00 committed by Luca Cavanna
parent 3175be7a25
commit cc12501cef
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/org/apache/lucene/queryparser/classic/QueryParserSettings.java
View File

@ -20,7 +20,6 @@
package org.apache.lucene.queryparser.classic; package org.apache.lucene.queryparser.classic;
import com.carrotsearch.hppc.ObjectFloatHashMap; import com.carrotsearch.hppc.ObjectFloatHashMap;
import org.apache.lucene.analysis.Analyzer; 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;
@ -28,7 +27,6 @@ import org.apache.lucene.util.automaton.Operations;
import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.common.unit.Fuzziness;
import org.joda.time.DateTimeZone; import org.joda.time.DateTimeZone;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -69,16 +67,10 @@ public class QueryParserSettings {
private DateTimeZone timeZone; private DateTimeZone timeZone;
List<String> fields = null; List<String> fields = null;
Collection<String> queryTypes = null;
ObjectFloatHashMap<String> boosts = null; ObjectFloatHashMap<String> boosts = null;
float tieBreaker = 0.0f; float tieBreaker = 0.0f;
boolean useDisMax = true; boolean useDisMax = true;
public boolean isCacheable() {
// a hack for now :) to determine if a query string is cacheable
return !queryString.contains("now");
}
public String queryString() { public String queryString() {
return queryString; return queryString;
} }
@ -271,14 +263,6 @@ 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 ObjectFloatHashMap<String> boosts() { public ObjectFloatHashMap<String> boosts() {
return boosts; return boosts;
} }
@ -371,7 +355,6 @@ 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;
} }
@ -398,7 +381,6 @@ 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
core/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java
View File

@ -222,8 +222,6 @@ public class QueryStringQueryParser implements QueryParser {
qpSettings.queryString(org.apache.lucene.queryparser.classic.QueryParser.escape(qpSettings.queryString())); qpSettings.queryString(org.apache.lucene.queryparser.classic.QueryParser.escape(qpSettings.queryString()));
} }
qpSettings.queryTypes(parseContext.queryTypes());
MapperQueryParser queryParser = parseContext.queryParser(qpSettings); MapperQueryParser queryParser = parseContext.queryParser(qpSettings);
try { try {