[Remove] Type query (#2448)

Signed-off-by: Suraj Singh <surajrider@gmail.com>

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

@@ -208,14 +208,6 @@ public class DocumentMapper implements ToXContentFragment {
         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);
     }

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

@@ -1,158 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- */
-
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-package org.opensearch.index.query;
-
-import org.apache.lucene.search.MatchNoDocsQuery;
-import org.apache.lucene.search.Query;
-import org.opensearch.common.ParseField;
-import org.opensearch.common.ParsingException;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.logging.DeprecationLogger;
-import org.opensearch.common.lucene.search.Queries;
-import org.opensearch.common.xcontent.XContentBuilder;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.index.mapper.DocumentMapper;
-
-import java.io.IOException;
-import java.util.Objects;
-
-public class TypeQueryBuilder extends AbstractQueryBuilder<TypeQueryBuilder> {
-    public static final String NAME = "type";
-
-    private static final ParseField VALUE_FIELD = new ParseField("value");
-    private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(TypeQueryBuilder.class);
-    static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Type queries are deprecated, "
-        + "prefer to filter on a field instead.";
-
-    private final String type;
-
-    public TypeQueryBuilder(String type) {
-        if (type == null) {
-            throw new IllegalArgumentException("[type] cannot be null");
-        }
-        this.type = type;
-    }
-
-    /**
-     * Read from a stream.
-     */
-    public TypeQueryBuilder(StreamInput in) throws IOException {
-        super(in);
-        type = in.readString();
-    }
-
-    @Override
-    protected void doWriteTo(StreamOutput out) throws IOException {
-        out.writeString(type);
-    }
-
-    public String type() {
-        return type;
-    }
-
-    @Override
-    protected void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(NAME);
-        builder.field(VALUE_FIELD.getPreferredName(), type);
-        printBoostAndQueryName(builder);
-        builder.endObject();
-    }
-
-    public static TypeQueryBuilder fromXContent(XContentParser parser) throws IOException {
-        String type = null;
-        String queryName = null;
-        float boost = AbstractQueryBuilder.DEFAULT_BOOST;
-        String currentFieldName = null;
-        XContentParser.Token token;
-        while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
-            if (token == XContentParser.Token.FIELD_NAME) {
-                currentFieldName = parser.currentName();
-            } else if (token.isValue()) {
-                if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
-                    queryName = parser.text();
-                } else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
-                    boost = parser.floatValue();
-                } else if (VALUE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
-                    type = parser.text();
-                } else {
-                    throw new ParsingException(
-                        parser.getTokenLocation(),
-                        "[" + TypeQueryBuilder.NAME + "] filter doesn't support [" + currentFieldName + "]"
-                    );
-                }
-            } else {
-                throw new ParsingException(
-                    parser.getTokenLocation(),
-                    "[" + TypeQueryBuilder.NAME + "] filter doesn't support [" + currentFieldName + "]"
-                );
-            }
-        }
-
-        if (type == null) {
-            throw new ParsingException(
-                parser.getTokenLocation(),
-                "[" + TypeQueryBuilder.NAME + "] filter needs to be provided with a value for the type"
-            );
-        }
-        return new TypeQueryBuilder(type).boost(boost).queryName(queryName);
-    }
-
-    @Override
-    public String getWriteableName() {
-        return NAME;
-    }
-
-    @Override
-    protected Query doToQuery(QueryShardContext context) throws IOException {
-        deprecationLogger.deprecate("type_query", TYPES_DEPRECATION_MESSAGE);
-        // LUCENE 4 UPGRADE document mapper should use bytesref as well?
-        DocumentMapper documentMapper = context.getMapperService().documentMapper();
-        if (documentMapper == null) {
-            // no type means no documents
-            return new MatchNoDocsQuery();
-        } else {
-            return Queries.newNonNestedFilter(context.indexVersionCreated());
-        }
-    }
-
-    @Override
-    protected int doHashCode() {
-        return Objects.hash(type);
-    }
-
-    @Override
-    protected boolean doEquals(TypeQueryBuilder other) {
-        return Objects.equals(type, other.type);
-    }
-}

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

@@ -89,7 +89,6 @@ import org.opensearch.index.query.SpanWithinQueryBuilder;
 import org.opensearch.index.query.TermQueryBuilder;
 import org.opensearch.index.query.TermsQueryBuilder;
 import org.opensearch.index.query.TermsSetQueryBuilder;
-import org.opensearch.index.query.TypeQueryBuilder;
 import org.opensearch.index.query.WildcardQueryBuilder;
 import org.opensearch.index.query.WrapperQueryBuilder;
 import org.opensearch.index.query.functionscore.ExponentialDecayFunctionBuilder;
@@ -1183,7 +1182,6 @@ public class SearchModule {
         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(

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

@@ -1,90 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- */
-
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-package org.opensearch.index.query;
-
-import org.apache.lucene.search.MatchNoDocsQuery;
-import org.apache.lucene.search.Query;
-import org.opensearch.common.lucene.search.Queries;
-import org.opensearch.test.AbstractQueryTestCase;
-
-import java.io.IOException;
-
-import static org.hamcrest.Matchers.equalTo;
-
-public class TypeQueryBuilderTests extends AbstractQueryTestCase<TypeQueryBuilder> {
-
-    @Override
-    protected TypeQueryBuilder doCreateTestQueryBuilder() {
-        return new TypeQueryBuilder("_doc");
-    }
-
-    @Override
-    protected void doAssertLuceneQuery(TypeQueryBuilder queryBuilder, Query query, QueryShardContext context) throws IOException {
-        if (createShardContext().getMapperService().documentMapper() == null) {
-            assertEquals(new MatchNoDocsQuery(), query);
-        } else {
-            assertThat(query, equalTo(Queries.newNonNestedFilter(context.indexVersionCreated())));
-        }
-    }
-
-    public void testIllegalArgument() {
-        expectThrows(IllegalArgumentException.class, () -> new TypeQueryBuilder((String) null));
-    }
-
-    public void testFromJson() throws IOException {
-        String json = "{\n" + "  \"type\" : {\n" + "    \"value\" : \"my_type\",\n" + "    \"boost\" : 1.0\n" + "  }\n" + "}";
-
-        TypeQueryBuilder parsed = (TypeQueryBuilder) parseQuery(json);
-        checkGeneratedJson(json, parsed);
-
-        assertEquals(json, "my_type", parsed.type());
-    }
-
-    @Override
-    public void testToQuery() throws IOException {
-        super.testToQuery();
-        assertWarnings(TypeQueryBuilder.TYPES_DEPRECATION_MESSAGE);
-    }
-
-    @Override
-    public void testMustRewrite() throws IOException {
-        super.testMustRewrite();
-        assertWarnings(TypeQueryBuilder.TYPES_DEPRECATION_MESSAGE);
-    }
-
-    @Override
-    public void testCacheability() throws IOException {
-        super.testCacheability();
-        assertWarnings(TypeQueryBuilder.TYPES_DEPRECATION_MESSAGE);
-    }
-}

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

@@ -459,7 +459,6 @@ public class SearchModuleTests extends OpenSearchTestCase {
         "term",
         "terms",
         "terms_set",
-        "type",
         "wildcard",
         "wrapper",
         "distance_feature" };