Skip to content

upgrade arrow-rs to 55 #496

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resolver = "2"
members = [
"crates/duckdb",
"crates/libduckdb-sys",
"crates/duckdb-loadable-macros"
"crates/duckdb-loadable-macros",
]

[workspace.package]
Expand Down Expand Up @@ -36,7 +36,6 @@ fallible-streaming-iterator = "0.1"
flate2 = "1.0"
hashlink = "0.9"
lazy_static = "1.4"
memchr = "2.3"
num = { version = "0.4", default-features = false }
num-integer = "0.1.46"
pkg-config = "0.3.24"
Expand All @@ -63,4 +62,4 @@ unicase = "2.6.0"
url = "2.1"
uuid = "1.0"
vcpkg = "0.2"
arrow = { version = "54.2.1", default-features = false }
arrow = { version = "55", default-features = false }
4 changes: 2 additions & 2 deletions crates/duckdb-loadable-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ pub fn duckdb_entrypoint(_attr: TokenStream, item: TokenStream) -> TokenStream {
///
/// Will be called by duckdb
#[no_mangle]
pub unsafe extern "C" fn #c_entrypoint(db: *mut c_void) {
pub unsafe extern "C" fn #c_entrypoint(db: *mut std::ffi::c_void) {
unsafe {
let connection = Connection::open_from_raw(db.cast()).expect("can't open db connection");
#prefixed_original_function(connection).expect("init failed");
Expand All @@ -154,7 +154,7 @@ pub fn duckdb_entrypoint(_attr: TokenStream, item: TokenStream) -> TokenStream {
///
/// Predefined function, don't need to change unless you are sure
#[no_mangle]
pub unsafe extern "C" fn #c_entrypoint_version() -> *const c_char {
pub unsafe extern "C" fn #c_entrypoint_version() -> *const std::ffi::c_char {
unsafe {
ffi::duckdb_library_version()
}
Expand Down
2 changes: 0 additions & 2 deletions crates/duckdb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ lazy_static = { workspace = true, optional = true }
byteorder = { workspace = true, features = ["i128"], optional = true }
fallible-iterator = { workspace = true }
fallible-streaming-iterator = { workspace = true }
memchr = { workspace = true }
uuid = { workspace = true, optional = true }
smallvec = { workspace = true }
cast = { workspace = true, features = ["std"] }
Expand Down Expand Up @@ -83,7 +82,6 @@ pretty_assertions = { workspace = true }
# name = "data_types"
# harness = false


[package.metadata.docs.rs]
features = ["vtab", "vtab-arrow"]
all-features = false
Expand Down
2 changes: 1 addition & 1 deletion crates/duckdb/examples/hello-ext/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use duckdb_loadable_macros::duckdb_entrypoint;
use libduckdb_sys as ffi;
use std::{
error::Error,
ffi::{c_char, c_void, CString},
ffi::CString,
sync::atomic::{AtomicBool, Ordering},
};

Expand Down
5 changes: 2 additions & 3 deletions crates/duckdb/src/vtab/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,10 @@ impl InnerConnection {
mod test {
use super::*;
use crate::core::{Inserter, LogicalTypeId};
use std::sync::atomic::AtomicBool;
use std::sync::atomic::Ordering;
use std::{
error::Error,
ffi::{c_char, CString},
ffi::CString,
sync::atomic::{AtomicBool, Ordering},
};

struct HelloBindData {
Expand Down
Loading