Skip to content

Apply patch from https://github.com/duckdb/duckdb/pull/18723 #149

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Apply patch from https://github.com/duckdb/duckdb/pull/18723 #149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23b0ba3
apply fix.patch
Tishj Oct 20, 2025
48d66ca
this was missed in the patch somehow?
Tishj Oct 20, 2025
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
8 changes: 4 additions & 4 deletions src/s3fs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@
if (entry->second == "400") {
// 400: BAD REQUEST
auto extra_text = S3FileSystem::GetS3BadRequestError(auth_params);
throw Exception(error.Type(), error.RawMessage() + extra_text, extra_info);
throw Exception(extra_info, error.Type(), error.RawMessage() + extra_text);

Check failure on line 893 in src/s3fs.cpp

View workflow job for this annotation

GitHub Actions / MinIO Tests 

no matching function for call to ‘duckdb::Exception::Exception(const std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >&, const duckdb::ExceptionType&, std::__cxx11::basic_string<char>)’
}
if (entry->second == "403") {
// 403: FORBIDDEN
Expand All @@ -900,7 +900,7 @@
} else {
extra_text = S3FileSystem::GetS3AuthError(auth_params);
}
throw Exception(error.Type(), error.RawMessage() + extra_text, extra_info);
throw Exception(extra_info, error.Type(), error.RawMessage() + extra_text);

Check failure on line 903 in src/s3fs.cpp

View workflow job for this annotation

GitHub Actions / MinIO Tests 

no matching function for call to ‘duckdb::Exception::Exception(const std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >&, const duckdb::ExceptionType&, std::__cxx11::basic_string<char>)’
}
}
throw;
Expand Down Expand Up @@ -936,14 +936,14 @@
void S3FileSystem::RemoveFile(const string &path, optional_ptr<FileOpener> opener) {
auto handle = OpenFile(path, FileFlags::FILE_FLAGS_NULL_IF_NOT_EXISTS, opener);
if (!handle) {
throw IOException("Could not remove file \"%s\": %s", {{"errno", "404"}}, path, "No such file or directory");
throw IOException({{"errno", "404"}}, "Could not remove file \"%s\": %s", path, "No such file or directory");

Check failure on line 939 in src/s3fs.cpp

View workflow job for this annotation

GitHub Actions / MinIO Tests 

no matching function for call to ‘duckdb::IOException::IOException(<brace-enclosed initializer list>, const char [31], const std::string&, const char [26])’
}

auto &s3fh = handle->Cast<S3FileHandle>();
auto res = DeleteRequest(*handle, s3fh.path, {});
if (res->status != HTTPStatusCode::OK_200 && res->status != HTTPStatusCode::NoContent_204) {
throw IOException("Could not remove file \"%s\": %s", {{"errno", to_string(static_cast<int>(res->status))}},
throw IOException({{"errno", to_string(static_cast<int>(res->status))}}, "Could not remove file \"%s\": %s",
path, res->GetError());

Check failure on line 946 in src/s3fs.cpp

View workflow job for this annotation

GitHub Actions / MinIO Tests 

no matching function for call to ‘duckdb::IOException::IOException(<brace-enclosed initializer list>, const char [31], const std::string&, const std::string&)’
}
}

Expand Down
Loading