RATIS-1855 Fix some sonar code smell and bugs in ratis-server #892
Conversation
This file contains 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
Signed-off-by: OneSizeFitQuorum <[email protected]>
|
PTAL @szetszwo |
szetszwo
reviewed
Jul 5, 2023
There was a problem hiding this comment.
@OneSizeFitsQuorum , thanks a lot for working on this! Please see the comments inlined.
| @@ -39,7 +40,7 @@ public class RaftStorageImpl implements RaftStorage { | |||
| private final StartupOption startupOption; | |||
| private final CorruptionPolicy logCorruptionPolicy; | |||
| private volatile StorageState state = StorageState.UNINITIALIZED; | |||
| private volatile RaftStorageMetadataFileImpl metaFile; | |||
| private final AtomicReference<RaftStorageMetadataFileImpl> metaFile = new AtomicReference<>(); | |||
There was a problem hiding this comment.
Let's create a class:
static class MetaFile {
private final AtomicReference<RaftStorageMetadataFileImpl> ref = new AtomicReference<>();
RaftStorageMetadataFile get() {
return ref.get();
}
RaftStorageMetadataFile set(File file) {
final RaftStorageMetadataFileImpl impl = new RaftStorageMetadataFileImpl(file);
ref.set(impl);
return impl;
}
}There was a problem hiding this comment.
Good advice~
Comment on lines
95
to
96
| metaFile.set(new RaftStorageMetadataFileImpl(storageDir.getMetaFile())); | ||
| metaFile.get().persist(RaftStorageMetadata.getDefault()); |
There was a problem hiding this comment.
After created a class, this becomes a single llne
metaFile.set(storageDir.getMetaFile()).persist(RaftStorageMetadata.getDefault());
Comment on lines
116
to
117
| metaFile.set(new RaftStorageMetadataFileImpl(f)); | ||
| final RaftStorageMetadata metadata = metaFile.get().getMetadata(); |
There was a problem hiding this comment.
Similarly, this becomes a single llne
final RaftStorageMetadata metadata = metaFile.set(f).getMetadata();| @@ -150,7 +152,7 @@ private RaftStorageImpl format() throws IOException { | |||
| } | |||
| throw new IOException("Failed to FORMAT a new storage dir for " + storageDirName + " from " + dirsInConf); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Please keep this empty line.
| @@ -130,13 +131,14 @@ RaftStorageImpl run() throws IOException { | |||
| } | |||
| } | |||
|
|
|||
| @SuppressWarnings("java:S1181") | |||
There was a problem hiding this comment.
Could you add a comment at the end for this and the other SuppressWarnings?
@SuppressWarnings("java:S1181") // catch Throwable@SuppressWarnings("java:S2095") // return ClosableSigned-off-by: OneSizeFitQuorum <[email protected]>
OneSizeFitsQuorum
force-pushed
the
jira1855
branch
from
c3b779c
to
a39249f
Compare
szetszwo
approved these changes
Jul 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
see jira1855