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

More Like This Query: allow for both 'like_text' and 'docs/ids' to be specified. 

Closes #6246
This commit is contained in:
Alex Ksikes 2014-05-20 15:58:26 +02:00
parent a717af505a
commit 2546c06131
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/query-dsl/queries/mlt-query.asciidoc
View File

@ -74,7 +74,7 @@ The `more_like_this` top level parameters include:
|`fields` |A list of the fields to run the more like this query against.
Defaults to the `_all` field.
|`like_text` |The text to find documents like it, *required* if `ids` is
|`like_text` |The text to find documents like it, *required* if `ids` or `docs` are
not specified.
|`ids` or `docs` |A list of documents following the same syntax as the

8
src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
View File

@ -158,8 +158,8 @@ public class MoreLikeThisQueryParser implements QueryParser {
}
}
if ((mltQuery.getLikeText() == null && items.isEmpty()) || (mltQuery.getLikeText() != null && !items.isEmpty())) {
throw new QueryParsingException(parseContext.index(), "more_like_this requires either 'like_text' or 'ids/docs' to be specified");
if (mltQuery.getLikeText() == null && items.isEmpty()) {
throw new QueryParsingException(parseContext.index(), "more_like_this requires at least 'like_text' or 'ids/docs' to be specified");
}
if (analyzer == null) {
@ -217,6 +217,10 @@ public class MoreLikeThisQueryParser implements QueryParser {
ConstantScoreQuery query = new ConstantScoreQuery(filter);
boolQuery.add(query, BooleanClause.Occur.MUST_NOT);
}
// add the possible mlt query with like_text
if (mltQuery.getLikeText() != null) {
boolQuery.add(mltQuery, BooleanClause.Occur.SHOULD);
}
return boolQuery;
}

19
src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
View File

@ -1696,16 +1696,25 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(BooleanQuery.class));
BooleanQuery booleanQuery = (BooleanQuery) parsedQuery;
assertThat(booleanQuery.getClauses().length, is(likeTexts.size()));
assertThat(booleanQuery.getClauses().length, is(likeTexts.size() + 1));
// check each clause is for each item
BooleanClause[] boolClauses = booleanQuery.getClauses();
for (int i=0; i<likeTexts.size(); i++) {
BooleanClause booleanClause = booleanQuery.getClauses()[i];
assertThat(booleanClause.getOccur(), is(BooleanClause.Occur.SHOULD));
assertThat(booleanClause.getQuery(), instanceOf(MoreLikeThisQuery.class));
MoreLikeThisQuery mltQuery = (MoreLikeThisQuery) booleanClause.getQuery();
assertThat(boolClauses[i].getOccur(), is(BooleanClause.Occur.SHOULD));
assertThat(boolClauses[i].getQuery(), instanceOf(MoreLikeThisQuery.class));
MoreLikeThisQuery mltQuery = (MoreLikeThisQuery) boolClauses[i].getQuery();
assertThat(mltQuery.getLikeText(), is(likeTexts.get(i).text));
assertThat(mltQuery.getMoreLikeFields()[0], equalTo(likeTexts.get(i).field));
}
// check last clause is for 'like_text'
BooleanClause boolClause = boolClauses[boolClauses.length - 1];
assertThat(boolClause.getOccur(), is(BooleanClause.Occur.SHOULD));
assertThat(boolClause.getQuery(), instanceOf(MoreLikeThisQuery.class));
MoreLikeThisQuery mltQuery = (MoreLikeThisQuery) boolClause.getQuery();
assertArrayEquals("Not the same more like this 'fields'", new String[] {"name.first", "name.last"}, mltQuery.getMoreLikeFields());
assertThat(mltQuery.getLikeText(), equalTo("Apache Lucene"));
}
private static class MockMoreLikeThisFetchService extends MoreLikeThisFetchService {

1
src/test/java/org/elasticsearch/index/query/mlt-ids.json
View File

@ -1,6 +1,7 @@
{
more_like_this:{
"fields" : ["name.first", "name.last"],
"like_text": "Apache Lucene",
"docs" : [
{
"_index" : "test",