-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Add parsing from xContent to ShardSearchFailure #22699
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.
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
cbuescher
merged 1 commit into
elastic:master
from
cbuescher:addParsing-ShardSearchFailure
Jan 20, 2017
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
core/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.action.search; | ||
|
|
||
| import org.elasticsearch.common.ParsingException; | ||
| import org.elasticsearch.common.bytes.BytesReference; | ||
| import org.elasticsearch.common.xcontent.XContentParser; | ||
| import org.elasticsearch.common.xcontent.XContentType; | ||
| import org.elasticsearch.index.Index; | ||
| import org.elasticsearch.index.shard.ShardId; | ||
| import org.elasticsearch.search.SearchShardTarget; | ||
| import org.elasticsearch.test.ESTestCase; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.elasticsearch.common.xcontent.XContentHelper.toXContent; | ||
|
|
||
| public class ShardSearchFailureTests extends ESTestCase { | ||
|
|
||
| public static ShardSearchFailure createTestItem() { | ||
| String randomMessage = randomAsciiOfLengthBetween(3, 20); | ||
| Exception ex = new ParsingException(0, 0, randomMessage , new IllegalArgumentException("some bad argument")); | ||
| String nodeId = randomAsciiOfLengthBetween(5, 10); | ||
| String indexName = randomAsciiOfLengthBetween(5, 10); | ||
| String indexUuid = randomAsciiOfLengthBetween(5, 10); | ||
| int shardId = randomInt(); | ||
| return new ShardSearchFailure(ex, | ||
| new SearchShardTarget(nodeId, new ShardId(new Index(indexName, indexUuid), shardId))); | ||
| } | ||
|
|
||
| public void testFromXContent() throws IOException { | ||
| ShardSearchFailure response = createTestItem(); | ||
| XContentType xContentType = randomFrom(XContentType.values()); | ||
| boolean humanReadable = randomBoolean(); | ||
| BytesReference originalBytes = toXContent(response, xContentType, humanReadable); | ||
|
|
||
| ShardSearchFailure parsed; | ||
| try (XContentParser parser = createParser(xContentType.xContent(), originalBytes)) { | ||
| assertEquals(XContentParser.Token.START_OBJECT, parser.nextToken()); | ||
| parsed = ShardSearchFailure.fromXContent(parser); | ||
| assertEquals(XContentParser.Token.END_OBJECT, parser.currentToken()); | ||
| assertNull(parser.nextToken()); | ||
| } | ||
| assertEquals(response.index(), parsed.index()); | ||
| assertEquals(response.shard().getNodeId(), parsed.shard().getNodeId()); | ||
| assertEquals(response.shardId(), parsed.shardId()); | ||
|
|
||
| // we cannot compare the cause, because it will be wrapped in an outer ElasticSearchException | ||
| // best effort: try to check that the original message appears somewhere in the rendered xContent | ||
| String originalMsg = response.getCause().getMessage(); | ||
| assertEquals(parsed.getCause().getMessage(), "Elasticsearch exception [type=parsing_exception, reason=" + originalMsg + "]"); | ||
| String nestedMsg = response.getCause().getCause().getMessage(); | ||
| assertEquals(parsed.getCause().getCause().getMessage(), | ||
| "Elasticsearch exception [type=illegal_argument_exception, reason=" + nestedMsg + "]"); | ||
| } | ||
|
|
||
| public void testToXContent() throws IOException { | ||
| ShardSearchFailure failure = new ShardSearchFailure(new ParsingException(0, 0, "some message", null), | ||
| new SearchShardTarget("nodeId", new ShardId(new Index("indexName", "indexUuid"), 123))); | ||
| BytesReference xContent = toXContent(failure, XContentType.JSON); | ||
| assertEquals( | ||
| "{\"shard\":123," | ||
| + "\"index\":\"indexName\"," | ||
| + "\"node\":\"nodeId\"," | ||
| + "\"reason\":{" | ||
| + "\"type\":\"parsing_exception\"," | ||
| + "\"reason\":\"some message\"," | ||
| + "\"line\":0," | ||
| + "\"col\":0" | ||
| + "}" | ||
| + "}", | ||
| xContent.utf8ToString()); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shall we rather use assertToXContentEquivalent ? I am always cautious on comparing json strings (keys ordering etc.) but maybe in this case it's ok
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think in the toXContent tests that are more a way of checking the intended output is as expected (and more to show a simple, fixed example output in the tests), string comparrison is more intuitive and shouldn't break. We also do this in the other toXContent tests, so I will leave this also to stay consistent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no objections :)