Skip to content

[Bug] Fix skip() api maybe skip unexpected bytes which makes inconsitent data #52

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.

Sign up for GitHub

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

Merged
jerqi merged 1 commit into from
Jul 12, 2022
Merged

[Bug] Fix skip() api maybe skip unexpected bytes which makes inconsitent data #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion storage/src/main/java/com/tencent/rss/storage/handler/impl/LocalFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,22 @@ public LocalFileReader(String path) throws Exception {

public byte[] read(long offset, int length) {
try {
dataInputStream.skip(offset);
long targetSkip = offset;
// comments from skip API:
// The skip method may, for a variety of reasons,
// end up skipping over some smaller number of bytes, possibly 0
// the result should be checked and try again until skip expectation length
while (targetSkip > 0) {
long realSkip = dataInputStream.skip(targetSkip);
if (realSkip == -1) {
throw new RuntimeException("Unexpected EOF when skip bytes");
}
targetSkip -= realSkip;
if (targetSkip > 0) {
LOG.warn("Got unexpected skip for path:" + path + " with offset["
+ offset + "], length[" + length + "], remain[" + targetSkip + "]");
}
}
byte[] buf = new byte[length];
dataInputStream.readFully(buf);
return buf;
Expand Down