Skip to content
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

Remove more checkstyle suppressions #36735

Merged
merged 7 commits into from
Jan 8, 2019

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Dec 17, 2018

This commit removes several more line length violations from checkstyle
suppression.
relates #34884

This commit removes several more line length violations from checkstyle
suppression.
relates elastic#34884
@rjernst rjernst added >non-issue :Core/Infra/Core Core issues without another label v7.0.0 v6.6.0 labels Dec 17, 2018
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

@rjernst
Copy link
Member Author

rjernst commented Dec 17, 2018

@elasticmachine test this please

Copy link
Contributor

@matriv matriv left a comment

Choose a reason for hiding this comment

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

LGTM. Left some very minor comments regarding additional cosmetic changes.

table.addCell("pri.segments.fixed_bitset_memory", "default:false;text-align:right;desc:memory used by fixed bit sets for nested object field types and type filters for types referred in _parent fields");
table.addCell("segments.fixed_bitset_memory",
"sibling:pri;alias:sfbm,fixedBitsetMemory;default:false;text-align:right;desc:memory used by fixed bit sets for" +
" nested object field types and type filters for types referred in _parent fields");
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this needs to be "unidented" by 4 spaces. Also just for the "beauty" of things you can move the leading whitespace char to the prev line.

" nested object field types and type filters for types referred in _parent fields");
table.addCell("pri.segments.fixed_bitset_memory",
"default:false;text-align:right;desc:memory used by fixed bit sets for nested object" +
" field types and type filters for types referred in _parent fields");
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

"alias:svmm,segmentsVersionMapMemory;default:false;text-align:right;desc:memory used by version map");
table.addCell("segments.fixed_bitset_memory",
"alias:sfbm,fixedBitsetMemory;default:false;text-align:right;desc:memory used by fixed bit sets for nested object" +
" field types and type filters for types referred in _parent fields");
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

@@ -1509,7 +1517,8 @@ public void restore() throws IOException {
logger.trace("[{}] [{}] restoring from to an empty shard", shardId, snapshotId);
recoveryTargetMetadata = Store.MetadataSnapshot.EMPTY;
} catch (IOException e) {
logger.warn(() -> new ParameterizedMessage("{} Can't read metadata from store, will not reuse any local file while restoring", shardId), e);
logger.warn(() -> new ParameterizedMessage("{} Can't read metadata from store, will not reuse any local" +
" file while restoring", shardId), e);
Copy link
Contributor

Choose a reason for hiding this comment

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

same here for the leading whitespace char.

}
} else {
throw new RepositoryVerificationException(metadata.name(), "a file written by master to the store [" + blobStore() + "] cannot be accessed on the node [" + localNode + "]. "
throw new RepositoryVerificationException(metadata.name(), "a file written by master to the store [" + blobStore() +
"] cannot be accessed on the node [" + localNode + "]. "
+ "This might indicate that the store [" + blobStore() + "] is not shared between this node and the master node or "
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe here and below you can move the + to the end of the prev line.

@jasontedor jasontedor added v6.7.0 and removed v6.6.0 labels Dec 19, 2018
@rjernst
Copy link
Member Author

rjernst commented Jan 8, 2019

@elasticmachine run gradle build tests 1

@rjernst rjernst merged commit 86b7193 into elastic:master Jan 8, 2019
@rjernst rjernst deleted the checkstyle_line_lengths branch January 8, 2019 19:04
rjernst added a commit that referenced this pull request Jan 8, 2019
This commit removes several more line length violations from checkstyle
suppression.

relates #34884
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants