Skip to content

Commit

Permalink
Get Mapping API to honour allow_no_indices and ignore_unavailable (#3…
Browse files Browse the repository at this point in the history
…1507)

Get Mapping currently throws index not found exception (and returns
404 status code) from the REST layer whenever an index was specified
and no indices have been returned. We should not have this logic in the
REST layer though as only our index resolver should decide whether we
need to throw exceptions or not based on provided indices and corresponding
indices options.

Closes #31485
  • Loading branch information
javanna authored Jun 22, 2018
1 parent 009ae48 commit 0352d88
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,24 @@
indices.get_mapping:
index: test_index

---
"Index missing, ignore_unavailable=true":
- skip:
version: " - 6.99.99"
reason: ignore_unavailable was ignored in previous versions
- do:
indices.get_mapping:
index: test_index
ignore_unavailable: true

- match: { '': {} }

---
"Index missing, ignore_unavailable=true, allow_no_indices=false":
- do:
catch: missing
indices.get_mapping:
index: test_index
ignore_unavailable: true
allow_no_indices: false

Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,26 @@ setup:

---
"Get test-* with wildcard_expansion=none":
- skip:
version: " - 6.99.99"
reason: allow_no_indices (defaults to true) was ignored in previous versions
- do:
catch: missing
indices.get_mapping:
index: test-x*
expand_wildcards: none

- match: { '': {} }
---
"Get test-* with wildcard_expansion=none allow_no_indices=false":
- skip:
version: " - 6.99.99"
reason: allow_no_indices was ignored in previous versions
- do:
catch: missing
indices.get_mapping:
index: test-x*
expand_wildcards: none
allow_no_indices: false
---
"Get test-* with wildcard_expansion=open,closed":

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.elasticsearch.common.util.set.Sets;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.indices.TypeMissingException;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.BytesRestResponse;
Expand Down Expand Up @@ -89,14 +88,9 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
@Override
public RestResponse buildResponse(final GetMappingsResponse response, final XContentBuilder builder) throws Exception {
final ImmutableOpenMap<String, ImmutableOpenMap<String, MappingMetaData>> mappingsByIndex = response.getMappings();
if (mappingsByIndex.isEmpty() && (indices.length != 0 || types.length != 0)) {
if (indices.length != 0 && types.length == 0) {
builder.close();
return new BytesRestResponse(channel, new IndexNotFoundException(String.join(",", indices)));
} else {
builder.close();
return new BytesRestResponse(channel, new TypeMissingException("_all", String.join(",", types)));
}
if (mappingsByIndex.isEmpty() && types.length != 0) {
builder.close();
return new BytesRestResponse(channel, new TypeMissingException("_all", String.join(",", types)));
}

final Set<String> typeNames = new HashSet<>();
Expand Down

0 comments on commit 0352d88

Please sign in to comment.