Skip to content

[fix](remote)Fix bug for cache reader #12104

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
yangzhg merged 1 commit into from
Aug 29, 2022
Merged

[fix](remote)Fix bug for cache reader #12104

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
6 changes: 3 additions & 3 deletions be/src/io/cache/sub_file_cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Status SubFileCache::read_at(size_t offset, Slice result, size_t* bytes_read) {
if (offset_begin + req_size > _remote_file_reader->size()) {
req_size = _remote_file_reader->size() - offset_begin;
}
RETURN_IF_ERROR(_generate_cache_reader(*iter, req_size));
RETURN_IF_ERROR(_generate_cache_reader(offset_begin, req_size));
}
}
_cache_file_size = _get_cache_file_size();
Expand All @@ -82,7 +82,6 @@ Status SubFileCache::read_at(size_t offset, Slice result, size_t* bytes_read) {
for (vector<size_t>::const_iterator iter = need_cache_offsets.cbegin();
iter != need_cache_offsets.cend(); ++iter) {
size_t offset_begin = *iter;
size_t req_size = config::max_sub_cache_file_size;
if (_cache_file_readers.find(*iter) == _cache_file_readers.end()) {
LOG(ERROR) << "Local cache file reader can't be found: " << offset_begin << ", "
<< offset_begin;
Expand All @@ -91,6 +90,7 @@ Status SubFileCache::read_at(size_t offset, Slice result, size_t* bytes_read) {
if (offset_begin < offset) {
offset_begin = offset;
}
size_t req_size = *iter + config::max_sub_cache_file_size - offset_begin;
if (offset + result.size < *iter + config::max_sub_cache_file_size) {
req_size = offset + result.size - offset_begin;
}
Expand Down Expand Up @@ -157,7 +157,7 @@ Status SubFileCache::_generate_cache_reader(size_t offset, size_t req_size) {
Slice file_slice(file_buf.get(), req_size);
size_t bytes_read = 0;
RETURN_NOT_OK_STATUS_WITH_WARN(
_remote_file_reader->read_at(0, file_slice, &bytes_read),
_remote_file_reader->read_at(offset, file_slice, &bytes_read),
fmt::format("read remote file failed. {}. offset: {}, size: {}",
_remote_file_reader->path().native(), offset, req_size));
if (bytes_read != req_size) {
Expand Down