[Enhancement] Support large json in image #48569
Merged
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
gengjun-git
force-pushed
the
fix_load_image_overflow_bug
branch
from
9570084
to
2e6c0fa
Compare
nshangyiming
reviewed
Aug 8, 2024
| Path checksumPath = Path.of(imageDir, "v2", Storage.CHECKSUM + "." + imageJournalId); | ||
| File checksumFile = new File(checksumPath.toUri()); | ||
| if (!checksumFile.exists()) { | ||
| return; |
There was a problem hiding this comment.
We should treat checksum seriously, this shouldn't happend, we should throw an exception explicitly.
| long expectedCheckSum = Long.parseLong(Files.readString(checksumPath)); | ||
| try (CheckedInputStream in = new CheckedInputStream(new FileInputStream(imageFile), new CRC32())) { | ||
| byte[] bytes = new byte[8192]; | ||
| while (in.read(bytes) != -1) { |
There was a problem hiding this comment.
add log to check how long does this take
There was a problem hiding this comment.
I use the checkedInputStream to judge the checksum at the end. So no pre-check required.
| while (in.read(bytes) != -1) { | ||
| } | ||
|
|
||
| long realCheckSum = in.getChecksum().getValue(); |
There was a problem hiding this comment.
Besides, if we use checkedInputStream to read data from v2 image file at the beginning, we don't need to checksum again? just like SRMetaBlockReader.
There was a problem hiding this comment.
Yes, I use the checkedInputStream to judge the checksum at the end.
| @Override | ||
| public void writeJson(Object object) throws IOException, SRMetaBlockException { | ||
| if (isBasicType(object)) { | ||
| throw new SRMetaBlockException("can not write primitive type"); |
There was a problem hiding this comment.
Two adjacent primitive types will be considered as one when reading.
gengjun-git
force-pushed
the
fix_load_image_overflow_bug
branch
from
d326c0c
to
e833dcc
Compare
Signed-off-by: gengjun-git <[email protected]>
Signed-off-by: gengjun-git <[email protected]>
gengjun-git
force-pushed
the
fix_load_image_overflow_bug
branch
from
1829033
to
5a5cf45
Compare
Signed-off-by: gengjun-git <[email protected]>
Signed-off-by: gengjun-git <[email protected]>
|
[Java-Extensions Incremental Coverage Report]✅ pass : 0 / 0 (0%) |
[FE Incremental Coverage Report]❌ fail : 309 / 484 (63.84%) file detail
|
[BE Incremental Coverage Report]✅ pass : 0 / 0 (0%) |
nshangyiming
approved these changes
Aug 15, 2024
satanson
approved these changes
Aug 16, 2024
Seaven
approved these changes
Aug 16, 2024
wyb
approved these changes
Aug 16, 2024
|
@Mergifyio backport branch-3.3 |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Aug 16, 2024
Signed-off-by: gengjun-git <[email protected]> (cherry picked from commit 78715a7) # Conflicts: # fe/fe-core/src/main/java/com/starrocks/authentication/AuthenticationMgr.java # fe/fe-core/src/main/java/com/starrocks/http/meta/MetaService.java # fe/fe-core/src/main/java/com/starrocks/leader/Checkpoint.java # fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
42 tasks
wanpengfei-git
pushed a commit
that referenced
this pull request
Aug 19, 2024
Signed-off-by: gengjun-git <[email protected]> Co-authored-by: gengjun-git <[email protected]>
24 tasks
gengjun-git
added a commit
that referenced
this pull request
Oct 9, 2024
## Why I'm doing: Backport the stream reading of #48569 Signed-off-by: gengjun-git <[email protected]>
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.
Why I'm doing:
Currently, JSON serialization supports a maximum of 2G, because serialization converts the object into a JSON string first, and then writes the string into the image file, and the maximum size of a string in Java is only 2G.
What I'm doing:
To support large json string, we can use the stream api of GSON:
JsonWriterandJsonReader.Since we cannot know the length of the string in advance, so a new image file format is introduced: a json string must begin with "{" or "[", so primitive type is not supported, and there is nothing between the json string. To support rollback, we use a double write solution. The dir format is as follows
meta/image/image.111is the old format image file, andmeta/image/v2/image.111is the new format image file. Since the JsonReader will cache some chars in advance, so we cannot calculate the checksum of the specific meta-block, and the checksum is put into another filechecksum.111;What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist:
Bugfix cherry-pick branch check: