Skip to content

fix(gdal): fix build with recent gdal version #695

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 1 commit into
base: main
Choose a base branch
from
Open

fix(gdal): fix build with recent gdal version #695

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
24 changes: 19 additions & 5 deletions src/spatial/modules/gdal/gdal_module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ class DuckDBFileHandle final : public VSIVirtualHandle {
private:
unique_ptr<FileHandle> file_handle;
bool is_eof;
bool has_error;

public:
explicit DuckDBFileHandle(unique_ptr<FileHandle> file_handle_p)
: file_handle(std::move(file_handle_p)), is_eof(false) {
: file_handle(std::move(file_handle_p)), is_eof(false), has_error(false) {
}

vsi_l_offset Tell() override {
Expand Down Expand Up @@ -88,16 +89,19 @@ class DuckDBFileHandle final : public VSIVirtualHandle {
pBuffer = static_cast<uint8_t *>(pBuffer) + read_bytes;
}
} catch (...) {
has_error = true;
}

if (remaining_bytes != 0) {
if (file_handle->SeekPosition() == file_handle->GetFileSize()) {
// Is at EOF!
is_eof = true;
} else {
// else, error!
// unfortunately, this version of GDAL cant distinguish between errors and reading less bytes
// its avaiable in 3.9.2, but we're stuck on 3.8.5 for now.
has_error = true;
}
// else, error!
// unfortunately, this version of GDAL cant distinguish between errors and reading less bytes
// its avaiable in 3.9.2, but we're stuck on 3.8.5 for now.
}

return nCount - (remaining_bytes / nSize);
Expand All @@ -112,6 +116,7 @@ class DuckDBFileHandle final : public VSIVirtualHandle {
try {
written_bytes = file_handle->Write(const_cast<void *>(pBuffer), nSize * nCount);
} catch (...) {
has_error = true;
}
// Return the number of items written
return static_cast<size_t>(written_bytes / nSize);
Expand All @@ -130,6 +135,15 @@ class DuckDBFileHandle final : public VSIVirtualHandle {
return 0;
}

void ClearErr() override {
has_error = false;
is_eof = false;
}

int Error() override {
return has_error ? TRUE : FALSE;
}

// int ReadMultiRange(int nRanges, void **ppData, const vsi_l_offset *panOffsets, const size_t *panSizes) override;
// void AdviseRead(int nRanges, const vsi_l_offset *panOffsets, const size_t *panSizes) override;
// VSIRangeStatus GetRangeStatus(vsi_l_offset nOffset, vsi_l_offset nLength) override;
Expand Down Expand Up @@ -2030,7 +2044,7 @@ void RegisterGDALModule(ExtensionLoader &loader) {
static std::once_flag loaded;
std::call_once(loaded, [&]() {
// Register all embedded drivers (dont go looking for plugins)
OGRRegisterAllInternal();
OGRRegisterAll();

// Set GDAL error handler
CPLSetErrorHandler([](CPLErr e, int code, const char *raw_msg) {
Expand Down