Skip to content

Commit d869cba

Browse files
authored
chore: Upgrade ADBC to 0.20.0 release (adbc_core + adbc_ffi) and adapt API changes (#190)
This is part of the forked/non-crates.io dependency elimination plan: #165. We switched the adbc_core version from a git rev to the latest release version and fixed API breaking changes.
1 parent e45d6f9 commit d869cba

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ rust-version = "1.82"
5454
[workspace.dependencies]
5555
approx = "0.5"
5656
abi_stable = "0.11.3"
57-
adbc_core = { git = "https://github.com/apache/arrow-adbc", rev = "1ba248290cd299c4969b679463bcd54c217cf2e4" }
57+
adbc_core = "0.20.0"
58+
adbc_ffi = "0.20.0"
5859
lru = "0.12"
5960
arrow = { version = "55.1.0", features = ["prettyprint", "ffi", "chrono-tz"] }
6061
arrow-array = { version = "55.1.0" }

rust/sedona-adbc/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ result_large_err = "allow"
2929

3030
[dependencies]
3131
adbc_core = { workspace = true }
32+
adbc_ffi = { workspace = true }
3233
arrow-array = { workspace = true }
3334
arrow-schema = { workspace = true }
3435
datafusion = { workspace = true }

rust/sedona-adbc/src/database.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ impl Optionable for SedonaDatabase {
5151
impl Database for SedonaDatabase {
5252
type ConnectionType = SedonaConnection;
5353

54-
fn new_connection(&mut self) -> Result<SedonaConnection> {
54+
fn new_connection(&self) -> Result<SedonaConnection> {
5555
self.new_connection_with_opts([])
5656
}
5757

5858
fn new_connection_with_opts(
59-
&mut self,
59+
&self,
6060
opts: impl IntoIterator<Item = (OptionConnection, OptionValue)>,
6161
) -> Result<SedonaConnection> {
6262
SedonaConnection::try_new(opts)

rust/sedona-adbc/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ pub mod database;
2121
pub mod driver;
2222
pub mod statement;
2323

24-
use adbc_core::error::{Error, Status};
2524
use driver::SedonaDriver;
2625

27-
adbc_core::export_driver!(AdbcSedonadbDriverInit, SedonaDriver);
26+
adbc_ffi::export_driver!(AdbcSedonadbDriverInit, SedonaDriver);

0 commit comments

Comments
 (0)