Skip to content

Commit 6349cb3

Browse files
cbismuthcbismuth
committed
Set per query builder "boost" and "query name" support (#28390)
1 parent 6effd0a commit 6349cb3

50 files changed

Lines changed: 560 additions & 29 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/mapper-extras/src/test/java/org/elasticsearch/index/query/FeatureQueryBuilderTests.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@
4343

4444
public class FeatureQueryBuilderTests extends AbstractQueryTestCase<FeatureQueryBuilder> {
4545

46+
@Override
47+
protected boolean supportsBoost() {
48+
return true;
49+
}
50+
51+
@Override
52+
protected boolean supportsQueryName() {
53+
return true;
54+
}
55+
4656
@Override
4757
protected void initializeAdditionalMappings(MapperService mapperService) throws IOException {
4858
mapperService.merge("_doc", new CompressedXContent(Strings.toString(PutMappingRequest.buildFromSimplifiedDef("_doc",

‎modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@ public class HasChildQueryBuilderTests extends AbstractQueryTestCase<HasChildQue
8282

8383
boolean requiresRewrite = false;
8484

85+
@Override
86+
protected boolean supportsBoost() {
87+
return true;
88+
}
89+
90+
@Override
91+
protected boolean supportsQueryName() {
92+
return true;
93+
}
94+
8595
@Override
8696
protected Collection<Class<? extends Plugin>> getPlugins() {
8797
return Collections.singletonList(ParentJoinPlugin.class);

‎modules/parent-join/src/test/java/org/elasticsearch/join/query/HasParentQueryBuilderTests.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ public class HasParentQueryBuilderTests extends AbstractQueryTestCase<HasParentQ
6767

6868
boolean requiresRewrite = false;
6969

70+
@Override
71+
protected boolean supportsBoost() {
72+
return true;
73+
}
74+
75+
@Override
76+
protected boolean supportsQueryName() {
77+
return true;
78+
}
79+
7080
@Override
7181
protected Collection<Class<? extends Plugin>> getPlugins() {
7282
return Collections.singletonList(ParentJoinPlugin.class);

‎modules/parent-join/src/test/java/org/elasticsearch/join/query/ParentIdQueryBuilderTests.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@ public class ParentIdQueryBuilderTests extends AbstractQueryTestCase<ParentIdQue
5656
private static final String PARENT_NAME = "parent";
5757
private static final String CHILD_NAME = "child";
5858

59+
@Override
60+
protected boolean supportsBoost() {
61+
return true;
62+
}
63+
64+
@Override
65+
protected boolean supportsQueryName() {
66+
return true;
67+
}
68+
5969
@Override
6070
protected Collection<Class<? extends Plugin>> getPlugins() {
6171
return Collections.singletonList(ParentJoinPlugin.class);
@@ -153,5 +163,4 @@ public void testIgnoreUnmapped() throws IOException {
153163
QueryShardException e = expectThrows(QueryShardException.class, () -> failingQueryBuilder.toQuery(createShardContext()));
154164
assertThat(e.getMessage(), containsString("[" + ParentIdQueryBuilder.NAME + "] no relation found for child [unmapped]"));
155165
}
156-
157166
}

‎modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ public class PercolateQueryBuilderTests extends AbstractQueryTestCase<PercolateQ
7777

7878
private boolean indexedDocumentExists = true;
7979

80+
@Override
81+
protected boolean supportsBoost() {
82+
return true;
83+
}
84+
85+
@Override
86+
protected boolean supportsQueryName() {
87+
return true;
88+
}
89+
8090
@Override
8191
protected Collection<Class<? extends Plugin>> getPlugins() {
8292
return Collections.singleton(PercolatorPlugin.class);
@@ -301,5 +311,4 @@ public void testFieldAlias() throws IOException {
301311
assertEquals(query.getCandidateMatchesQuery(), aliasQuery.getCandidateMatchesQuery());
302312
assertEquals(query.getVerifiedMatchesQuery(), aliasQuery.getVerifiedMatchesQuery());
303313
}
304-
305314
}

‎server/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,11 @@ public static SpanOrQueryBuilder fromXContent(XContentParser parser) throws IOEx
114114
if (query instanceof SpanQueryBuilder == false) {
115115
throw new ParsingException(parser.getTokenLocation(), "spanOr [clauses] must be of type span query");
116116
}
117-
clauses.add((SpanQueryBuilder) query);
117+
final SpanQueryBuilder clause = (SpanQueryBuilder) query;
118+
if (clause.boost() != AbstractQueryBuilder.DEFAULT_BOOST) {
119+
throw new ParsingException(parser.getTokenLocation(), "spanOr [clauses] can't have boost value");
120+
}
121+
clauses.add(clause);
118122
}
119123
} else {
120124
throw new ParsingException(parser.getTokenLocation(), "[span_or] query does not support [" + currentFieldName + "]");

‎server/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@ public class RangeFieldQueryStringQueryBuilderTests extends AbstractQueryTestCas
5353
private static final String DATE_RANGE_FIELD_NAME = "mapped_date_range";
5454
private static final String IP_RANGE_FIELD_NAME = "mapped_ip_range";
5555

56+
@Override
57+
protected boolean supportsBoost() {
58+
return true;
59+
}
60+
61+
@Override
62+
protected boolean supportsQueryName() {
63+
return true;
64+
}
65+
5666
@Override
5767
protected void initializeAdditionalMappings(MapperService mapperService) throws IOException {
5868
mapperService.merge("_doc", new CompressedXContent(Strings.toString(PutMappingRequest.buildFromSimplifiedDef("_doc",

‎server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,17 @@
4848
import static org.hamcrest.CoreMatchers.instanceOf;
4949

5050
public class BoolQueryBuilderTests extends AbstractQueryTestCase<BoolQueryBuilder> {
51+
52+
@Override
53+
protected boolean supportsBoost() {
54+
return true;
55+
}
56+
57+
@Override
58+
protected boolean supportsQueryName() {
59+
return true;
60+
}
61+
5162
@Override
5263
protected BoolQueryBuilder doCreateTestQueryBuilder() {
5364
BoolQueryBuilder query = new BoolQueryBuilder();

‎server/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@
3131

3232
public class BoostingQueryBuilderTests extends AbstractQueryTestCase<BoostingQueryBuilder> {
3333

34+
@Override
35+
protected boolean supportsBoost() {
36+
return true;
37+
}
38+
39+
@Override
40+
protected boolean supportsQueryName() {
41+
return true;
42+
}
43+
3444
@Override
3545
protected BoostingQueryBuilder doCreateTestQueryBuilder() {
3646
BoostingQueryBuilder query = new BoostingQueryBuilder(RandomQueryBuilder.createQuery(random()), RandomQueryBuilder.createQuery(random()));

‎server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@
3939

4040
public class CommonTermsQueryBuilderTests extends AbstractQueryTestCase<CommonTermsQueryBuilder> {
4141

42+
@Override
43+
protected boolean supportsBoost() {
44+
return true;
45+
}
46+
47+
@Override
48+
protected boolean supportsQueryName() {
49+
return true;
50+
}
51+
4252
@Override
4353
protected CommonTermsQueryBuilder doCreateTestQueryBuilder() {
4454
int numberOfTerms = randomIntBetween(0, 10);

0 commit comments

Comments
 (0)