Skip to content

Use HTTPException for HTTP errors in GetRangeRequest #36

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
merged 1 commit into from
May 13, 2025
Merged

Use HTTPException for HTTP errors in GetRangeRequest #36

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
10 changes: 5 additions & 5 deletions extension/httpfs/httpfs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ unique_ptr<HTTPResponse> HTTPFileSystem::GetRequest(FileHandle &handle, string u
error += " This could mean the file was changed. Try disabling the duckdb http metadata cache "
"if enabled, and confirm the server supports range requests.";
}
throw IOException(error);
throw HTTPException(error);
}
return true;
},
Expand Down Expand Up @@ -230,8 +230,8 @@ unique_ptr<HTTPResponse> HTTPFileSystem::GetRangeRequest(FileHandle &handle, str
if (response.HasHeader("Content-Length")) {
auto content_length = stoll(response.GetHeaderValue("Content-Length"));
if ((idx_t)content_length != buffer_out_len) {
throw IOException("HTTP GET error: Content-Length from server mismatches requested "
"range, server may not support range requests.");
throw HTTPException("HTTP GET error: Content-Length from server mismatches requested "
"range, server may not support range requests.");
}
}
}
Expand All @@ -245,8 +245,8 @@ unique_ptr<HTTPResponse> HTTPFileSystem::GetRangeRequest(FileHandle &handle, str
// behaviour, so we have to improve logic elsewhere to properly handle this case.

// To avoid corruption of memory, we bail out.
throw IOException("Server sent back more data than expected, `SET force_download=true` might "
"help in this case");
throw HTTPException("Server sent back more data than expected, `SET force_download=true` might "
"help in this case");
}
memcpy(buffer_out + out_offset, data, data_length);
out_offset += data_length;
Expand Down
Loading