Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Validation for maxQueryTerms to be greater than 0 for MoreLikeThisQuery #49966

Merged
merged 4 commits into from
Dec 9, 2019
Merged

Add Validation for maxQueryTerms to be greater than 0 for MoreLikeThisQuery #49966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e13b8a
Add Validation for maxQueryTerms to be greater than 0 for MoreLikeThi…
vishnuchilamakuru Dec 7, 2019
d086d8d
Revert rpm.asciidoc changes
vishnuchilamakuru Dec 7, 2019
e0cb52c
Revert rpm.asciidoc changes
vishnuchilamakuru Dec 7, 2019
0a118a2
Merge branch 'master' into mltquerybuilder-validation
elasticmachine Dec 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,9 @@ public int getMaxQueryTerms() {
}

public void setMaxQueryTerms(int maxQueryTerms) {
if (maxQueryTerms <= 0) {
throw new IllegalArgumentException("requires 'maxQueryTerms' to be greater than 0");
}
this.maxQueryTerms = maxQueryTerms;
}

Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,9 @@ public Item[] unlikeItems() {
* Defaults to {@code 25}.
*/
public MoreLikeThisQueryBuilder maxQueryTerms(int maxQueryTerms) {
if (maxQueryTerms <= 0) {
throw new IllegalArgumentException("requires 'maxQueryTerms' to be greater than 0");
}
this.maxQueryTerms = maxQueryTerms;
return this;
}
Expand Down
12 changes: 12 additions & 0 deletions ...test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.elasticsearch.common.lucene.search.MoreLikeThisQuery;
import org.elasticsearch.test.ESTestCase;

import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;

public class MoreLikeThisQueryTests extends ESTestCase {
Expand Down Expand Up @@ -64,4 +65,15 @@ public void testSimple() throws Exception {
reader.close();
indexWriter.close();
}

public void testValidateMaxQueryTerms() {
IllegalArgumentException e1 = expectThrows(IllegalArgumentException.class,
() -> new MoreLikeThisQuery("lucene", new String[]{"text"}, Lucene.STANDARD_ANALYZER).setMaxQueryTerms(0));
assertThat(e1.getMessage(), containsString("requires 'maxQueryTerms' to be greater than 0"));

IllegalArgumentException e2 = expectThrows(IllegalArgumentException.class,
() -> new MoreLikeThisQuery("lucene", new String[]{"text"}, Lucene.STANDARD_ANALYZER).setMaxQueryTerms(-3));
assertThat(e2.getMessage(), containsString("requires 'maxQueryTerms' to be greater than 0"));
}

}
12 changes: 11 additions & 1 deletion server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ protected MoreLikeThisQueryBuilder doCreateTestQueryBuilder() {
queryBuilder.unlike(randomUnlikeItems);
}
if (randomBoolean()) {
queryBuilder.maxQueryTerms(randomInt(25));
queryBuilder.maxQueryTerms(randomIntBetween(1, 25));
}
if (randomBoolean()) {
queryBuilder.minTermFreq(randomInt(5));
Expand Down Expand Up @@ -340,6 +340,16 @@ public void testMoreLikeThisBuilder() throws Exception {
assertThat(mltQuery.getMaxQueryTerms(), equalTo(12));
}

public void testValidateMaxQueryTerms() {
IllegalArgumentException e1 = expectThrows(IllegalArgumentException.class,
() -> new MoreLikeThisQueryBuilder(new String[]{"name.first", "name.last"}, new String[]{"something"}, null).maxQueryTerms(0));
assertThat(e1.getMessage(), containsString("requires 'maxQueryTerms' to be greater than 0"));

IllegalArgumentException e2 = expectThrows(IllegalArgumentException.class,
() -> new MoreLikeThisQueryBuilder(new String[]{"name.first", "name.last"}, new String[]{"something"}, null).maxQueryTerms(-3));
assertThat(e2.getMessage(), containsString("requires 'maxQueryTerms' to be greater than 0"));
}

public void testItemSerialization() throws IOException {
Item expectedItem = generateRandomItem();
BytesStreamOutput output = new BytesStreamOutput();
Expand Down