Remove several parse field deprecations in query builders #26711

cbuescher · 2017-09-19T15:17:17Z

This change removes parse fields that are either completely deprecated since version 5.0 or removes deprecated names.
This PR is opened against master, but should be backported to the 6.x and 6.0 branches with additional notes
to the migration docs in 6.0.

cbuescher · 2017-09-19T17:42:30Z

core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java

@@ -123,9 +110,13 @@ public MatchQueryBuilder(StreamInput in) throws IOException {
        super(in);
        fieldName = in.readString();
        value = in.readGenericValue();
-        type = MatchQuery.Type.readFromStream(in);
+        if (in.getVersion().onOrAfter(Version.V_6_0_0_rc1)) {


This assumes these changes should and can be backported to 6.0.0

The logic seems wrong. I think it should be before and not onOrAfter ?
Also you should do that in multiple steps to avoid build failures. Start with current version (v7), then backport to v6 and when the build is green you can change the expected version here to be v6. You can add a TODO comment to make sure that reviewers understand the expectations.

Thanks, of course it should be before, bad copy error on my side. Looking at this, I think I will pull out the MatchQueryBuilder changes to a separate PR since I think it will make backporting easier, the rest of this PR is more straight forward.

jimczi

Thanks for doing this @cbuescher !
I left some comments.

jimczi · 2017-09-20T06:55:29Z

core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java

@@ -123,9 +110,13 @@ public MatchQueryBuilder(StreamInput in) throws IOException {
        super(in);
        fieldName = in.readString();
        value = in.readGenericValue();
-        type = MatchQuery.Type.readFromStream(in);
+        if (in.getVersion().onOrAfter(Version.V_6_0_0_rc1)) {


The logic seems wrong. I think it should be before and not onOrAfter ?
Also you should do that in multiple steps to avoid build failures. Start with current version (v7), then backport to v6 and when the build is green you can change the expected version here to be v6. You can add a TODO comment to make sure that reviewers understand the expectations.

jimczi · 2017-09-20T06:55:57Z

core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java

        operator = Operator.readFromStream(in);
-        slop = in.readVInt();
+        if (in.getVersion().onOrAfter(Version.V_6_0_0_rc1)) {


jimczi · 2017-09-20T06:56:08Z

core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java

@@ -146,9 +137,13 @@ public MatchQueryBuilder(StreamInput in) throws IOException {
    protected void doWriteTo(StreamOutput out) throws IOException {
        out.writeString(fieldName);
        out.writeGenericValue(value);
-        type.writeTo(out);
+        if (out.getVersion().onOrAfter(Version.V_6_0_0_rc1)) {
+            MatchQuery.Type.BOOLEAN.writeTo(out);


jimczi · 2017-09-20T06:56:16Z

core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java

        operator.writeTo(out);
-        out.writeVInt(slop);
+        if (out.getVersion().onOrAfter(Version.V_6_0_0_rc1)) {


The `fielddata` field and the use of the `_name` field in the short syntax of the range query have been deprecated in 5.0 and can be removed.

All of these have already been deprecated in 5.0 and can thus be removed in 6.0.

cbuescher · 2017-09-20T10:45:38Z

@jimczi thanks for the review, I pulled out the changes in the MatchQueryBuilder and related test into #26720 to make this PR a little smaller and easier to backport. Is there anything to the remaining part you would like to be changed? I was planning to add the notes to the migration docs only when backporting to the 6.0 branch.

jimczi

LGTM

The `fielddata` field and the use of the `_name` field in the short syntax of the range query have been deprecated in 5.0 and can be removed. The same goes for the deprecated `score_mode` field in HasParentQueryBuilder, the deprecated `like_text`, `ids` and `docs` parameter in the `more_like_this` query, the deprecated query name in the short version of the `regexp` query, and several deprecated alternative field names in other query builders.

* master: [DOCS] Added index-shared4 and index-shared5.asciidoc BulkProcessor flush runnable preserves the thread context from creation time (elastic#26718) Catch exceptions and inform handler in RemoteClusterConnection#collectNodes (elastic#26725) [Docs] Fix name of character filter in example. (elastic#26724) Remove parse field deprecations in query builders (elastic#26711) elastic#26720: Set the correct bwc version after backport to 6.0 Remove deprecated type and slop field in MatchQueryBuilder (elastic#26720) Refactoring of Gateway*** classes (elastic#26706) Make RestHighLevelClient's Request class public (elastic#26627) Deguice ActionFilter (elastic#26691) aggs: Allow aggregation sorting via nested aggregation. Build: Set bwc builds to always set snapshot (elastic#26704) File Discovery: Remove fallback with zen discovery (elastic#26667)

cbuescher added :Query DSL >deprecation v7.0.0 labels Sep 19, 2017

cbuescher force-pushed the remove-QueryBuilder-deprecations branch from bf1d915 to 071a506 Compare September 19, 2017 15:41

cbuescher added v6.0.0 v6.1.0 labels Sep 19, 2017

cbuescher force-pushed the remove-QueryBuilder-deprecations branch from 071a506 to 9ea87f4 Compare September 19, 2017 17:20

cbuescher commented Sep 19, 2017

View reviewed changes

jimczi requested changes Sep 20, 2017

View reviewed changes

cbuescher added 5 commits September 20, 2017 11:46

Remove deprecated fields in RangeQueryBuilder

cadff50

The `fielddata` field and the use of the `_name` field in the short syntax of the range query have been deprecated in 5.0 and can be removed.

Remove deprecated alternative names of several parse fields

f72352b

All of these have already been deprecated in 5.0 and can thus be removed in 6.0.

Remove deprecated score_mode field in HasParentQueryBuilder

0dd1dcc

Remove deprecated like_text, ids and docs field in MLT query builder

bb90b89

Remove deprecated query name in short version of regexp query

b9273d8

cbuescher force-pushed the remove-QueryBuilder-deprecations branch from 9ea87f4 to b9273d8 Compare September 20, 2017 10:30

cbuescher removed the >deprecation label Sep 20, 2017

jimczi approved these changes Sep 20, 2017

View reviewed changes

Fixing deprecated syntax in QueryBuilderBWCIT

065f325

cbuescher merged commit 86b00b8 into elastic:master Sep 20, 2017

colings86 added v6.0.0-rc1 >breaking and removed v6.0.0 labels Sep 22, 2017

lcawl removed the v6.1.0 label Dec 12, 2017

clintongormley added :Search/Search Search-related issues that do not fall into other categories and removed :Query DSL labels Feb 14, 2018

colings86 added the v7.0.0-beta1 label Feb 7, 2019

colings86 removed the v7.0.0 label Feb 7, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove several parse field deprecations in query builders #26711

Remove several parse field deprecations in query builders #26711

cbuescher commented Sep 19, 2017 •

edited

Loading

cbuescher Sep 19, 2017

jimczi Sep 20, 2017

cbuescher Sep 20, 2017

jimczi left a comment

jimczi Sep 20, 2017

jimczi Sep 20, 2017

jimczi Sep 20, 2017

jimczi Sep 20, 2017

cbuescher commented Sep 20, 2017

jimczi left a comment

Remove several parse field deprecations in query builders #26711

Remove several parse field deprecations in query builders #26711

Conversation

cbuescher commented Sep 19, 2017 • edited Loading

cbuescher Sep 19, 2017

Choose a reason for hiding this comment

jimczi Sep 20, 2017

Choose a reason for hiding this comment

cbuescher Sep 20, 2017

Choose a reason for hiding this comment

jimczi left a comment

Choose a reason for hiding this comment

jimczi Sep 20, 2017

Choose a reason for hiding this comment

jimczi Sep 20, 2017

Choose a reason for hiding this comment

jimczi Sep 20, 2017

Choose a reason for hiding this comment

jimczi Sep 20, 2017

Choose a reason for hiding this comment

cbuescher commented Sep 20, 2017

jimczi left a comment

Choose a reason for hiding this comment

cbuescher commented Sep 19, 2017 •

edited

Loading