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

lucene 4: converted queryparser to lucene classic query parser

This commit is contained in:
Simon Willnauer 2012-10-28 09:58:11 +01:00 committed by Shay Banon
parent 5d47ad4648
commit 479f1784e8
11 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -85,6 +85,13 @@
<version>${lucene.version}</version> <version>${lucene.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>${lucene.version}</version>
<scope>compile</scope>
</dependency>
<!-- START: dependencies that are shaded --> <!-- START: dependencies that are shaded -->
<dependency> <dependency>

2
src/main/java/org/apache/lucene/queryParser/ExistsFieldQueryExtension.java → src/main/java/org/apache/lucene/queryparser/classic/ExistsFieldQueryExtension.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.apache.lucene.queryParser; package org.apache.lucene.queryparser.classic;
import org.apache.lucene.search.DeletionAwareConstantScoreQuery; import org.apache.lucene.search.DeletionAwareConstantScoreQuery;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;

2
src/main/java/org/apache/lucene/queryParser/FieldQueryExtension.java → src/main/java/org/apache/lucene/queryparser/classic/FieldQueryExtension.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.apache.lucene.queryParser; package org.apache.lucene.queryparser.classic;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.index.query.QueryParseContext;

32
src/main/java/org/apache/lucene/queryParser/MapperQueryParser.java → src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.apache.lucene.queryParser; package org.apache.lucene.queryparser.classic;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
@ -25,7 +25,9 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.io.FastStringReader; import org.elasticsearch.common.io.FastStringReader;
import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.lucene.search.Queries;
@ -287,7 +289,7 @@ public class MapperQueryParser extends QueryParser {
} }
@Override @Override
protected Query getRangeQuery(String field, String part1, String part2, boolean inclusive) throws ParseException { protected Query getRangeQuery(String field, String part1, String part2, boolean startInclusive, boolean endInclusive) throws ParseException {
if ("*".equals(part1)) { if ("*".equals(part1)) {
part1 = null; part1 = null;
} }
@ -297,13 +299,13 @@ public class MapperQueryParser extends QueryParser {
Collection<String> fields = extractMultiFields(field); Collection<String> fields = extractMultiFields(field);
if (fields != null) { if (fields != null) {
if (fields.size() == 1) { if (fields.size() == 1) {
return getRangeQuerySingle(fields.iterator().next(), part1, part2, inclusive); return getRangeQuerySingle(fields.iterator().next(), part1, part2, startInclusive, endInclusive);
} }
if (settings.useDisMax()) { if (settings.useDisMax()) {
DisjunctionMaxQuery disMaxQuery = new DisjunctionMaxQuery(settings.tieBreaker()); DisjunctionMaxQuery disMaxQuery = new DisjunctionMaxQuery(settings.tieBreaker());
boolean added = false; boolean added = false;
for (String mField : fields) { for (String mField : fields) {
Query q = getRangeQuerySingle(mField, part1, part2, inclusive); Query q = getRangeQuerySingle(mField, part1, part2, startInclusive, endInclusive);
if (q != null) { if (q != null) {
added = true; added = true;
applyBoost(mField, q); applyBoost(mField, q);
@ -317,7 +319,7 @@ public class MapperQueryParser extends QueryParser {
} else { } else {
List<BooleanClause> clauses = new ArrayList<BooleanClause>(); List<BooleanClause> clauses = new ArrayList<BooleanClause>();
for (String mField : fields) { for (String mField : fields) {
Query q = getRangeQuerySingle(mField, part1, part2, inclusive); Query q = getRangeQuerySingle(mField, part1, part2, startInclusive, endInclusive);
if (q != null) { if (q != null) {
applyBoost(mField, q); applyBoost(mField, q);
clauses.add(new BooleanClause(q, BooleanClause.Occur.SHOULD)); clauses.add(new BooleanClause(q, BooleanClause.Occur.SHOULD));
@ -328,18 +330,18 @@ public class MapperQueryParser extends QueryParser {
return getBooleanQuery(clauses, true); return getBooleanQuery(clauses, true);
} }
} else { } else {
return getRangeQuerySingle(field, part1, part2, inclusive); return getRangeQuerySingle(field, part1, part2, startInclusive, endInclusive);
} }
} }
private Query getRangeQuerySingle(String field, String part1, String part2, boolean inclusive) { private Query getRangeQuerySingle(String field, String part1, String part2, boolean startInclusive, boolean endInclusive) {
currentMapper = null; currentMapper = null;
MapperService.SmartNameFieldMappers fieldMappers = parseContext.smartFieldMappers(field); MapperService.SmartNameFieldMappers fieldMappers = parseContext.smartFieldMappers(field);
if (fieldMappers != null) { if (fieldMappers != null) {
currentMapper = fieldMappers.fieldMappers().mapper(); currentMapper = fieldMappers.fieldMappers().mapper();
if (currentMapper != null) { if (currentMapper != null) {
try { try {
Query rangeQuery = currentMapper.rangeQuery(part1, part2, inclusive, inclusive, parseContext); Query rangeQuery = currentMapper.rangeQuery(part1, part2, startInclusive, startInclusive, parseContext);
return wrapSmartNameQuery(rangeQuery, fieldMappers, parseContext); return wrapSmartNameQuery(rangeQuery, fieldMappers, parseContext);
} catch (RuntimeException e) { } catch (RuntimeException e) {
if (settings.lenient()) { if (settings.lenient()) {
@ -349,7 +351,7 @@ public class MapperQueryParser extends QueryParser {
} }
} }
} }
return newRangeQuery(field, part1, part2, inclusive); return newRangeQuery(field, part1, part2, startInclusive, endInclusive);
} }
@Override @Override
@ -410,7 +412,11 @@ public class MapperQueryParser extends QueryParser {
@Override @Override
protected Query newFuzzyQuery(Term term, float minimumSimilarity, int prefixLength) { protected Query newFuzzyQuery(Term term, float minimumSimilarity, int prefixLength) {
FuzzyQuery query = new FuzzyQuery(term, minimumSimilarity, prefixLength, settings.fuzzyMaxExpansions()); String text = term.text();
int numEdits = FuzzyQuery.floatToEdits(minimumSimilarity,
text.codePointCount(0, text.length()));
//LUCENE 4 UPGRADE I disabled transpositions here by default - maybe this needs to be changed
FuzzyQuery query = new FuzzyQuery(term, numEdits, prefixLength, settings.fuzzyMaxExpansions(), false);
QueryParsers.setRewriteMethod(query, settings.fuzzyRewriteMethod()); QueryParsers.setRewriteMethod(query, settings.fuzzyRewriteMethod());
return query; return query;
} }
@ -503,7 +509,7 @@ public class MapperQueryParser extends QueryParser {
// get Analyzer from superclass and tokenize the term // get Analyzer from superclass and tokenize the term
TokenStream source; TokenStream source;
try { try {
source = getAnalyzer().reusableTokenStream(field, new StringReader(termStr)); source = getAnalyzer().tokenStream(field, new StringReader(termStr));
} catch (IOException e) { } catch (IOException e) {
return super.getPrefixQuery(field, termStr); return super.getPrefixQuery(field, termStr);
} }
@ -631,7 +637,7 @@ public class MapperQueryParser extends QueryParser {
if (c == '?' || c == '*') { if (c == '?' || c == '*') {
if (isWithinToken) { if (isWithinToken) {
try { try {
TokenStream source = getAnalyzer().reusableTokenStream(field, new FastStringReader(tmp.toString())); TokenStream source = getAnalyzer().tokenStream(field, new FastStringReader(tmp.toString()));
CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class); CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
if (source.incrementToken()) { if (source.incrementToken()) {
String term = termAtt.toString(); String term = termAtt.toString();
@ -660,7 +666,7 @@ public class MapperQueryParser extends QueryParser {
} }
if (isWithinToken) { if (isWithinToken) {
try { try {
TokenStream source = getAnalyzer().reusableTokenStream(field, new FastStringReader(tmp.toString())); TokenStream source = getAnalyzer().tokenStream(field, new FastStringReader(tmp.toString()));
CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class); CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class);
if (source.incrementToken()) { if (source.incrementToken()) {
String term = termAtt.toString(); String term = termAtt.toString();

2
src/main/java/org/apache/lucene/queryParser/MissingFieldQueryExtension.java → src/main/java/org/apache/lucene/queryparser/classic/MissingFieldQueryExtension.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.apache.lucene.queryParser; package org.apache.lucene.queryparser.classic;
import org.apache.lucene.search.DeletionAwareConstantScoreQuery; import org.apache.lucene.search.DeletionAwareConstantScoreQuery;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;

2
src/main/java/org/apache/lucene/queryParser/QueryParserSettings.java → src/main/java/org/apache/lucene/queryparser/classic/QueryParserSettings.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.apache.lucene.queryParser; package org.apache.lucene.queryparser.classic;
import gnu.trove.map.hash.TObjectFloatHashMap; import gnu.trove.map.hash.TObjectFloatHashMap;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;

2
src/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCache.java vendored
View File

@ -19,7 +19,7 @@
package org.elasticsearch.index.cache.query.parser; package org.elasticsearch.index.cache.query.parser;
import org.apache.lucene.queryParser.QueryParserSettings; import org.apache.lucene.queryparser.classic.QueryParserSettings;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.elasticsearch.common.component.CloseableComponent; import org.elasticsearch.common.component.CloseableComponent;
import org.elasticsearch.index.IndexComponent; import org.elasticsearch.index.IndexComponent;

2
src/main/java/org/elasticsearch/index/cache/query/parser/none/NoneQueryParserCache.java vendored
View File

@ -19,7 +19,7 @@
package org.elasticsearch.index.cache.query.parser.none; package org.elasticsearch.index.cache.query.parser.none;
import org.apache.lucene.queryParser.QueryParserSettings; import org.apache.lucene.queryparser.classic.QueryParserSettings;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;

3
src/main/java/org/elasticsearch/index/cache/query/parser/resident/ResidentQueryParserCache.java vendored
View File

@ -21,7 +21,8 @@ package org.elasticsearch.index.cache.query.parser.resident;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import org.apache.lucene.queryParser.QueryParserSettings;
import org.apache.lucene.queryparser.classic.QueryParserSettings;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;

2
src/main/java/org/elasticsearch/index/cache/query/parser/support/AbstractJvmQueryParserCache.java vendored
View File

@ -19,7 +19,7 @@
package org.elasticsearch.index.cache.query.parser.support; package org.elasticsearch.index.cache.query.parser.support;
import org.apache.lucene.queryParser.QueryParserSettings; import org.apache.lucene.queryparser.classic.QueryParserSettings;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;

12
src/main/java/org/elasticsearch/index/query/FieldQueryParser.java
View File

@ -19,9 +19,9 @@
package org.elasticsearch.index.query; package org.elasticsearch.index.query;
import org.apache.lucene.queryParser.MapperQueryParser; import org.apache.lucene.queryparser.classic.MapperQueryParser;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryParser.QueryParserSettings; import org.apache.lucene.queryparser.classic.QueryParserSettings;
import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;
@ -108,9 +108,9 @@ public class FieldQueryParser implements QueryParser {
} else if ("default_operator".equals(currentFieldName) || "defaultOperator".equals(currentFieldName)) { } else if ("default_operator".equals(currentFieldName) || "defaultOperator".equals(currentFieldName)) {
String op = parser.text(); String op = parser.text();
if ("or".equalsIgnoreCase(op)) { if ("or".equalsIgnoreCase(op)) {
qpSettings.defaultOperator(org.apache.lucene.queryParser.QueryParser.Operator.OR); qpSettings.defaultOperator(org.apache.lucene.queryparser.classic.QueryParser.Operator.OR);
} else if ("and".equalsIgnoreCase(op)) { } else if ("and".equalsIgnoreCase(op)) {
qpSettings.defaultOperator(org.apache.lucene.queryParser.QueryParser.Operator.AND); qpSettings.defaultOperator(org.apache.lucene.queryparser.classic.QueryParser.Operator.AND);
} else { } else {
throw new QueryParsingException(parseContext.index(), "Query default operator [" + op + "] is not allowed"); throw new QueryParsingException(parseContext.index(), "Query default operator [" + op + "] is not allowed");
} }
@ -152,7 +152,7 @@ public class FieldQueryParser implements QueryParser {
} }
if (qpSettings.escape()) { if (qpSettings.escape()) {
qpSettings.queryString(org.apache.lucene.queryParser.QueryParser.escape(qpSettings.queryString())); qpSettings.queryString(org.apache.lucene.queryparser.classic.QueryParser.escape(qpSettings.queryString()));
} }
qpSettings.queryTypes(parseContext.queryTypes()); qpSettings.queryTypes(parseContext.queryTypes());