Copilot commented on code in PR #681: URL: https://github.com/apache/sedona-db/pull/681#discussion_r2879931248
########## c/sedona-gdal/src/gdal_api.rs: ########## @@ -0,0 +1,101 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use std::ffi::CStr; +use std::path::PathBuf; + +use libloading::Library; + +use crate::dyn_load; +use crate::errors::{GdalError, GdalInitLibraryError}; +use crate::gdal_dyn_bindgen::SedonaGdalApi; + +/// Invoke a function pointer from the `SedonaGdalApi` struct. +/// +/// # Panics +/// +/// Panics if the function pointer is `None`. This is unreachable in correct usage +/// because all function pointers are guaranteed to be `Some` after successful +/// `sedona_gdal_dyn_api_init` (the C loader fails if any symbol is missing), +/// and you cannot obtain a `&GdalApi` without successful initialization +/// (it's behind `OnceLock`). +macro_rules! call_gdal_api { + ($api:expr, $func:ident $(, $arg:expr)*) => { + if let Some(func) = $api.inner.$func { + func($($arg),*) + } else { + panic!("{} function not available", stringify!($func)) + } + }; +} + +// Re-export for use in other modules in this crate +#[allow(unused_imports)] +pub(crate) use call_gdal_api; + +#[derive(Debug)] +pub struct GdalApi { + pub(crate) inner: SedonaGdalApi, + /// The dynamically loaded GDAL library. Kept alive for the lifetime of the + /// function pointers in `inner`. This is never dropped because the `GdalApi` + /// lives in a `static OnceLock` (see `register.rs`). + _lib: Library, + name: String, +} + +impl GdalApi { + pub fn try_from_shared_library(shared_library: PathBuf) -> Result<Self, GdalInitLibraryError> { + let (lib, inner) = dyn_load::load_gdal_from_path(&shared_library)?; + Ok(Self { + inner, + _lib: lib, + name: shared_library.to_string_lossy().into_owned(), + }) + } + + pub fn try_from_current_process() -> Result<Self, GdalInitLibraryError> { + let (lib, inner) = dyn_load::load_gdal_from_current_process()?; + Ok(Self { + inner, + _lib: lib, + name: "current_process".to_string(), + }) + } + + pub fn name(&self) -> &str { + &self.name + } + + /// Check the last CPL error and return a `GdalError` if there was one. + pub fn last_cpl_err(&self, default_err_class: u32) -> GdalError { + let err_no = unsafe { call_gdal_api!(self, CPLGetLastErrorNo) }; + let err_msg = unsafe { + let msg_ptr = call_gdal_api!(self, CPLGetLastErrorMsg); + if msg_ptr.is_null() { + String::new() + } else { + CStr::from_ptr(msg_ptr).to_string_lossy().into_owned() + } + }; + unsafe { call_gdal_api!(self, CPLErrorReset) }; + GdalError::CplError { + class: default_err_class, + number: err_no, + msg: err_msg, + } + } +} Review Comment: The sedona-proj crate (the stated pattern this follows) has comprehensive tests in `c/sedona-proj/src/proj.rs`, `transform.rs`, and others. The `sedona-gdal` crate has no tests at all (no `#[test]` or `#[cfg(test)]` blocks anywhere). At minimum, tests for loading errors (e.g., invalid library path), version checking behavior, and symbol loading should be added to match the coverage level of the companion `sedona-proj` crate. ```suggestion } #[cfg(test)] mod tests { use super::*; use std::panic; use std::path::PathBuf; /// Ensure that attempting to load GDAL from an invalid shared library path /// returns an error instead of succeeding. #[test] fn try_from_shared_library_invalid_path_returns_error() { // Use a clearly invalid path that should not exist on any system. let invalid_path = PathBuf::from("this/path/should/not/exist/libgdal.so"); let result = GdalApi::try_from_shared_library(invalid_path); assert!( result.is_err(), "expected error when loading GDAL from invalid path" ); } /// Minimal dummy inner type with the same field name shape as expected by /// the `call_gdal_api!` macro for testing its panic behavior. #[derive(Default)] struct DummyInner { CPLGetLastErrorNo: Option<unsafe extern "C" fn() -> i32>, } struct DummyApi { inner: DummyInner, } /// Verify that `call_gdal_api!` panics when the requested function pointer /// is `None`, exercising the error path in the macro. #[test] fn call_gdal_api_panics_when_function_missing() { let api = DummyApi { inner: DummyInner { CPLGetLastErrorNo: None }, }; let result = panic::catch_unwind(|| { // SAFETY: We are calling a test-only dummy API; the macro will // panic before attempting to invoke any function pointer. let _ = unsafe { call_gdal_api!(api, CPLGetLastErrorNo) }; }); assert!( result.is_err(), "expected call_gdal_api! to panic when function pointer is None" ); } } ``` ########## c/sedona-gdal/Cargo.toml: ########## @@ -0,0 +1,45 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +[package] +name = "sedona-gdal" +version.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +description.workspace = true +readme.workspace = true +edition.workspace = true +rust-version.workspace = true + +[lib] +crate-type = ["staticlib", "cdylib", "lib"] + Review Comment: The `crate-type = ["staticlib", "cdylib", "lib"]` setting is inconsistent with all other C wrapper crates in this workspace (`sedona-proj`, `sedona-geos`, `sedona-tg`, etc.), none of which specify a custom `[lib]` crate type. There is no accompanying C header, cbindgen configuration, or any C-facing FFI exports visible in this crate that would justify generating `staticlib` or `cdylib` artifacts. This will cause unnecessary binary artifacts to be built and may cause build issues. Unless there are concrete plans to expose a C ABI, this `[lib]` section should be removed (which defaults to `lib`) to match the rest of the workspace. ```suggestion ``` ########## c/sedona-gdal/src/gdal_api.rs: ########## @@ -0,0 +1,101 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use std::ffi::CStr; +use std::path::PathBuf; + +use libloading::Library; + +use crate::dyn_load; +use crate::errors::{GdalError, GdalInitLibraryError}; +use crate::gdal_dyn_bindgen::SedonaGdalApi; + +/// Invoke a function pointer from the `SedonaGdalApi` struct. +/// +/// # Panics +/// +/// Panics if the function pointer is `None`. This is unreachable in correct usage +/// because all function pointers are guaranteed to be `Some` after successful +/// `sedona_gdal_dyn_api_init` (the C loader fails if any symbol is missing), +/// and you cannot obtain a `&GdalApi` without successful initialization +/// (it's behind `OnceLock`). Review Comment: The `call_gdal_api!` macro docstring references `sedona_gdal_dyn_api_init` as the initialization function, but no such function exists in this codebase. The actual initialization is performed by `load_all_symbols` (in `dyn_load.rs`) via `GdalApi::try_from_shared_library` or `GdalApi::try_from_current_process`. The comment should reference the correct Rust function. ```suggestion /// initialization of `GdalApi` via `load_all_symbols` (invoked by /// `GdalApi::try_from_shared_library` or `GdalApi::try_from_current_process`; /// the loader fails if any symbol is missing), and you cannot obtain a `&GdalApi` /// without successful initialization (it's behind `OnceLock`). ``` ########## c/sedona-gdal/src/register.rs: ########## @@ -0,0 +1,152 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use crate::errors::GdalInitLibraryError; +use crate::gdal_api::GdalApi; +use std::path::PathBuf; +use std::sync::{Mutex, OnceLock}; + +/// Minimum GDAL version required by sedona-gdal. +#[cfg(feature = "gdal-sys")] +const MIN_GDAL_VERSION_MAJOR: i32 = 3; +#[cfg(feature = "gdal-sys")] +const MIN_GDAL_VERSION_MINOR: i32 = 4; + +static GDAL_API: OnceLock<GdalApi> = OnceLock::new(); +static GDAL_API_INIT_LOCK: Mutex<()> = Mutex::new(()); + +fn init_gdal_api<F>(init: F) -> Result<&'static GdalApi, GdalInitLibraryError> +where + F: FnOnce() -> Result<GdalApi, GdalInitLibraryError>, +{ + if let Some(api) = GDAL_API.get() { + return Ok(api); + } + + let _guard = GDAL_API_INIT_LOCK + .lock() + .map_err(|_| GdalInitLibraryError::Invalid("GDAL API init lock poisoned".to_string()))?; + + if let Some(api) = GDAL_API.get() { + return Ok(api); + } + + let api = init()?; + + // Register all GDAL drivers once, immediately after loading symbols. + // This mirrors georust/gdal's `_register_drivers()` pattern where + // `GDALAllRegister` is called via `std::sync::Once` before any driver + // lookup or dataset open. Here the `OnceLock` + `Mutex` already + // guarantees this runs exactly once. + unsafe { + let Some(gdal_all_register) = api.inner.GDALAllRegister else { + return Err(GdalInitLibraryError::LibraryError( + "GDALAllRegister symbol not loaded".to_string(), + )); + }; + gdal_all_register(); + } + + let _ = GDAL_API.set(api); + Ok(GDAL_API.get().expect("GDAL API should be set")) +} + +pub fn configure_global_gdal_api(shared_library: PathBuf) -> Result<(), GdalInitLibraryError> { Review Comment: `configure_global_gdal_api` silently succeeds (returns `Ok(())`) even if the GDAL API has already been initialized — in that case the provided `shared_library` path is entirely ignored. This can confuse callers who expect their specific library to be used. The function should either: (a) return an error when already initialized, or (b) document this behavior clearly with a note that the function is a no-op if the API was already initialized. ```suggestion pub fn configure_global_gdal_api(shared_library: PathBuf) -> Result<(), GdalInitLibraryError> { if GDAL_API.get().is_some() { return Err(GdalInitLibraryError::Invalid( "GDAL API already configured".to_string(), )); } ``` ########## c/sedona-gdal/src/lib.rs: ########## @@ -0,0 +1,34 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// --- FFI layer --- +pub(crate) mod dyn_load; +pub mod gdal_dyn_bindgen; Review Comment: The `gdal_dyn_bindgen` module is declared `pub`, making the raw `SedonaGdalApi` struct and all low-level FFI types directly accessible to consumers of this crate. In contrast, the equivalent `proj_dyn_bindgen` in the `sedona-proj` crate is private (`mod proj_dyn_bindgen`), as it is an internal implementation detail. Exposing `SedonaGdalApi` directly allows callers to bypass the safer `GdalApi` abstraction and access uninitialized function pointers. This should be `pub(crate)` unless there is a deliberate intent to expose the raw FFI types as a public API. ```suggestion pub(crate) mod gdal_dyn_bindgen; ``` ########## c/sedona-gdal/src/gdal_api.rs: ########## @@ -0,0 +1,101 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use std::ffi::CStr; +use std::path::PathBuf; + +use libloading::Library; + +use crate::dyn_load; +use crate::errors::{GdalError, GdalInitLibraryError}; +use crate::gdal_dyn_bindgen::SedonaGdalApi; + +/// Invoke a function pointer from the `SedonaGdalApi` struct. +/// +/// # Panics +/// +/// Panics if the function pointer is `None`. This is unreachable in correct usage +/// because all function pointers are guaranteed to be `Some` after successful +/// `sedona_gdal_dyn_api_init` (the C loader fails if any symbol is missing), +/// and you cannot obtain a `&GdalApi` without successful initialization +/// (it's behind `OnceLock`). +macro_rules! call_gdal_api { + ($api:expr, $func:ident $(, $arg:expr)*) => { + if let Some(func) = $api.inner.$func { + func($($arg),*) + } else { + panic!("{} function not available", stringify!($func)) + } + }; +} + +// Re-export for use in other modules in this crate +#[allow(unused_imports)] +pub(crate) use call_gdal_api; + +#[derive(Debug)] +pub struct GdalApi { + pub(crate) inner: SedonaGdalApi, + /// The dynamically loaded GDAL library. Kept alive for the lifetime of the + /// function pointers in `inner`. This is never dropped because the `GdalApi` + /// lives in a `static OnceLock` (see `register.rs`). + _lib: Library, + name: String, +} + +impl GdalApi { + pub fn try_from_shared_library(shared_library: PathBuf) -> Result<Self, GdalInitLibraryError> { + let (lib, inner) = dyn_load::load_gdal_from_path(&shared_library)?; + Ok(Self { + inner, + _lib: lib, + name: shared_library.to_string_lossy().into_owned(), + }) + } + + pub fn try_from_current_process() -> Result<Self, GdalInitLibraryError> { + let (lib, inner) = dyn_load::load_gdal_from_current_process()?; + Ok(Self { + inner, + _lib: lib, + name: "current_process".to_string(), + }) + } + + pub fn name(&self) -> &str { + &self.name + } + + /// Check the last CPL error and return a `GdalError` if there was one. + pub fn last_cpl_err(&self, default_err_class: u32) -> GdalError { + let err_no = unsafe { call_gdal_api!(self, CPLGetLastErrorNo) }; + let err_msg = unsafe { + let msg_ptr = call_gdal_api!(self, CPLGetLastErrorMsg); + if msg_ptr.is_null() { + String::new() + } else { + CStr::from_ptr(msg_ptr).to_string_lossy().into_owned() + } + }; + unsafe { call_gdal_api!(self, CPLErrorReset) }; + GdalError::CplError { + class: default_err_class, + number: err_no, + msg: err_msg, + } Review Comment: The `last_cpl_err` method's docstring says "Check the last CPL error and return a `GdalError` if there was one", implying it may not always return an error. However, the implementation **always** constructs and returns a `GdalError::CplError`, even when `CPLGetLastErrorNo` returns `0` (meaning no error occurred). If this function is called when there is no actual error, the caller will receive a spurious error. The return type should be changed to `Option<GdalError>` (returning `None` when `err_no == 0`), or the docstring should be corrected to clarify that it always returns an error struct (even when the error number is 0). ########## c/sedona-gdal/src/dyn_load.rs: ########## @@ -0,0 +1,252 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use std::path::Path; + +use libloading::Library; + +use crate::errors::GdalInitLibraryError; +use crate::gdal_dyn_bindgen::SedonaGdalApi; + +/// Load a single symbol from the library and write it into the given field. +/// +/// We load as a raw `*const ()` pointer and transmute to the target function pointer +/// type. This is the standard pattern for dynamic symbol loading where the loaded +/// symbol's signature is known but cannot be expressed as a generic parameter to +/// `Library::get` (because each field has a different signature). +/// +/// On failure returns a `GdalInitLibraryError` with the symbol name and the +/// underlying OS error message. +macro_rules! load_fn { + ($lib:expr, $api:expr, $name:ident) => { + // The target types here are too verbose to annotate for each call site + #[allow(clippy::missing_transmute_annotations)] + { + $api.$name = Some(unsafe { + let sym = $lib + .get::<*const ()>(concat!(stringify!($name), "\0").as_bytes()) + .map_err(|e| { + GdalInitLibraryError::LibraryError(format!( + "Failed to load symbol {}: {}", + stringify!($name), + e + )) + })?; + std::mem::transmute(sym.into_raw().into_raw()) + }); + } + }; +} + +/// Try to load a symbol under one of several names (e.g. for C++ mangled symbols). +/// Writes the first successful match into `$api.$field`. Returns an error only if +/// *none* of the names resolve. +macro_rules! load_fn_any { + ($lib:expr, $api:expr, $field:ident, [$($name:expr),+ $(,)?]) => {{ + let mut found = false; + $( + if !found { + if let Ok(sym) = unsafe { $lib.get::<*const ()>($name) } { + // The target types here are too verbose to annotate for each call site + #[allow(clippy::missing_transmute_annotations)] + { + $api.$field = Some(unsafe { std::mem::transmute(sym.into_raw().into_raw()) }); + } + found = true; + } + } + )+ + if !found { + return Err(GdalInitLibraryError::LibraryError(format!( + "Failed to resolve {} under any known mangled name", + stringify!($field), + ))); + } + }}; +} + +/// Populate all 64 function-pointer fields of [`SedonaGdalApi`] from the given +/// [`Library`] handle. +fn load_all_symbols(lib: &Library, api: &mut SedonaGdalApi) -> Result<(), GdalInitLibraryError> { + // --- Dataset --- + load_fn!(lib, api, GDALOpenEx); + load_fn!(lib, api, GDALClose); + load_fn!(lib, api, GDALGetRasterXSize); + load_fn!(lib, api, GDALGetRasterYSize); + load_fn!(lib, api, GDALGetRasterCount); + load_fn!(lib, api, GDALGetRasterBand); + load_fn!(lib, api, GDALGetGeoTransform); + load_fn!(lib, api, GDALSetGeoTransform); + load_fn!(lib, api, GDALGetProjectionRef); + load_fn!(lib, api, GDALSetProjection); + load_fn!(lib, api, GDALGetSpatialRef); + load_fn!(lib, api, GDALSetSpatialRef); + load_fn!(lib, api, GDALCreateCopy); + load_fn!(lib, api, GDALDatasetCreateLayer); + + // --- Driver --- + load_fn!(lib, api, GDALAllRegister); + load_fn!(lib, api, GDALGetDriverByName); + load_fn!(lib, api, GDALCreate); + + // --- Band --- + load_fn!(lib, api, GDALAddBand); + load_fn!(lib, api, GDALRasterIO); + load_fn!(lib, api, GDALRasterIOEx); + load_fn!(lib, api, GDALGetRasterDataType); + load_fn!(lib, api, GDALGetRasterBandXSize); + load_fn!(lib, api, GDALGetRasterBandYSize); + load_fn!(lib, api, GDALGetBlockSize); + load_fn!(lib, api, GDALGetRasterNoDataValue); + load_fn!(lib, api, GDALSetRasterNoDataValue); + load_fn!(lib, api, GDALDeleteRasterNoDataValue); + load_fn!(lib, api, GDALSetRasterNoDataValueAsUInt64); + load_fn!(lib, api, GDALSetRasterNoDataValueAsInt64); + + // --- SpatialRef --- + load_fn!(lib, api, OSRNewSpatialReference); + load_fn!(lib, api, OSRDestroySpatialReference); + load_fn!(lib, api, OSRExportToPROJJSON); + load_fn!(lib, api, OSRClone); + load_fn!(lib, api, OSRRelease); + + // --- Geometry --- + load_fn!(lib, api, OGR_G_CreateFromWkb); + load_fn!(lib, api, OGR_G_CreateFromWkt); + load_fn!(lib, api, OGR_G_ExportToIsoWkb); + load_fn!(lib, api, OGR_G_WkbSize); + load_fn!(lib, api, OGR_G_GetEnvelope); + load_fn!(lib, api, OGR_G_DestroyGeometry); + + // --- Vector / Layer --- + load_fn!(lib, api, OGR_L_ResetReading); + load_fn!(lib, api, OGR_L_GetNextFeature); + load_fn!(lib, api, OGR_L_CreateField); + load_fn!(lib, api, OGR_L_GetFeatureCount); + load_fn!(lib, api, OGR_F_GetGeometryRef); + load_fn!(lib, api, OGR_F_GetFieldIndex); + load_fn!(lib, api, OGR_F_GetFieldAsDouble); + load_fn!(lib, api, OGR_F_GetFieldAsInteger); + load_fn!(lib, api, OGR_F_IsFieldSetAndNotNull); + load_fn!(lib, api, OGR_F_Destroy); + load_fn!(lib, api, OGR_Fld_Create); + load_fn!(lib, api, OGR_Fld_Destroy); + + // --- VSI --- + load_fn!(lib, api, VSIFileFromMemBuffer); + load_fn!(lib, api, VSIFCloseL); + load_fn!(lib, api, VSIUnlink); + load_fn!(lib, api, VSIGetMemFileBuffer); + load_fn!(lib, api, VSIFree); + load_fn!(lib, api, VSIMalloc); + + // --- VRT --- + load_fn!(lib, api, VRTCreate); + load_fn!(lib, api, VRTAddSimpleSource); + + // --- Rasterize / Polygonize --- + load_fn!(lib, api, GDALRasterizeGeometries); + load_fn!(lib, api, GDALFPolygonize); + load_fn!(lib, api, GDALPolygonize); + + // --- Config --- + load_fn!(lib, api, CPLSetThreadLocalConfigOption); + + // --- Error --- + load_fn!(lib, api, CPLGetLastErrorNo); + load_fn!(lib, api, CPLGetLastErrorMsg); + load_fn!(lib, api, CPLErrorReset); + + // --- Data Type --- + load_fn!(lib, api, GDALGetDataTypeSizeBytes); + + // --- C++ API: MEMDataset::Create (resolved via mangled symbol names) --- + // The symbol is mangled differently on Linux, macOS, and MSVC, and the + // `char**` vs `const char**` parameter also affects the mangling. + load_fn_any!( + lib, + api, + MEMDatasetCreate, + [ + // Linux (char**) + b"_ZN10MEMDataset6CreateEPKciii12GDALDataTypePPc\0", + // macOS (char**) + b"__ZN10MEMDataset6CreateEPKciii12GDALDataTypePPc\0", + // Linux (const char**) + b"_ZN10MEMDataset6CreateEPKciii12GDALDataTypePPKc\0", + // macOS (const char**) + b"__ZN10MEMDataset6CreateEPKciii12GDALDataTypePPKc\0", + // MSVC (char**) + b"?Create@MEMDataset@@SAPEAV1@PEBDHHH4GDALDataType@@PEAPEAD@Z\0", + // MSVC (const char**) + b"?Create@MEMDataset@@SAPEAV1@PEBDHHH4GDALDataType@@PEAPEBAD@Z\0", + ] + ); + + Ok(()) +} + +/// Load a GDAL shared library from `path` and populate a [`SedonaGdalApi`] struct. +/// +/// Returns the `(Library, SedonaGdalApi)` pair. The caller is responsible for +/// keeping the `Library` alive for the lifetime of the function pointers. +pub(crate) fn load_gdal_from_path( + path: &Path, +) -> Result<(Library, SedonaGdalApi), GdalInitLibraryError> { + let lib = unsafe { Library::new(path.as_os_str()) }.map_err(|e| { + GdalInitLibraryError::LibraryError(format!( + "Failed to load GDAL library from {}: {}", + path.display(), + e + )) + })?; + + let mut api = SedonaGdalApi::default(); + load_all_symbols(&lib, &mut api)?; + Ok((lib, api)) +} + +/// Load GDAL symbols from the current process image (equivalent to `dlopen(NULL)`). +/// +/// Returns the `(Library, SedonaGdalApi)` pair. The caller is responsible for +/// keeping the `Library` alive for the lifetime of the function pointers. +pub(crate) fn load_gdal_from_current_process( +) -> Result<(Library, SedonaGdalApi), GdalInitLibraryError> { + let lib = current_process_library()?; + let mut api = SedonaGdalApi::default(); + load_all_symbols(&lib, &mut api)?; + Ok((lib, api)) +} + +/// Open a handle to the current process image. +#[cfg(unix)] +fn current_process_library() -> Result<Library, GdalInitLibraryError> { + Ok(libloading::os::unix::Library::this().into()) Review Comment: The `current_process_library` function is only defined for `#[cfg(unix)]` and `#[cfg(windows)]` targets, with no fallback for other platforms (e.g. WASM or other exotic targets). If this code is compiled on a non-unix, non-windows target, `load_gdal_from_current_process` will fail to compile because `current_process_library` is not defined. A compile-time error or a fallback that returns an informative error should be added for unrecognized platforms, similar to `#[cfg(not(any(unix, windows)))]` with a `compile_error!` or an appropriate runtime error. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
