Skip to content

Commit c56019e

Browse files
original-brownbearoriginal-brownbear
authored
Remove Dead MinVersion Parameter in SearchService (#47883)
This parameter isn't used anymore -> removed it.
1 parent 566e1b7 commit c56019e

File tree

5 files changed

+19
-25
lines changed

5 files changed

+19
-25
lines changed

‎server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.lucene.search.Collector;
2525
import org.apache.lucene.search.FieldDoc;
2626
import org.apache.lucene.search.Query;
27-
import org.elasticsearch.Version;
2827
import org.elasticsearch.action.search.SearchTask;
2928
import org.elasticsearch.action.search.SearchType;
3029
import org.elasticsearch.cluster.service.ClusterService;
@@ -124,8 +123,6 @@ final class DefaultSearchContext extends SearchContext {
124123
// filter for sliced scroll
125124
private SliceBuilder sliceBuilder;
126125
private SearchTask task;
127-
private final Version minNodeVersion;
128-
129126

130127
/**
131128
* The original query as sent by the user without the types and aliases
@@ -160,7 +157,7 @@ final class DefaultSearchContext extends SearchContext {
160157
DefaultSearchContext(long id, ShardSearchRequest request, SearchShardTarget shardTarget,
161158
Engine.Searcher engineSearcher, ClusterService clusterService, IndexService indexService,
162159
IndexShard indexShard, BigArrays bigArrays, LongSupplier relativeTimeSupplier, TimeValue timeout,
163-
FetchPhase fetchPhase, Version minNodeVersion) {
160+
FetchPhase fetchPhase) {
164161
this.id = id;
165162
this.request = request;
166163
this.fetchPhase = fetchPhase;
@@ -179,7 +176,6 @@ final class DefaultSearchContext extends SearchContext {
179176
engineSearcher.getQueryCache(), engineSearcher.getQueryCachingPolicy());
180177
this.relativeTimeSupplier = relativeTimeSupplier;
181178
this.timeout = timeout;
182-
this.minNodeVersion = minNodeVersion;
183179
queryShardContext = indexService.newQueryShardContext(request.shardId().id(), searcher,
184180
request::nowInMillis, shardTarget.getClusterAlias());
185181
queryBoost = request.indexBoost();
@@ -280,7 +276,7 @@ && new NestedHelper(mapperService()).mightMatchNestedDocs(query)
280276
}
281277

282278
if (sliceBuilder != null) {
283-
filters.add(sliceBuilder.toFilter(clusterService, request, queryShardContext, minNodeVersion));
279+
filters.add(sliceBuilder.toFilter(clusterService, request, queryShardContext));
284280
}
285281

286282
if (filters.isEmpty()) {

‎server/src/main/java/org/elasticsearch/search/SearchService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,7 @@ private DefaultSearchContext createSearchContext(ShardSearchRequest request, Tim
630630
DefaultSearchContext searchContext = null;
631631
try {
632632
searchContext = new DefaultSearchContext(idGenerator.incrementAndGet(), request, shardTarget,
633-
searcher, clusterService, indexService, indexShard, bigArrays, threadPool::relativeTimeInMillis, timeout,
634-
fetchPhase, clusterService.state().nodes().getMinNodeVersion());
633+
searcher, clusterService, indexService, indexShard, bigArrays, threadPool::relativeTimeInMillis, timeout, fetchPhase);
635634
// we clone the query shard context here just for rewriting otherwise we
636635
// might end up with incorrect state since we are using now() or script services
637636
// during rewrite and normalized / evaluate templates etc.

‎server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.apache.lucene.search.MatchAllDocsQuery;
2323
import org.apache.lucene.search.MatchNoDocsQuery;
2424
import org.apache.lucene.search.Query;
25-
import org.elasticsearch.Version;
2625
import org.elasticsearch.cluster.ClusterState;
2726
import org.elasticsearch.cluster.routing.GroupShardsIterator;
2827
import org.elasticsearch.cluster.routing.ShardIterator;
@@ -205,7 +204,7 @@ public int hashCode() {
205204
*
206205
* @param context Additional information needed to build the query
207206
*/
208-
public Query toFilter(ClusterService clusterService, ShardSearchRequest request, QueryShardContext context, Version minNodeVersion) {
207+
public Query toFilter(ClusterService clusterService, ShardSearchRequest request, QueryShardContext context) {
209208
final MappedFieldType type = context.fieldMapper(field);
210209
if (type == null) {
211210
throw new IllegalArgumentException("field " + field + " not found");

‎server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void testPreProcess() throws Exception {
116116
SearchShardTarget target = new SearchShardTarget("node", shardId, null, OriginalIndices.NONE);
117117

118118
DefaultSearchContext context1 = new DefaultSearchContext(1L, shardSearchRequest, target, searcher, null, indexService,
119-
indexShard, bigArrays, null, timeout, null, Version.CURRENT);
119+
indexShard, bigArrays, null, timeout, null);
120120
context1.from(300);
121121

122122
// resultWindow greater than maxResultWindow and scrollContext is null
@@ -157,7 +157,7 @@ public void testPreProcess() throws Exception {
157157

158158
// rescore is null but sliceBuilder is not null
159159
DefaultSearchContext context2 = new DefaultSearchContext(2L, shardSearchRequest, target, searcher,
160-
null, indexService, indexShard, bigArrays, null, timeout, null, Version.CURRENT);
160+
null, indexService, indexShard, bigArrays, null, timeout, null);
161161

162162
SliceBuilder sliceBuilder = mock(SliceBuilder.class);
163163
int numSlices = maxSlicesPerScroll + randomIntBetween(1, 100);
@@ -174,7 +174,7 @@ public void testPreProcess() throws Exception {
174174
when(shardSearchRequest.indexBoost()).thenReturn(AbstractQueryBuilder.DEFAULT_BOOST);
175175

176176
DefaultSearchContext context3 = new DefaultSearchContext(3L, shardSearchRequest, target, searcher, null,
177-
indexService, indexShard, bigArrays, null, timeout, null, Version.CURRENT);
177+
indexService, indexShard, bigArrays, null, timeout, null);
178178
ParsedQuery parsedQuery = ParsedQuery.parsedMatchAllQuery();
179179
context3.sliceBuilder(null).parsedQuery(parsedQuery).preProcess(false);
180180
assertEquals(context3.query(), context3.buildFilteredQuery(parsedQuery.query()));

‎server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ public void testToFilterSimple() throws IOException {
212212
QueryShardContext context =
213213
createShardContext(Version.CURRENT, reader, "_id", DocValuesType.SORTED_NUMERIC, 1,0);
214214
SliceBuilder builder = new SliceBuilder(5, 10);
215-
Query query = builder.toFilter(null, createRequest(0), context, Version.CURRENT);
215+
Query query = builder.toFilter(null, createRequest(0), context);
216216
assertThat(query, instanceOf(TermsSliceQuery.class));
217217

218-
assertThat(builder.toFilter(null, createRequest(0), context, Version.CURRENT), equalTo(query));
218+
assertThat(builder.toFilter(null, createRequest(0), context), equalTo(query));
219219
try (IndexReader newReader = DirectoryReader.open(dir)) {
220220
when(context.getIndexReader()).thenReturn(newReader);
221-
assertThat(builder.toFilter(null, createRequest(0), context, Version.CURRENT), equalTo(query));
221+
assertThat(builder.toFilter(null, createRequest(0), context), equalTo(query));
222222
}
223223
}
224224
}
@@ -232,12 +232,12 @@ public void testToFilterRandom() throws IOException {
232232
QueryShardContext context =
233233
createShardContext(Version.CURRENT, reader, "field", DocValuesType.SORTED_NUMERIC, 1,0);
234234
SliceBuilder builder = new SliceBuilder("field", 5, 10);
235-
Query query = builder.toFilter(null, createRequest(0), context, Version.CURRENT);
235+
Query query = builder.toFilter(null, createRequest(0), context);
236236
assertThat(query, instanceOf(DocValuesSliceQuery.class));
237-
assertThat(builder.toFilter(null, createRequest(0), context, Version.CURRENT), equalTo(query));
237+
assertThat(builder.toFilter(null, createRequest(0), context), equalTo(query));
238238
try (IndexReader newReader = DirectoryReader.open(dir)) {
239239
when(context.getIndexReader()).thenReturn(newReader);
240-
assertThat(builder.toFilter(null, createRequest(0), context, Version.CURRENT), equalTo(query));
240+
assertThat(builder.toFilter(null, createRequest(0), context), equalTo(query));
241241
}
242242

243243
// numSlices > numShards
@@ -248,7 +248,7 @@ public void testToFilterRandom() throws IOException {
248248
for (int j = 0; j < numShards; j++) {
249249
SliceBuilder slice = new SliceBuilder("_id", i, numSlices);
250250
context = createShardContext(Version.CURRENT, reader, "_id", DocValuesType.SORTED, numShards, j);
251-
Query q = slice.toFilter(null, createRequest(j), context, Version.CURRENT);
251+
Query q = slice.toFilter(null, createRequest(j), context);
252252
if (q instanceof TermsSliceQuery || q instanceof MatchAllDocsQuery) {
253253
AtomicInteger count = numSliceMap.get(j);
254254
if (count == null) {
@@ -278,7 +278,7 @@ public void testToFilterRandom() throws IOException {
278278
for (int j = 0; j < numShards; j++) {
279279
SliceBuilder slice = new SliceBuilder("_id", i, numSlices);
280280
context = createShardContext(Version.CURRENT, reader, "_id", DocValuesType.SORTED, numShards, j);
281-
Query q = slice.toFilter(null, createRequest(j), context, Version.CURRENT);
281+
Query q = slice.toFilter(null, createRequest(j), context);
282282
if (q instanceof MatchNoDocsQuery == false) {
283283
assertThat(q, instanceOf(MatchAllDocsQuery.class));
284284
targetShards.add(j);
@@ -295,7 +295,7 @@ public void testToFilterRandom() throws IOException {
295295
for (int j = 0; j < numShards; j++) {
296296
SliceBuilder slice = new SliceBuilder("_id", i, numSlices);
297297
context = createShardContext(Version.CURRENT, reader, "_id", DocValuesType.SORTED, numShards, j);
298-
Query q = slice.toFilter(null, createRequest(j), context, Version.CURRENT);
298+
Query q = slice.toFilter(null, createRequest(j), context);
299299
if (i == j) {
300300
assertThat(q, instanceOf(MatchAllDocsQuery.class));
301301
} else {
@@ -315,7 +315,7 @@ public void testInvalidField() throws IOException {
315315
QueryShardContext context = createShardContext(Version.CURRENT, reader, "field", null, 1,0);
316316
SliceBuilder builder = new SliceBuilder("field", 5, 10);
317317
IllegalArgumentException exc = expectThrows(IllegalArgumentException.class,
318-
() -> builder.toFilter(null, createRequest(0), context, Version.CURRENT));
318+
() -> builder.toFilter(null, createRequest(0), context));
319319
assertThat(exc.getMessage(), containsString("cannot load numeric doc values"));
320320
}
321321
}
@@ -343,9 +343,9 @@ public void testToFilterWithRouting() throws IOException {
343343
QueryShardContext context = createShardContext(version, reader, "field", DocValuesType.SORTED, 5, 0);
344344
SliceBuilder builder = new SliceBuilder("field", 6, 10);
345345
String[] routings = new String[] { "foo" };
346-
Query query = builder.toFilter(clusterService, createRequest(1, routings, null), context, version);
346+
Query query = builder.toFilter(clusterService, createRequest(1, routings, null), context);
347347
assertEquals(new DocValuesSliceQuery("field", 6, 10), query);
348-
query = builder.toFilter(clusterService, createRequest(1, Strings.EMPTY_ARRAY, "foo"), context, version);
348+
query = builder.toFilter(clusterService, createRequest(1, Strings.EMPTY_ARRAY, "foo"), context);
349349
assertEquals(new DocValuesSliceQuery("field", 6, 10), query);
350350
}
351351
}

0 commit comments

Comments
 (0)