Skip to content

REST : Clear Indices Cache API remove deprecated url params #29068

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

Merged
merged 1 commit into from
Mar 14, 2018
Merged

REST : Clear Indices Cache API remove deprecated url params #29068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion docs/reference/migration/migrate_7_0/indices.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ shards the index has. In order to maintain the exact same distribution as a pre
`index.number_of_routing_shards` must be set to the `index.number_of_shards` at index creation time.
Note: if the number of routing shards equals the number of shards `_split` operations are not supported.

==== Skipped background refresh on search idle shards.
==== Skipped background refresh on search idle shards

Shards belonging to an index that does not have an explicit
`index.refresh_interval` configured will no longer refresh in the background
Expand All @@ -55,3 +55,12 @@ traffic for `index.search.idle.after` seconds (defaults to `30s`). Searches
that access a search idle shard will be "parked" until the next refresh
happens. Indexing requests with `wait_for_refresh` will also trigger
a background refresh.

==== Remove deprecated url parameters for Clear Indices Cache API

The following previously deprecated url parameter have been removed:

* `filter` - use `query` instead
* `filter_cache` - use `query` instead
* `request_cache` - use `request` instead
* `field_data` - use `fielddata` instead
8 changes: 0 additions & 8 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.clear_cache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
}
},
"params": {
"field_data": {
"type" : "boolean",
"description" : "Clear field data. This is deprecated. Prefer `fielddata`."
},
"fielddata": {
"type" : "boolean",
"description" : "Clear field data"
Expand Down Expand Up @@ -50,10 +46,6 @@
"type" : "boolean",
"description" : "Clear the recycler cache"
},
"request_cache": {
"type" : "boolean",
"description" : "Clear request cache"
},
"request": {
"type" : "boolean",
"description" : "Clear request cache"
Expand Down
26 changes: 0 additions & 26 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,6 @@
indices.clear_cache:
request: false

---
"clear_cache with request_cache set to false":
- skip:
version: " - 5.3.99"
reason: request_cache was deprecated in 5.4.0
features: "warnings"

- do:
warnings:
- 'Deprecated field [request_cache] used, expected [request] instead'
indices.clear_cache:
request_cache: false

---
"clear_cache with field_data set to true":
- skip:
version: " - 6.2.99"
reason: field_data was deprecated in 6.3.0
features: "warnings"

- do:
warnings:
- 'Deprecated field [field_data] used, expected [fielddata] instead'
indices.clear_cache:
field_data: true

---
"clear_cache with fielddata set to true":
- skip:
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ public static ClearIndicesCacheRequest fromRequest(final RestRequest request, Cl
}

public static class Fields {
public static final ParseField QUERY = new ParseField("query", "filter", "filter_cache");
public static final ParseField REQUEST = new ParseField("request", "request_cache");
public static final ParseField FIELDDATA = new ParseField("fielddata", "field_data");
public static final ParseField QUERY = new ParseField("query");
public static final ParseField REQUEST = new ParseField("request");
public static final ParseField FIELDDATA = new ParseField("fielddata");
Copy link
Member

@javanna javanna Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at this point using ParseField s for parameters can be replaced with just strings.

Copy link
Contributor Author

@olcbean olcbean Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!
Do you wanna take it over or should I?

Copy link
Member

@javanna javanna Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all yours if you have time for it ;)

public static final ParseField FIELDS = new ParseField("fields");
}

Expand Down