Skip to content

Commit b740da3

Browse files
committed
Revert "Add 0.0f boosts to all non-full text functions queries"
This reverts commit 4f291ad.
1 parent 706f59b commit b740da3

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/ExistsQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public ExistsQuery(Source source, String name) {
2222

2323
@Override
2424
public QueryBuilder asBuilder() {
25-
return existsQuery(name).boost(0.0f);
25+
return existsQuery(name);
2626
}
2727

2828
@Override

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/GeoDistanceQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public double distance() {
4646

4747
@Override
4848
public QueryBuilder asBuilder() {
49-
return QueryBuilders.geoDistanceQuery(field).distance(distance, DistanceUnit.METERS).point(lat, lon).boost(0.0f);
49+
return QueryBuilders.geoDistanceQuery(field).distance(distance, DistanceUnit.METERS).point(lat, lon);
5050
}
5151

5252
@Override

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/MatchAll.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public MatchAll(Source source) {
1818

1919
@Override
2020
public QueryBuilder asBuilder() {
21-
return matchAllQuery().boost(0.0f);
21+
return matchAllQuery();
2222
}
2323

2424
@Override

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/NotQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public Query child() {
3333

3434
@Override
3535
public QueryBuilder asBuilder() {
36-
return boolQuery().mustNot(child.asBuilder()).boost(0.0f);
36+
return boolQuery().mustNot(child.asBuilder());
3737
}
3838

3939
@Override

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/PrefixQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public String query() {
3535

3636
@Override
3737
public QueryBuilder asBuilder() {
38-
return prefixQuery(field, query).caseInsensitive(caseInsensitive).boost(0.0f);
38+
return prefixQuery(field, query).caseInsensitive(caseInsensitive);
3939
}
4040

4141
@Override

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/QueryStringQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public QueryStringQuery(Source source, String query, Map<String, Float> fields,
6565

6666
@Override
6767
public QueryBuilder asBuilder() {
68-
final QueryStringQueryBuilder queryBuilder = QueryBuilders.queryStringQuery(query).boost(0.0f);
68+
final QueryStringQueryBuilder queryBuilder = QueryBuilders.queryStringQuery(query);
6969
queryBuilder.fields(fields);
7070
options.forEach((k, v) -> {
7171
if (BUILDER_APPLIERS.containsKey(k)) {

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/RangeQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public QueryBuilder asBuilder() {
8686
queryBuilder.timeZone(zoneId.getId());
8787
}
8888

89-
return queryBuilder.boost(0.0f);
89+
return queryBuilder;
9090
}
9191

9292
@Override

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/RegexQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public Boolean caseInsensitive() {
4343

4444
@Override
4545
public QueryBuilder asBuilder() {
46-
return regexpQuery(field, regex).caseInsensitive(caseInsensitive).boost(0.0f);
46+
return regexpQuery(field, regex).caseInsensitive(caseInsensitive);
4747
}
4848

4949
@Override

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/TermQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public Boolean caseInsensitive() {
4545

4646
@Override
4747
public QueryBuilder asBuilder() {
48-
TermQueryBuilder qb = termQuery(term, value).boost(0.0f);
48+
TermQueryBuilder qb = termQuery(term, value);
4949
// ES does not allow case_insensitive to be set to "false", it should be either "true" or not specified
5050
return caseInsensitive == false ? qb : qb.caseInsensitive(caseInsensitive);
5151
}

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/querydsl/query/TermsQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public TermsQuery(Source source, String term, Set<Object> values) {
2727

2828
@Override
2929
public QueryBuilder asBuilder() {
30-
return termsQuery(term, values).boost(0.0f);
30+
return termsQuery(term, values);
3131
}
3232

3333
@Override

0 commit comments

Comments
 (0)