Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove type query #47207

Merged
merged 2 commits into from
Sep 27, 2019
+0 −250
Merged

Remove type query #47207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35d19bf
Remove query
romseygeek Sep 27, 2019
583b1de
tests
romseygeek Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.IndexAnalyzers;
import org.elasticsearch.index.mapper.MetadataFieldMapper.TypeParser;
import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.search.internal.SearchContext;

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

public IndexFieldMapper indexMapper() {
return metadataMapper(IndexFieldMapper.class);
}

public TypeFieldMapper typeMapper() {
return metadataMapper(TypeFieldMapper.class);
}

public SourceFieldMapper sourceMapper() {
return metadataMapper(SourceFieldMapper.class);
}
Expand All @@ -247,10 +238,6 @@ public IndexFieldMapper IndexFieldMapper() {
return metadataMapper(IndexFieldMapper.class);
}

public Query typeFilter(QueryShardContext context) {
return typeMapper().fieldType().termQuery(type, context);
}

public boolean hasNestedObjects() {
return hasNestedObjects;
}
Expand Down
143 changes: 0 additions & 143 deletions server/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions server/src/main/java/org/elasticsearch/search/SearchModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
import org.elasticsearch.index.query.TermQueryBuilder;
import org.elasticsearch.index.query.TermsQueryBuilder;
import org.elasticsearch.index.query.TermsSetQueryBuilder;
import org.elasticsearch.index.query.TypeQueryBuilder;
import org.elasticsearch.index.query.WildcardQueryBuilder;
import org.elasticsearch.index.query.WrapperQueryBuilder;
import org.elasticsearch.index.query.functionscore.ExponentialDecayFunctionBuilder;
Expand Down Expand Up @@ -773,7 +772,6 @@ private void registerQueryParsers(List<SearchPlugin> plugins) {
registerQuery(new QuerySpec<>(ScriptScoreQueryBuilder.NAME, ScriptScoreQueryBuilder::new, ScriptScoreQueryBuilder::fromXContent));
registerQuery(
new QuerySpec<>(SimpleQueryStringBuilder.NAME, SimpleQueryStringBuilder::new, SimpleQueryStringBuilder::fromXContent));
registerQuery(new QuerySpec<>(TypeQueryBuilder.NAME, TypeQueryBuilder::new, TypeQueryBuilder::fromXContent));
registerQuery(new QuerySpec<>(ScriptQueryBuilder.NAME, ScriptQueryBuilder::new, ScriptQueryBuilder::fromXContent));
registerQuery(new QuerySpec<>(GeoDistanceQueryBuilder.NAME, GeoDistanceQueryBuilder::new, GeoDistanceQueryBuilder::fromXContent));
registerQuery(new QuerySpec<>(GeoBoundingBoxQueryBuilder.NAME, GeoBoundingBoxQueryBuilder::new,
Expand Down
91 changes: 0 additions & 91 deletions server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion server/src/test/java/org/elasticsearch/search/SearchModuleTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ public List<RescorerSpec<?>> getRescorers() {
"term",
"terms",
"terms_set",
"type",
"wildcard",
"wrapper",
"distance_feature"
Expand Down