Skip to content

Commit 51b5c43

Browse files
authored
update arrow version to 11 (#38)
update arrow version to 11
1 parent 5083d39 commit 51b5c43

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: cargo
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
target-branch: master
9+
labels: [auto-dependencies]

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ memchr = "2.3"
4646
uuid = { version = "0.8", optional = true }
4747
smallvec = "1.6.1"
4848
cast = { version = "0.3", features = ["std"] }
49-
arrow = { version = "6.5.0", default-features = false, features = ["prettyprint"] }
49+
arrow = { version = "11", default-features = false, features = ["prettyprint"] }
5050
rust_decimal = "1.14"
51-
strum = { version = "0.23", features = ["derive"] }
51+
strum = { version = "0.24", features = ["derive"] }
5252
r2d2 = { version = "0.8.9", optional = true }
5353

5454
[dev-dependencies]

libduckdb-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ cc = { version = "1.0", features = ["parallel"], optional = true }
2828
vcpkg = { version = "0.2", optional = true }
2929

3030
[dev-dependencies]
31-
arrow = { version = "6.5.0", default-features = false }
31+
arrow = { version = "11", default-features = false }

libduckdb-sys/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ mod tests {
8585
}
8686
assert_eq!(duckdb_arrow_row_count(result), 3);
8787
assert_eq!(duckdb_arrow_column_count(result), 2);
88-
let (mut arrays, mut schema) = ArrowArray::into_raw(ArrowArray::empty());
88+
89+
let mut arrays = &FFI_ArrowArray::empty();
90+
let mut schema = &FFI_ArrowSchema::empty();
8991
let schema = &mut schema;
9092
if duckdb_query_arrow_schema(result, schema as *mut _ as *mut *mut c_void) != duckdb_state_DuckDBSuccess {
9193
panic!("SELECT error")

src/raw_statement.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,22 @@ impl RawStatement {
5555
pub fn step(&self) -> Option<StructArray> {
5656
self.result?;
5757
unsafe {
58-
let (mut arrays, mut schema) = ArrowArray::into_raw(ArrowArray::empty());
59-
let schema = &mut schema;
58+
let mut arrays = &FFI_ArrowArray::empty();
6059
let arrays = &mut arrays;
6160
if ffi::duckdb_query_arrow_array(self.result_unwrap(), arrays as *mut _ as *mut *mut c_void)
6261
!= ffi::DuckDBSuccess
6362
{
64-
let _ = ArrowArray::try_from_raw(*arrays as *mut FFI_ArrowArray, *schema as *mut FFI_ArrowSchema);
6563
return None;
6664
}
6765
if (**arrays).is_empty() {
68-
let _ = ArrowArray::try_from_raw(*arrays as *mut FFI_ArrowArray, *schema as *mut FFI_ArrowSchema);
6966
return None;
7067
}
7168

69+
let mut schema = &FFI_ArrowSchema::empty();
70+
let schema = &mut schema;
7271
if ffi::duckdb_query_arrow_schema(self.result_unwrap(), schema as *mut _ as *mut *mut c_void)
7372
!= ffi::DuckDBSuccess
7473
{
75-
// clean raw data
76-
let _ = ArrowArray::try_from_raw(*arrays as *mut FFI_ArrowArray, *schema as *mut FFI_ArrowSchema);
7774
return None;
7875
}
7976

0 commit comments

Comments
 (0)