Skip to content

Commit f9c5bc0

Browse files
Remove legacy params from range query (#116970)
Remove to, from, include_lower, include_upper range query params. These params have been removed from our documentation in v. 0.90.4 (d6ecdec), and got deprecated in 8.16 in #113286.
1 parent 1e3398f commit f9c5bc0

File tree

8 files changed

+13
-51
lines changed

8 files changed

+13
-51
lines changed

docs/changelog/116970.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
pr: 116970
2+
summary: Remove legacy params from range query
3+
area: Search
4+
type: breaking
5+
issues: []
6+
breaking:
7+
title: Remove legacy params from range query
8+
area: REST API
9+
details: The deprecated range query parameters `to`, `from`, `include_lower`, and `include_upper` are no longer supported.
10+
impact: Users should use `lt`, `lte`, `gt`, and `gte` query parameters instead.
11+
notable: false

modules/rank-eval/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,3 @@ testClusters.configureEach {
2525
// Modules who's integration is explicitly tested in integration tests
2626
module ':modules:lang-mustache'
2727
}
28-
29-
tasks.named("yamlRestCompatTestTransform").configure({ task ->
30-
task.skipTest("rank_eval/30_failures/Response format", "warning does not exist for compatibility")
31-
})

modules/runtime-fields-common/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,3 @@ dependencies {
2222
api project(':libs:grok')
2323
api project(':libs:dissect')
2424
}
25-
26-
tasks.named("yamlRestCompatTestTransform").configure({ task ->
27-
task.skipTestsByFilePattern("**/runtime_fields/110_composite.yml", "warning does not exist for compatibility")
28-
})

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ tests:
6767
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
6868
method: test {p0=mtermvectors/10_basic/Tests catching other exceptions per item}
6969
issue: https://github.com/elastic/elasticsearch/issues/113325
70-
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
71-
method: test {p0=search/500_date_range/from, to, include_lower, include_upper deprecated}
72-
issue: https://github.com/elastic/elasticsearch/pull/113286
7370
- class: org.elasticsearch.integration.KibanaUserRoleIntegTests
7471
method: testFieldMappings
7572
issue: https://github.com/elastic/elasticsearch/issues/113592

rest-api-spec/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,5 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
5959
task.replaceValueInMatch("profile.shards.0.dfs.knn.0.query.0.description", "DocAndScoreQuery[0,...][0.009673266,...],0.009673266", "dfs knn vector profiling with vector_operations_count")
6060
task.skipTest("cat.aliases/10_basic/Deprecated local parameter", "CAT APIs not covered by compatibility policy")
6161
task.skipTest("cat.shards/10_basic/Help", "sync_id is removed in 9.0")
62+
task.skipTest("search/500_date_range/from, to, include_lower, include_upper deprecated", "deprecated parameters are removed in 9.0")
6263
})

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -123,29 +123,3 @@ setup:
123123
- match: { hits.total: 1 }
124124
- length: { hits.hits: 1 }
125125
- match: { hits.hits.0._id: "4" }
126-
127-
128-
---
129-
"from, to, include_lower, include_upper deprecated":
130-
- requires:
131-
cluster_features: "gte_v8.16.0"
132-
reason: 'from, to, include_lower, include_upper parameters are deprecated since 8.16.0'
133-
test_runner_features: warnings
134-
135-
- do:
136-
warnings:
137-
- "Deprecated field [from] used, this field is unused and will be removed entirely"
138-
- "Deprecated field [to] used, this field is unused and will be removed entirely"
139-
- "Deprecated field [include_lower] used, this field is unused and will be removed entirely"
140-
- "Deprecated field [include_upper] used, this field is unused and will be removed entirely"
141-
search:
142-
index: dates
143-
body:
144-
sort: field
145-
query:
146-
range:
147-
date:
148-
from: 1000
149-
to: 2023
150-
include_lower: false
151-
include_upper: false

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ public class RangeQueryBuilder extends AbstractQueryBuilder<RangeQueryBuilder> i
4545

4646
public static final ParseField LTE_FIELD = new ParseField("lte");
4747
public static final ParseField GTE_FIELD = new ParseField("gte");
48-
public static final ParseField FROM_FIELD = new ParseField("from").withAllDeprecated();
49-
public static final ParseField TO_FIELD = new ParseField("to").withAllDeprecated();
50-
private static final ParseField INCLUDE_LOWER_FIELD = new ParseField("include_lower").withAllDeprecated();
51-
private static final ParseField INCLUDE_UPPER_FIELD = new ParseField("include_upper").withAllDeprecated();
5248
public static final ParseField GT_FIELD = new ParseField("gt");
5349
public static final ParseField LT_FIELD = new ParseField("lt");
5450
private static final ParseField TIME_ZONE_FIELD = new ParseField("time_zone");
@@ -367,15 +363,7 @@ public static RangeQueryBuilder fromXContent(XContentParser parser) throws IOExc
367363
if (token == XContentParser.Token.FIELD_NAME) {
368364
currentFieldName = parser.currentName();
369365
} else {
370-
if (FROM_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
371-
from = maybeConvertToBytesRef(parser.objectBytes());
372-
} else if (TO_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
373-
to = maybeConvertToBytesRef(parser.objectBytes());
374-
} else if (INCLUDE_LOWER_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
375-
includeLower = parser.booleanValue();
376-
} else if (INCLUDE_UPPER_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
377-
includeUpper = parser.booleanValue();
378-
} else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
366+
if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
379367
boost = parser.floatValue();
380368
} else if (GT_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
381369
from = maybeConvertToBytesRef(parser.objectBytes());

x-pack/plugin/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ tasks.named("precommit").configure {
8181
}
8282

8383
tasks.named("yamlRestCompatTestTransform").configure({ task ->
84-
task.skipTest("security/10_forbidden/Test bulk response with invalid credentials", "warning does not exist for compatibility")
8584
task.skipTest("esql/60_usage/Basic ESQL usage output (telemetry)", "The telemetry output changed. We dropped a column. That's safe.")
8685
task.skipTest("inference/inference_crud/Test get all", "Assertions on number of inference models break due to default configs")
8786
task.skipTest("esql/60_usage/Basic ESQL usage output (telemetry) snapshot version", "The number of functions is constantly increasing")

0 commit comments

Comments
 (0)