Skip to content

Commit 3f10cea

Browse files
colings86colings86
authored
Removes types from SearchRequest and QueryShardContext (#42112)
1 parent b960c20 commit 3f10cea

File tree

121 files changed

+380
-1212
lines changed

Some content is hidden

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

121 files changed

+380
-1212
lines changed

‎client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static Request update(UpdateRequest updateRequest) throws IOException {
391391
* searches.
392392
*/
393393
static Request search(SearchRequest searchRequest, String searchEndpoint) throws IOException {
394-
Request request = new Request(HttpPost.METHOD_NAME, endpoint(searchRequest.indices(), searchRequest.types(), searchEndpoint));
394+
Request request = new Request(HttpPost.METHOD_NAME, endpoint(searchRequest.indices(), searchEndpoint));
395395

396396
Params params = new Params(request);
397397
addSearchRequestParams(params, searchRequest);
@@ -455,7 +455,7 @@ static Request searchTemplate(SearchTemplateRequest searchTemplateRequest) throw
455455
request = new Request(HttpGet.METHOD_NAME, "_render/template");
456456
} else {
457457
SearchRequest searchRequest = searchTemplateRequest.getRequest();
458-
String endpoint = endpoint(searchRequest.indices(), searchRequest.types(), "_search/template");
458+
String endpoint = endpoint(searchRequest.indices(), "_search/template");
459459
request = new Request(HttpGet.METHOD_NAME, endpoint);
460460

461461
Params params = new Params(request);
@@ -551,8 +551,7 @@ private static Request prepareReindexRequest(ReindexRequest reindexRequest, bool
551551
}
552552

553553
static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) throws IOException {
554-
String endpoint =
555-
endpoint(updateByQueryRequest.indices(), updateByQueryRequest.getDocTypes(), "_update_by_query");
554+
String endpoint = endpoint(updateByQueryRequest.indices(), "_update_by_query");
556555
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
557556
Params params = new Params(request)
558557
.withRouting(updateByQueryRequest.getRouting())
@@ -579,8 +578,7 @@ static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) throws I
579578
}
580579

581580
static Request deleteByQuery(DeleteByQueryRequest deleteByQueryRequest) throws IOException {
582-
String endpoint =
583-
endpoint(deleteByQueryRequest.indices(), deleteByQueryRequest.getDocTypes(), "_delete_by_query");
581+
String endpoint = endpoint(deleteByQueryRequest.indices(), "_delete_by_query");
584582
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
585583
Params params = new Params(request)
586584
.withRouting(deleteByQueryRequest.getRouting())
@@ -710,10 +708,12 @@ static HttpEntity createEntity(ToXContent toXContent, XContentType xContentType,
710708
return new NByteArrayEntity(source.bytes, source.offset, source.length, createContentType(xContentType));
711709
}
712710

711+
@Deprecated
713712
static String endpoint(String index, String type, String id) {
714713
return new EndpointBuilder().addPathPart(index, type, id).build();
715714
}
716715

716+
@Deprecated
717717
static String endpoint(String index, String type, String id, String endpoint) {
718718
return new EndpointBuilder().addPathPart(index, type, id).addPathPartAsIs(endpoint).build();
719719
}
@@ -726,6 +726,7 @@ static String endpoint(String[] indices, String endpoint) {
726726
return new EndpointBuilder().addCommaSeparatedPathParts(indices).addPathPartAsIs(endpoint).build();
727727
}
728728

729+
@Deprecated
729730
static String endpoint(String[] indices, String[] types, String endpoint) {
730731
return new EndpointBuilder().addCommaSeparatedPathParts(indices).addCommaSeparatedPathParts(types)
731732
.addPathPartAsIs(endpoint).build();
@@ -736,6 +737,7 @@ static String endpoint(String[] indices, String endpoint, String[] suffixes) {
736737
.addCommaSeparatedPathParts(suffixes).build();
737738
}
738739

740+
@Deprecated
739741
static String endpoint(String[] indices, String endpoint, String type) {
740742
return new EndpointBuilder().addCommaSeparatedPathParts(indices).addPathPartAsIs(endpoint).addPathPart(type).build();
741743
}

‎client/rest-high-level/src/main/java/org/elasticsearch/client/RollupRequestConverters.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,6 @@ static Request deleteJob(final DeleteRollupJobRequest deleteRollupJobRequest) th
9595
}
9696

9797
static Request search(final SearchRequest request) throws IOException {
98-
if (request.types().length > 0) {
99-
/*
100-
* Ideally we'd check this with the standard validation framework
101-
* but we don't have a special request for rollup search so that'd
102-
* be difficult.
103-
*/
104-
ValidationException ve = new ValidationException();
105-
ve.addValidationError("types are not allowed in rollup search");
106-
throw ve;
107-
}
10898
return RequestConverters.search(request, "_rollup_search");
10999
}
110100

‎client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,6 @@ public void testReindex() throws IOException {
404404
);
405405
reindexRequest.setRemoteInfo(remoteInfo);
406406
}
407-
if (randomBoolean()) {
408-
reindexRequest.setSourceDocTypes("doc", "tweet");
409-
}
410407
if (randomBoolean()) {
411408
reindexRequest.setSourceBatchSize(randomInt(100));
412409
}
@@ -457,9 +454,6 @@ public void testUpdateByQuery() throws IOException {
457454
UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest();
458455
updateByQueryRequest.indices(randomIndicesNames(1, 5));
459456
Map<String, String> expectedParams = new HashMap<>();
460-
if (randomBoolean()) {
461-
updateByQueryRequest.setDocTypes(generateRandomStringArray(5, 5, false, false));
462-
}
463457
if (randomBoolean()) {
464458
int batchSize = randomInt(100);
465459
updateByQueryRequest.setBatchSize(batchSize);
@@ -505,8 +499,6 @@ public void testUpdateByQuery() throws IOException {
505499
Request request = RequestConverters.updateByQuery(updateByQueryRequest);
506500
StringJoiner joiner = new StringJoiner("/", "/", "");
507501
joiner.add(String.join(",", updateByQueryRequest.indices()));
508-
if (updateByQueryRequest.getDocTypes().length > 0)
509-
joiner.add(String.join(",", updateByQueryRequest.getDocTypes()));
510502
joiner.add("_update_by_query");
511503
assertEquals(joiner.toString(), request.getEndpoint());
512504
assertEquals(HttpPost.METHOD_NAME, request.getMethod());
@@ -518,9 +510,6 @@ public void testDeleteByQuery() throws IOException {
518510
DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest();
519511
deleteByQueryRequest.indices(randomIndicesNames(1, 5));
520512
Map<String, String> expectedParams = new HashMap<>();
521-
if (randomBoolean()) {
522-
deleteByQueryRequest.setDocTypes(generateRandomStringArray(5, 5, false, false));
523-
}
524513
if (randomBoolean()) {
525514
int batchSize = randomInt(100);
526515
deleteByQueryRequest.setBatchSize(batchSize);
@@ -559,8 +548,6 @@ public void testDeleteByQuery() throws IOException {
559548
Request request = RequestConverters.deleteByQuery(deleteByQueryRequest);
560549
StringJoiner joiner = new StringJoiner("/", "/", "");
561550
joiner.add(String.join(",", deleteByQueryRequest.indices()));
562-
if (deleteByQueryRequest.getDocTypes().length > 0)
563-
joiner.add(String.join(",", deleteByQueryRequest.getDocTypes()));
564551
joiner.add("_delete_by_query");
565552
assertEquals(joiner.toString(), request.getEndpoint());
566553
assertEquals(HttpPost.METHOD_NAME, request.getMethod());
@@ -1065,13 +1052,6 @@ public void testSearch() throws Exception {
10651052
String[] indices = randomIndicesNames(0, 5);
10661053
SearchRequest searchRequest = new SearchRequest(indices);
10671054

1068-
int numTypes = randomIntBetween(0, 5);
1069-
String[] types = new String[numTypes];
1070-
for (int i = 0; i < numTypes; i++) {
1071-
types[i] = "type-" + randomAlphaOfLengthBetween(2, 5);
1072-
}
1073-
searchRequest.types(types);
1074-
10751055
Map<String, String> expectedParams = new HashMap<>();
10761056
setRandomSearchParams(searchRequest, expectedParams);
10771057
setRandomIndicesOptions(searchRequest::indicesOptions, searchRequest::indicesOptions, expectedParams);
@@ -1128,10 +1108,6 @@ public void testSearch() throws Exception {
11281108
if (Strings.hasLength(index)) {
11291109
endpoint.add(index);
11301110
}
1131-
String type = String.join(",", types);
1132-
if (Strings.hasLength(type)) {
1133-
endpoint.add(type);
1134-
}
11351111
endpoint.add(searchEndpoint);
11361112
assertEquals(HttpPost.METHOD_NAME, request.getMethod());
11371113
assertEquals(endpoint.toString(), request.getEndpoint());
@@ -1142,7 +1118,6 @@ public void testSearch() throws Exception {
11421118
public void testSearchNullIndicesAndTypes() {
11431119
expectThrows(NullPointerException.class, () -> new SearchRequest((String[]) null));
11441120
expectThrows(NullPointerException.class, () -> new SearchRequest().indices((String[]) null));
1145-
expectThrows(NullPointerException.class, () -> new SearchRequest().types((String[]) null));
11461121
}
11471122

11481123
public void testCountNotNullSource() throws IOException {
@@ -1257,7 +1232,7 @@ public void testMultiSearch() throws IOException {
12571232
requests.add(searchRequest);
12581233
};
12591234
MultiSearchRequest.readMultiLineFormat(new BytesArray(EntityUtils.toByteArray(request.getEntity())),
1260-
REQUEST_BODY_CONTENT_TYPE.xContent(), consumer, null, multiSearchRequest.indicesOptions(), null, null, null, null,
1235+
REQUEST_BODY_CONTENT_TYPE.xContent(), consumer, null, multiSearchRequest.indicesOptions(), null, null, null,
12611236
xContentRegistry(), true);
12621237
assertEquals(requests, multiSearchRequest.requests());
12631238
}

‎client/rest-high-level/src/test/java/org/elasticsearch/client/RollupIT.java‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.elasticsearch.action.search.SearchRequest;
3030
import org.elasticsearch.action.search.SearchResponse;
3131
import org.elasticsearch.action.support.WriteRequest;
32-
import org.elasticsearch.client.core.IndexerState;
3332
import org.elasticsearch.client.core.AcknowledgedResponse;
33+
import org.elasticsearch.client.core.IndexerState;
3434
import org.elasticsearch.client.rollup.DeleteRollupJobRequest;
3535
import org.elasticsearch.client.rollup.GetRollupCapsRequest;
3636
import org.elasticsearch.client.rollup.GetRollupCapsResponse;
@@ -40,10 +40,10 @@
4040
import org.elasticsearch.client.rollup.GetRollupJobResponse;
4141
import org.elasticsearch.client.rollup.GetRollupJobResponse.JobWrapper;
4242
import org.elasticsearch.client.rollup.PutRollupJobRequest;
43-
import org.elasticsearch.client.rollup.StartRollupJobRequest;
44-
import org.elasticsearch.client.rollup.StartRollupJobResponse;
4543
import org.elasticsearch.client.rollup.RollableIndexCaps;
4644
import org.elasticsearch.client.rollup.RollupJobCaps;
45+
import org.elasticsearch.client.rollup.StartRollupJobRequest;
46+
import org.elasticsearch.client.rollup.StartRollupJobResponse;
4747
import org.elasticsearch.client.rollup.StopRollupJobRequest;
4848
import org.elasticsearch.client.rollup.StopRollupJobResponse;
4949
import org.elasticsearch.client.rollup.job.config.DateHistogramGroupConfig;
@@ -54,10 +54,10 @@
5454
import org.elasticsearch.rest.RestStatus;
5555
import org.elasticsearch.search.SearchHit;
5656
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
57-
import org.elasticsearch.search.aggregations.metrics.NumericMetricsAggregation;
5857
import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
5958
import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
6059
import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
60+
import org.elasticsearch.search.aggregations.metrics.NumericMetricsAggregation;
6161
import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
6262
import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
6363
import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -259,20 +259,6 @@ public void testSearch() throws Exception {
259259
assertThat(avg.value(), closeTo(sum / numDocs, 0.00000001));
260260
}
261261

262-
public void testSearchWithType() throws Exception {
263-
SearchRequest search = new SearchRequest(rollupIndex);
264-
search.types("a", "b", "c");
265-
search.source(new SearchSourceBuilder()
266-
.size(0)
267-
.aggregation(new AvgAggregationBuilder("avg").field("value")));
268-
try {
269-
highLevelClient().rollup().search(search, RequestOptions.DEFAULT);
270-
fail("types are not allowed but didn't fail");
271-
} catch (ValidationException e) {
272-
assertEquals("Validation Failed: 1: types are not allowed in rollup search;", e.getMessage());
273-
}
274-
}
275-
276262
public void testGetMissingRollupJob() throws Exception {
277263
GetRollupJobRequest getRollupJobRequest = new GetRollupJobRequest("missing");
278264
RollupClient rollupClient = highLevelClient().rollup();

‎modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HighlighterWithAnalyzersTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void testNgramHighlightingWithBrokenPositions() throws IOException {
108108
client().prepareIndex("test", "test", "1")
109109
.setSource("name", "ARCOTEL Hotels Deutschland").get();
110110
refresh();
111-
SearchResponse search = client().prepareSearch("test").setTypes("test")
111+
SearchResponse search = client().prepareSearch("test")
112112
.setQuery(matchQuery("name.autocomplete", "deut tel").operator(Operator.OR))
113113
.highlighter(new HighlightBuilder().field("name.autocomplete")).get();
114114
assertHighlight(search, 0, "name.autocomplete", 0,

‎modules/lang-expression/src/test/java/org/elasticsearch/script/expression/ExpressionFieldScriptTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void setUp() throws Exception {
6464
when(fieldData.load(anyObject())).thenReturn(atomicFieldData);
6565

6666
service = new ExpressionScriptEngine();
67-
lookup = new SearchLookup(mapperService, ignored -> fieldData, null);
67+
lookup = new SearchLookup(mapperService, ignored -> fieldData);
6868
}
6969

7070
private FieldScript.LeafFactory compile(String expression) {

‎modules/lang-expression/src/test/java/org/elasticsearch/script/expression/ExpressionNumberSortScriptTests.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919

2020
package org.elasticsearch.script.expression;
2121

22-
import java.io.IOException;
23-
import java.text.ParseException;
24-
import java.util.Collections;
2522
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
2623
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
2724
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
@@ -33,6 +30,10 @@
3330
import org.elasticsearch.search.lookup.SearchLookup;
3431
import org.elasticsearch.test.ESTestCase;
3532

33+
import java.io.IOException;
34+
import java.text.ParseException;
35+
import java.util.Collections;
36+
3637
import static org.mockito.Matchers.anyInt;
3738
import static org.mockito.Matchers.anyObject;
3839
import static org.mockito.Mockito.mock;
@@ -63,7 +64,7 @@ public void setUp() throws Exception {
6364
when(fieldData.load(anyObject())).thenReturn(atomicFieldData);
6465

6566
service = new ExpressionScriptEngine();
66-
lookup = new SearchLookup(mapperService, ignored -> fieldData, null);
67+
lookup = new SearchLookup(mapperService, ignored -> fieldData);
6768
}
6869

6970
private NumberSortScript.LeafFactory compile(String expression) {

‎modules/lang-expression/src/test/java/org/elasticsearch/script/expression/ExpressionTermsSetQueryTests.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919

2020
package org.elasticsearch.script.expression;
2121

22-
import java.io.IOException;
23-
import java.text.ParseException;
24-
import java.util.Collections;
2522
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
2623
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
2724
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
@@ -33,6 +30,10 @@
3330
import org.elasticsearch.search.lookup.SearchLookup;
3431
import org.elasticsearch.test.ESTestCase;
3532

33+
import java.io.IOException;
34+
import java.text.ParseException;
35+
import java.util.Collections;
36+
3637
import static org.mockito.Matchers.anyInt;
3738
import static org.mockito.Matchers.anyObject;
3839
import static org.mockito.Mockito.mock;
@@ -63,7 +64,7 @@ public void setUp() throws Exception {
6364
when(fieldData.load(anyObject())).thenReturn(atomicFieldData);
6465

6566
service = new ExpressionScriptEngine();
66-
lookup = new SearchLookup(mapperService, ignored -> fieldData, null);
67+
lookup = new SearchLookup(mapperService, ignored -> fieldData);
6768
}
6869

6970
private TermsSetQueryScript.LeafFactory compile(String expression) {

‎modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void testAllOpsDisabledIndexedScripts() throws IOException {
6767
client().prepareSearch()
6868
.setSource(new SearchSourceBuilder().scriptField("test1",
6969
new Script(ScriptType.STORED, null, "script1", Collections.emptyMap())))
70-
.setIndices("test").setTypes("scriptTest").get();
70+
.setIndices("test").get();
7171
fail("search script should have been rejected");
7272
} catch(Exception e) {
7373
assertThat(e.toString(), containsString("cannot execute scripts using [field] context"));

‎modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequestTests.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,10 @@ public void testParseRequest() throws Exception {
5656
assertThat(request.requests().get(0).getRequest().preference(), nullValue());
5757
assertThat(request.requests().get(1).getRequest().indices()[0], equalTo("test2"));
5858
assertThat(request.requests().get(1).getRequest().indices()[1], equalTo("test3"));
59-
assertThat(request.requests().get(1).getRequest().types()[0], equalTo("type1"));
6059
assertThat(request.requests().get(1).getRequest().requestCache(), nullValue());
6160
assertThat(request.requests().get(1).getRequest().preference(), equalTo("_local"));
6261
assertThat(request.requests().get(2).getRequest().indices()[0], equalTo("test4"));
6362
assertThat(request.requests().get(2).getRequest().indices()[1], equalTo("test1"));
64-
assertThat(request.requests().get(2).getRequest().types()[0], equalTo("type2"));
65-
assertThat(request.requests().get(2).getRequest().types()[1], equalTo("type1"));
6663
assertThat(request.requests().get(2).getRequest().routing(), equalTo("123"));
6764
assertNotNull(request.requests().get(0).getScript());
6865
assertNotNull(request.requests().get(1).getScript());

0 commit comments

Comments
 (0)