[ISSUE #3160]fix compatibility issue when reading cache files with suffix ".datum" #3163
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
KomachiSion
requested changes
Jun 23, 2020
| @@ -155,13 +157,15 @@ private synchronized Datum readDatum(File file, String namespaceId) throws IOExc | |||
| if (StringUtils.isBlank(json)) { | |||
| return null; | |||
| } | |||
| JsonNode jsonNode = JacksonUtils.toObj(json); | |||
There was a problem hiding this comment.
I think still should use file name to identify
| @@ -139,7 +141,7 @@ public synchronized Datum load(String key) throws Exception { | |||
| } | |||
|
|
|||
| private boolean isDatumCacheFile(String fileName) { | |||
| return fileName.endsWith(CACHE_FILE_SUFFIX); | |||
| return fileName.endsWith(RAFT_CACHE_FILE_SUFFIX) || fileName.startsWith(RAFT_CACHE_FILE_PREFIX); | |||
There was a problem hiding this comment.
I think the second condition maybe too wide. should be add .naming for it?
|
I have adjusted the code.please help to review this pr again, thanks. @KomachiSion |
KomachiSion
approved these changes
Jun 24, 2020
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.
Please do not create a Pull Request without creating an issue first.
What is the purpose of the change
fix: #3160
Brief changelog
XX
Verifying this change
XXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
[ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=trueto make sure basic checks pass. Runmvn clean install -DskipITsto make sure unit-test pass. Runmvn clean test-compile failsafe:integration-testto make sure integration-test pass.