Fix line length offenders in the o.e.search package.#36223
Merged
jpountz merged 5 commits intoelastic:masterfrom Dec 6, 2018
Merged
Fix line length offenders in the o.e.search package.#36223jpountz merged 5 commits intoelastic:masterfrom
jpountz merged 5 commits intoelastic:masterfrom
Conversation
33 tasks
Collaborator
|
Pinging @elastic/es-core-infra |
nik9000
reviewed
Dec 4, 2018
| 297.1182, 299.4012, 300.6352, 302.1354, 304.1756, 306.1606, 307.3462, 308.5214, 309.4134, 310.8352, 313.9684, 315.837, | ||
| 316.7796, 318.9858, }, | ||
| // precision 7 | ||
| { 92, 93.4934, 94.9758, 96.4574, 97.9718, 99.4954, 101.5302, 103.0756, 104.6374, 106.1782, 107.7888, 109.9522, 111.592, |
| return Objects.equals(p, other.p) && | ||
| Objects.equals(algorithm.get(bucket), other.algorithm.get(bucket)) && | ||
| Objects.equals(getComparableData(bucket), other.getComparableData(bucket)); | ||
| return Objects.equals(p, other.p) && Objects.equals(algorithm.get(bucket), other.algorithm.get(bucket)) |
Member
There was a problem hiding this comment.
Could you do these one per line?
| indexRandom(true, docs); | ||
|
|
||
| SearchResponse resp = client().prepareSearch("idx").setTypes("type").setRouting(routing1).setQuery(matchAllQuery()).execute().actionGet(); | ||
| SearchResponse resp = client().prepareSearch("idx").setTypes("type").setRouting(routing1).setQuery(matchAllQuery()).execute() |
| logger.info("Searching for [test:{}]", English.intToEnglish(docToQuery)); | ||
| SearchResponse searchResponse = client().prepareSearch().setTypes("type").setQuery(QueryBuilders.matchQuery("test", English.intToEnglish(docToQuery))) | ||
| SearchResponse searchResponse = client().prepareSearch().setTypes("type") | ||
| .setQuery(QueryBuilders.matchQuery("test", English.intToEnglish(docToQuery))) |
Member
There was a problem hiding this comment.
I think this indentation doesn't line up with the line under it which'll be confusing to read.
| .setQuery( | ||
| geoBoundingBoxQuery("location").setValidationMethod(GeoValidationMethod.COERCE).setCorners(50, 0, -50, 360).type("indexed") | ||
| geoBoundingBoxQuery("location").setValidationMethod(GeoValidationMethod.COERCE).setCorners(50, 0, -50, 360) | ||
| .type("indexed") |
Member
There was a problem hiding this comment.
Having this line on the same indention of as the one that builds the object that it is poking doesn't quite feel right to me.
| for (int i = 0; i < 100; i++) { | ||
| client().prepareIndex("test", "type1", Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()).execute().actionGet(); | ||
| client().prepareIndex("test", "type1", Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()) | ||
| .execute().actionGet(); |
| .endObject() | ||
| ).get(); // we have 2 docs in a segment... | ||
| ForceMergeResponse actionGet = client().admin().indices().prepareForceMerge().setFlush(true).setMaxNumSegments(1).execute().actionGet(); | ||
| ForceMergeResponse actionGet = client().admin().indices().prepareForceMerge().setFlush(true).setMaxNumSegments(1).execute() |
nik9000
approved these changes
Dec 5, 2018
Member
nik9000
left a comment
There was a problem hiding this comment.
LGTM. Thanks for all that cleaning!
Member
|
I'm sorry for your merge conflicts! |
Contributor
Author
|
No worries, that shouldn't be too hard to fix. Thanks for reviewing! |
jpountz
added a commit
that referenced
this pull request
Dec 6, 2018
Contributor
Author
|
I am not backporting this one to 6.x as there is a number of conflicts that make this change unsafe. An alternative would be to re-do the change on 6.x but it is very time-consuming. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Relates #34884