honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-31 04:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch QueryBuilders to new MatchPhraseQueryBuilder

Browse Source 
It was doing deprecated things with MatchQueryBuilder.
This commit is contained in:
Nik Everett 2016-06-06 13:43:33 -04:00
parent 90f2aab9a9
commit a405c2ba99
2 changed files with 11 additions and 14 deletions
core/src
main/java/org/elasticsearch/index/query
QueryBuilders.java
test/java/org/elasticsearch/search/query
MultiMatchQueryIT.java

11
core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java

@ -27,7 +27,6 @@ import org.elasticsearch.common.geo.builders.ShapeBuilder;
import org.elasticsearch.index.query.MoreLikeThisQueryBuilder.Item;
import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
import org.elasticsearch.index.search.MatchQuery;
import org.elasticsearch.indices.TermsLookup;
import org.elasticsearch.script.Script;
import org.elasticsearch.script.ScriptService;
@ -57,7 +56,7 @@ public abstract class QueryBuilders {
* @param text The query text (to be analyzed).
*/
public static MatchQueryBuilder matchQuery(String name, Object text) {
return new MatchQueryBuilder(name, text).type(MatchQuery.Type.BOOLEAN);
return new MatchQueryBuilder(name, text);
}
/**
@ -86,8 +85,8 @@ public abstract class QueryBuilders {
* @param name The field name.
* @param text The query text (to be analyzed).
*/
public static MatchQueryBuilder matchPhraseQuery(String name, Object text) {
return new MatchQueryBuilder(name, text).type(MatchQuery.Type.PHRASE);
public static MatchPhraseQueryBuilder matchPhraseQuery(String name, Object text) {
return new MatchPhraseQueryBuilder(name, text);
}
/**
@ -96,8 +95,8 @@ public abstract class QueryBuilders {
* @param name The field name.
* @param text The query text (to be analyzed).
*/
public static MatchQueryBuilder matchPhrasePrefixQuery(String name, Object text) {
return new MatchQueryBuilder(name, text).type(MatchQuery.Type.PHRASE_PREFIX);
public static MatchPhrasePrefixQueryBuilder matchPhrasePrefixQuery(String name, Object text) {
return new MatchPhrasePrefixQueryBuilder(name, text);
}
/**

14
core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java

@ -386,7 +386,6 @@ public class MultiMatchQueryIT extends ESIntegTestCase {
{
String minShouldMatch = randomBoolean() ? null : "" + between(0, 1);
Operator op = randomBoolean() ? Operator.AND : Operator.OR;
SearchResponse left = client().prepareSearch("test").setSize(numDocs)
.addSort(SortBuilders.scoreSort()).addSort(SortBuilders.fieldSort("_uid"))
.setQuery(randomizeType(multiMatchQuery("capta", "full_name", "first_name", "last_name", "category")
@ -396,15 +395,14 @@ public class MultiMatchQueryIT extends ESIntegTestCase {
.addSort(SortBuilders.scoreSort()).addSort(SortBuilders.fieldSort("_uid"))
.setQuery(boolQuery().minimumShouldMatch(minShouldMatch)
.should(matchPhrasePrefixQuery("full_name", "capta"))
.should(matchPhrasePrefixQuery("first_name", "capta").operator(op))
.should(matchPhrasePrefixQuery("last_name", "capta").operator(op))
.should(matchPhrasePrefixQuery("category", "capta").operator(op))
.should(matchPhrasePrefixQuery("first_name", "capta"))
.should(matchPhrasePrefixQuery("last_name", "capta"))
.should(matchPhrasePrefixQuery("category", "capta"))
).get();
assertEquivalent("capta", left, right);
}
{
String minShouldMatch = randomBoolean() ? null : "" + between(0, 1);
Operator op = randomBoolean() ? Operator.AND : Operator.OR;
SearchResponse left;
if (randomBoolean()) {
left = client().prepareSearch("test").setSize(numDocs)
@ -421,9 +419,9 @@ public class MultiMatchQueryIT extends ESIntegTestCase {
.addSort(SortBuilders.scoreSort()).addSort(SortBuilders.fieldSort("_uid"))
.setQuery(boolQuery().minimumShouldMatch(minShouldMatch)
.should(matchPhraseQuery("full_name", "captain america"))
.should(matchPhraseQuery("first_name", "captain america").operator(op))
.should(matchPhraseQuery("last_name", "captain america").operator(op))
.should(matchPhraseQuery("category", "captain america").operator(op))
.should(matchPhraseQuery("first_name", "captain america"))
.should(matchPhraseQuery("last_name", "captain america"))
.should(matchPhraseQuery("category", "captain america"))
).get();
assertEquivalent("captain america", left, right);
}