Skip to content
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

fix(GCS+gRPC): correctly resume ranged reads #14495

Merged
merged 4 commits into from
Jul 18, 2024
Merged

fix(GCS+gRPC): correctly resume ranged reads #14495

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6b4644
fix(GCS+gRPC): correctly resume ranged reads
coryan Jul 18, 2024
5ac0e9a
Address review comments
coryan Jul 18, 2024
917bc6b
Add missing #include
coryan Jul 18, 2024
1fe132c
Address review comments
coryan Jul 18, 2024
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
35 changes: 17 additions & 18 deletions google/cloud/storage/internal/grpc/object_request_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,30 +377,29 @@ StatusOr<google::storage::v2::ReadObjectRequest> ToProto(
if (request.HasOption<storage::Generation>()) {
r.set_generation(request.GetOption<storage::Generation>().value());
}
if (request.HasOption<storage::ReadRange>()) {
auto const offset = request.GetOption<storage::ReadFromOffset>().value_or(0);
if (!request.HasOption<storage::ReadRange>()) {
r.set_read_offset(offset);
} else {
auto const range = request.GetOption<storage::ReadRange>().value();
r.set_read_offset(range.begin);
r.set_read_limit(range.end - range.begin);
auto const merged_offset = (std::max)(range.begin, offset);
auto const merged_limit = range.end - merged_offset;
if (merged_limit <= 0) {
return internal::InvalidArgumentError(
absl::StrCat("Invalid gRPC range offset=", merged_offset,
", limit=", merged_limit, ") from offset=", offset,
" range=[", range.begin, ",", range.end, ")"),
coryan marked this conversation as resolved.
Show resolved Hide resolved
GCP_ERROR_INFO());
}

r.set_read_offset(merged_offset);
r.set_read_limit(merged_limit);
}

if (request.HasOption<storage::ReadLast>()) {
auto const offset = request.GetOption<storage::ReadLast>().value();
r.set_read_offset(-offset);
}
if (request.HasOption<storage::ReadFromOffset>()) {
auto const offset = request.GetOption<storage::ReadFromOffset>().value();
if (r.read_limit() > 0 && offset >= r.read_offset() + r.read_limit()) {
return internal::InvalidArgumentError(
"ReadRange() and ReadFromOffset() options produce an empty range",
GCP_ERROR_INFO());
}
if (offset > r.read_offset()) {
if (r.read_limit() > 0) {
auto const limit = r.read_limit() - (offset - r.read_offset());
r.set_read_limit(limit);
}
r.set_read_offset(offset);
}
}
SetGenerationConditions(r, request);
SetMetagenerationConditions(r, request);

Expand Down
Loading