Remove CommonTermsQuery and cutoff_frequency param

Remove `common` query and `cutoff_frequency` parameter of `match` and `multi_match` queries. Both have already been deprecated for the next 7.x version. Closes: #37096
elastic · May 31, 2019 · 89d61d7 · 89d61d7
1 parent be8020a
commit 89d61d7
Show file tree

Hide file tree

Showing 41 changed files with 40 additions and 1,915 deletions.
diff --git a/...evel/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java b/...evel/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java
@@ -42,7 +42,6 @@
 import static java.util.Collections.singletonMap;
 import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
 import static org.elasticsearch.index.query.QueryBuilders.boostingQuery;
-import static org.elasticsearch.index.query.QueryBuilders.commonTermsQuery;
 import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
 import static org.elasticsearch.index.query.QueryBuilders.disMaxQuery;
 import static org.elasticsearch.index.query.QueryBuilders.existsQuery;
@@ -106,13 +105,6 @@ public void testBoosting() {
         // end::boosting
     }
 
-    public void testCommonTerms() {
-        // tag::common_terms
-        commonTermsQuery("name",                                     // <1>
-                         "kimchy");                                  // <2>
-        // end::common_terms
-    }
-
     public void testConstantScore() {
         // tag::constant_score
         constantScoreQuery(

diff --git a/docs/java-rest/high-level/query-builders.asciidoc b/docs/java-rest/high-level/query-builders.asciidoc
@@ -23,7 +23,6 @@ This page lists all the available search queries with their corresponding `Query
 | {ref}/query-dsl-match-query-phrase.html[Match Phrase]               | {query-ref}/MatchPhraseQueryBuilder.html[MatchPhraseQueryBuilder]                   | {query-ref}/QueryBuilders.html#matchPhraseQuery-java.lang.String-java.lang.Object-[QueryBuilders.matchPhraseQuery()]
 | {ref}/query-dsl-match-query-phrase-prefix.html[Match Phrase Prefix] | {query-ref}/MatchPhrasePrefixQueryBuilder.html[MatchPhrasePrefixQueryBuilder]       | {query-ref}/QueryBuilders.html#matchPhrasePrefixQuery-java.lang.String-java.lang.Object-[QueryBuilders.matchPhrasePrefixQuery()]
 | {ref}/query-dsl-multi-match-query.html[Multi Match]                 | {query-ref}/MultiMatchQueryBuilder.html[MultiMatchQueryBuilder]                     | {query-ref}/QueryBuilders.html#multiMatchQuery-java.lang.Object-java.lang.String\…-[QueryBuilders.multiMatchQuery()]
-| {ref}/query-dsl-common-terms-query.html[Common Terms]               | {query-ref}/CommonTermsQueryBuilder.html[CommonTermsQueryBuilder]                   | {query-ref}/QueryBuilders.html#commonTermsQuery-java.lang.String-java.lang.Object-[QueryBuilders.commonTermsQuery()]
 | {ref}/query-dsl-query-string-query.html[Query String]               | {query-ref}/QueryStringQueryBuilder.html[QueryStringQueryBuilder]                   | {query-ref}/QueryBuilders.html#queryStringQuery-java.lang.String-[QueryBuilders.queryStringQuery()]
 | {ref}/query-dsl-simple-query-string-query.html[Simple Query String] | {query-ref}/SimpleQueryStringBuilder.html[SimpleQueryStringBuilder]                 | {query-ref}/QueryBuilders.html#simpleQueryStringQuery-java.lang.String-[QueryBuilders.simpleQueryStringQuery()]
 |======

diff --git a/docs/reference/query-dsl/common-terms-query.asciidoc b/docs/reference/query-dsl/common-terms-query.asciidoc
diff --git a/docs/reference/query-dsl/full-text-queries.asciidoc b/docs/reference/query-dsl/full-text-queries.asciidoc
@@ -29,10 +29,6 @@ The queries in this group are:
 
     The multi-field version of the `match` query.
 
-<<query-dsl-common-terms-query,`common` terms query>>::
-
-    A more specialized query which gives more preference to uncommon words.
-
 <<query-dsl-query-string-query,`query_string` query>>::
 
     Supports the compact Lucene <<query-string-syntax,query string syntax>>,
@@ -59,8 +55,6 @@ include::match-bool-prefix-query.asciidoc[]
 
 include::multi-match-query.asciidoc[]
 
-include::common-terms-query.asciidoc[]
-
 include::query-string-query.asciidoc[]
 
 include::simple-query-string-query.asciidoc[]