Skip to content

Commit 237b238

Browse files
authored
Remove type query (#47207)
Running a type query in 7x already emits deprecation warnings. We can remove it altogether in 8x. Part of #41059
1 parent 9ac223c commit 237b238

File tree

5 files changed

+0
-250
lines changed

5 files changed

+0
-250
lines changed

server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java

-13
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.elasticsearch.index.IndexSettings;
4040
import org.elasticsearch.index.analysis.IndexAnalyzers;
4141
import org.elasticsearch.index.mapper.MetadataFieldMapper.TypeParser;
42-
import org.elasticsearch.index.query.QueryShardContext;
4342
import org.elasticsearch.search.internal.SearchContext;
4443

4544
import java.io.IOException;
@@ -223,14 +222,6 @@ public <T extends MetadataFieldMapper> T metadataMapper(Class<T> type) {
223222
return mapping.metadataMapper(type);
224223
}
225224

226-
public IndexFieldMapper indexMapper() {
227-
return metadataMapper(IndexFieldMapper.class);
228-
}
229-
230-
public TypeFieldMapper typeMapper() {
231-
return metadataMapper(TypeFieldMapper.class);
232-
}
233-
234225
public SourceFieldMapper sourceMapper() {
235226
return metadataMapper(SourceFieldMapper.class);
236227
}
@@ -247,10 +238,6 @@ public IndexFieldMapper IndexFieldMapper() {
247238
return metadataMapper(IndexFieldMapper.class);
248239
}
249240

250-
public Query typeFilter(QueryShardContext context) {
251-
return typeMapper().fieldType().termQuery(type, context);
252-
}
253-
254241
public boolean hasNestedObjects() {
255242
return hasNestedObjects;
256243
}

server/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java

-143
This file was deleted.

server/src/main/java/org/elasticsearch/search/SearchModule.java

-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
import org.elasticsearch.index.query.TermQueryBuilder;
7474
import org.elasticsearch.index.query.TermsQueryBuilder;
7575
import org.elasticsearch.index.query.TermsSetQueryBuilder;
76-
import org.elasticsearch.index.query.TypeQueryBuilder;
7776
import org.elasticsearch.index.query.WildcardQueryBuilder;
7877
import org.elasticsearch.index.query.WrapperQueryBuilder;
7978
import org.elasticsearch.index.query.functionscore.ExponentialDecayFunctionBuilder;
@@ -773,7 +772,6 @@ private void registerQueryParsers(List<SearchPlugin> plugins) {
773772
registerQuery(new QuerySpec<>(ScriptScoreQueryBuilder.NAME, ScriptScoreQueryBuilder::new, ScriptScoreQueryBuilder::fromXContent));
774773
registerQuery(
775774
new QuerySpec<>(SimpleQueryStringBuilder.NAME, SimpleQueryStringBuilder::new, SimpleQueryStringBuilder::fromXContent));
776-
registerQuery(new QuerySpec<>(TypeQueryBuilder.NAME, TypeQueryBuilder::new, TypeQueryBuilder::fromXContent));
777775
registerQuery(new QuerySpec<>(ScriptQueryBuilder.NAME, ScriptQueryBuilder::new, ScriptQueryBuilder::fromXContent));
778776
registerQuery(new QuerySpec<>(GeoDistanceQueryBuilder.NAME, GeoDistanceQueryBuilder::new, GeoDistanceQueryBuilder::fromXContent));
779777
registerQuery(new QuerySpec<>(GeoBoundingBoxQueryBuilder.NAME, GeoBoundingBoxQueryBuilder::new,

server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java

-91
This file was deleted.

server/src/test/java/org/elasticsearch/search/SearchModuleTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ public List<RescorerSpec<?>> getRescorers() {
350350
"term",
351351
"terms",
352352
"terms_set",
353-
"type",
354353
"wildcard",
355354
"wrapper",
356355
"distance_feature"

0 commit comments

Comments
 (0)