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

Fix behavior on default boost factor for More Like This. 

A boost terms factor of 1.0 is not the same as no boosting of terms.
The desired behavior is to deactivate boosting by default. If the user
specifies any value other than 0, then boosting is activated.

Closes #6021
This commit is contained in:
Alex Ksikes 2014-05-02 15:52:29 +02:00
parent d5f90e9803
commit b55d8ed2e3
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,8 @@ ignored. Defaults to `0`. (Old name "min_word_len" is deprecated)
ignored. Defaults to unbounded (`0`). (Old name "max_word_len" is deprecated) ignored. Defaults to unbounded (`0`). (Old name "max_word_len" is deprecated)
|`boost_terms` |Sets the boost factor to use when boosting terms. |`boost_terms` |Sets the boost factor to use when boosting terms.
Defaults to `1`. Defaults to deactivated (`0`). Any other value activates boosting with given
boost factor.
|`boost` |Sets the boost value of the query. Defaults to `1.0`. |`boost` |Sets the boost value of the query. Defaults to `1.0`.

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

@ -57,7 +57,8 @@ ignored. Defaults to `0`.(Old name "min_word_len" is deprecated)
ignored. Defaults to unbounded (`0`). (Old name "max_word_len" is deprecated) ignored. Defaults to unbounded (`0`). (Old name "max_word_len" is deprecated)
|`boost_terms` |Sets the boost factor to use when boosting terms. |`boost_terms` |Sets the boost factor to use when boosting terms.
Defaults to `1`. Defaults to deactivated (`0`). Any other value activates boosting with given
boost factor.
|`boost` |Sets the boost value of the query. Defaults to `1.0`. |`boost` |Sets the boost value of the query. Defaults to `1.0`.

7
src/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryParser.java
View File

@ -91,8 +91,11 @@ public class MoreLikeThisFieldQueryParser implements QueryParser {
} else if (MoreLikeThisQueryParser.Fields.MAX_WORD_LENGTH.match(currentFieldName,parseContext.parseFlags())) { } else if (MoreLikeThisQueryParser.Fields.MAX_WORD_LENGTH.match(currentFieldName,parseContext.parseFlags())) {
mltQuery.setMaxWordLen(parser.intValue()); mltQuery.setMaxWordLen(parser.intValue());
} else if (MoreLikeThisQueryParser.Fields.BOOST_TERMS.match(currentFieldName,parseContext.parseFlags())) { } else if (MoreLikeThisQueryParser.Fields.BOOST_TERMS.match(currentFieldName,parseContext.parseFlags())) {
mltQuery.setBoostTerms(true); float boostFactor = parser.floatValue();
mltQuery.setBoostTermsFactor(parser.floatValue()); if (boostFactor != 0) {
mltQuery.setBoostTerms(true);
mltQuery.setBoostTermsFactor(boostFactor);
}
} else if (MoreLikeThisQueryParser.Fields.PERCENT_TERMS_TO_MATCH.match(currentFieldName,parseContext.parseFlags())) { } else if (MoreLikeThisQueryParser.Fields.PERCENT_TERMS_TO_MATCH.match(currentFieldName,parseContext.parseFlags())) {
mltQuery.setPercentTermsToMatch(parser.floatValue()); mltQuery.setPercentTermsToMatch(parser.floatValue());
} else if ("analyzer".equals(currentFieldName)) { } else if ("analyzer".equals(currentFieldName)) {

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

@ -99,8 +99,11 @@ public class MoreLikeThisQueryParser implements QueryParser {
} else if (Fields.MAX_WORD_LENGTH.match(currentFieldName, parseContext.parseFlags())) { } else if (Fields.MAX_WORD_LENGTH.match(currentFieldName, parseContext.parseFlags())) {
mltQuery.setMaxWordLen(parser.intValue()); mltQuery.setMaxWordLen(parser.intValue());
} else if (Fields.BOOST_TERMS.match(currentFieldName, parseContext.parseFlags())) { } else if (Fields.BOOST_TERMS.match(currentFieldName, parseContext.parseFlags())) {
mltQuery.setBoostTerms(true); float boostFactor = parser.floatValue();
mltQuery.setBoostTermsFactor(parser.floatValue()); if (boostFactor != 0) {
mltQuery.setBoostTerms(true);
mltQuery.setBoostTermsFactor(boostFactor);
}
} else if (Fields.PERCENT_TERMS_TO_MATCH.match(currentFieldName, parseContext.parseFlags())) { } else if (Fields.PERCENT_TERMS_TO_MATCH.match(currentFieldName, parseContext.parseFlags())) {
mltQuery.setPercentTermsToMatch(parser.floatValue()); mltQuery.setPercentTermsToMatch(parser.floatValue());
} else if ("analyzer".equals(currentFieldName)) { } else if ("analyzer".equals(currentFieldName)) {