honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-25 09:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename tieBreakerMultiplier to tieBreaker

Browse Source
This commit is contained in:
kimchy 2010-03-20 18:52:21 +02:00
parent 35bd7f0086
commit 52af5573f1
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/json/DisMaxJsonQueryBuilder.java
View File

@ -39,7 +39,7 @@ public class DisMaxJsonQueryBuilder extends BaseJsonQueryBuilder {
private float boost = -1;
private float tieBreakerMultiplier = -1;
private float tieBreaker = -1;
/**
* Add a sub-query to this disjunction.
@ -64,15 +64,15 @@ public class DisMaxJsonQueryBuilder extends BaseJsonQueryBuilder {
* 10 occurrences of word in a lower-scored field that is also in a higher scored field is just as good as a unique
* word in the lower scored field (i.e., one that is not in any higher scored field.
*/
public DisMaxJsonQueryBuilder tieBreaker(float tieBreakerMultiplier) {
this.tieBreakerMultiplier = tieBreakerMultiplier;
public DisMaxJsonQueryBuilder tieBreaker(float tieBreaker) {
this.tieBreaker = tieBreaker;
return this;
}
@Override protected void doJson(JsonBuilder builder, Params params) throws IOException {
builder.startObject("disMax");
if (tieBreakerMultiplier != -1) {
builder.field("tieBreakerMultiplier", tieBreakerMultiplier);
if (tieBreaker != -1) {
builder.field("tieBreaker", tieBreaker);
}
if (boost != -1) {
builder.field("boost", boost);

16
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/json/DisMaxJsonQueryParser.java
View File

@ -36,7 +36,7 @@ import java.util.List;
import static com.google.common.collect.Lists.*;
/**
* @author kimchy (Shay Banon)
* @author kimchy (shay.banon)
*/
public class DisMaxJsonQueryParser extends AbstractIndexComponent implements JsonQueryParser {
@ -52,7 +52,7 @@ public class DisMaxJsonQueryParser extends AbstractIndexComponent implements Jso
JsonParser jp = parseContext.jp();
float boost = 1.0f;
float tieBreakerMultiplier = 0.0f;
float tieBreaker = 0.0f;
List<Query> queries = newArrayList();
@ -79,23 +79,17 @@ public class DisMaxJsonQueryParser extends AbstractIndexComponent implements Jso
} else {
boost = jp.getFloatValue();
}
} else if ("tieBreakerMultiplier".equals(currentFieldName)) {
if (token == JsonToken.VALUE_STRING) {
tieBreakerMultiplier = Float.parseFloat(jp.getText());
} else {
tieBreakerMultiplier = jp.getFloatValue();
}
} else if ("tieBreaker".equals(currentFieldName)) {
if (token == JsonToken.VALUE_STRING) {
tieBreakerMultiplier = Float.parseFloat(jp.getText());
tieBreaker = Float.parseFloat(jp.getText());
} else {
tieBreakerMultiplier = jp.getFloatValue();
tieBreaker = jp.getFloatValue();
}
}
}
}
DisjunctionMaxQuery query = new DisjunctionMaxQuery(queries, tieBreakerMultiplier);
DisjunctionMaxQuery query = new DisjunctionMaxQuery(queries, tieBreaker);
query.setBoost(boost);
return query;
}

2
modules/elasticsearch/src/test/java/org/elasticsearch/index/query/json/disMax.json
View File

@ -1,6 +1,6 @@
{
disMax : {
tieBreakerMultiplier : 0.7,
tieBreaker: 0.7,
boost: 1.2,
queries : [
{