diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 69c984ab54e..2abcdb28f56 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -86,9 +86,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "60.0.0" +version = "60.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51dff6e4b9f158864a0aeb6a131ad53858ecbae7a2fc8989307b9b3c6b2f122e" +checksum = "0f3d22a41d3df78b71df0b685af219ae3a94188ab98d6fb29c958eb55c3247f4" dependencies = [ "ahash", "arrow-buffer", @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "60.0.0" +version = "60.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7235b863533e9db3ab86905b4521251de11226275b436ff3cb2d0010558d1c5" +checksum = "7bd46a530bc1a8e763102fc36c1dc0f51f3ffa150c78e7f5658ccb54b1458ade" dependencies = [ "bytes", "half", @@ -117,9 +117,9 @@ dependencies = [ [[package]] name = "arrow-cmp" -version = "60.0.0" +version = "60.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a0e9adb28d95739fabcdae637261a2c14e618caf58ba1b88857120f9ee2687" +checksum = "1913e57a64fbf2c4502fa6d54b547d6a1ae59e3146cbc15321d47468c937abd1" dependencies = [ "arrow-array", "arrow-buffer", @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "60.0.0" +version = "60.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa06d5e22786c4966ffc4d2f171d0cb65d95f6bdea108a14e8c335e9faa437f" +checksum = "415b7fbc4cf56b080bb5677a4ae74211b5c79e571ed37a1d547633ec07f3b43b" dependencies = [ "arrow-buffer", "arrow-schema", @@ -141,18 +141,18 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "60.0.0" +version = "60.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f85a9a58cd03560526b0066487574aacb9008e413504fa0ee23d61141e96c338" +checksum = "de2c8e714b466404cdc1189e89f892426efea614d938e16c15518c340cd43ba3" dependencies = [ "bitflags", ] [[package]] name = "arrow-select" -version = "60.0.0" +version = "60.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3482b7d03bf4a3bf0b195f08a7f2b071595ccd54897e35b975ac63d3104977" +checksum = "a5af3f6656c5f2c6944f93d9a357a7f204c93d5f349385a44cf46c4a26fbcf30" dependencies = [ "ahash", "arrow-array", diff --git a/rust/driver/dummy/tests/driver_exporter_dummy.rs b/rust/driver/dummy/tests/driver_exporter_dummy.rs index ecb7ff8935d..d19c39491b7 100644 --- a/rust/driver/dummy/tests/driver_exporter_dummy.rs +++ b/rust/driver/dummy/tests/driver_exporter_dummy.rs @@ -25,6 +25,8 @@ use std::ops::Deref; use std::sync::Arc; use arrow_array::cast::AsArray; +// TODO: Remove this once the minimum supported Arrow version is 60.1.0. +#[allow(deprecated)] use arrow_array::ffi_stream::{ArrowArrayStreamReader, FFI_ArrowArrayStream}; use arrow_array::types::UInt32Type; use arrow_array::{Array, Float64Array, Int64Array, RecordBatch, RecordBatchReader, StringArray}; @@ -440,6 +442,8 @@ fn test_connection_get_info_ignores_unrecognized_codes() { "an unrecognized info code must be ignored, not fail the call" ); + // TODO: Remove this once the minimum supported Arrow version is 60.1.0. + #[allow(deprecated)] let info = concat_reader(ArrowArrayStreamReader::try_new(stream).unwrap()); let returned_codes: HashSet = info .column(0) diff --git a/rust/driver_manager/src/lib.rs b/rust/driver_manager/src/lib.rs index ea7c071b74f..82ccf6f3d5f 100644 --- a/rust/driver_manager/src/lib.rs +++ b/rust/driver_manager/src/lib.rs @@ -122,6 +122,8 @@ use adbc_ffi::options::{ set_option_connection_raw, set_option_database, set_option_statement_raw, }; use arrow_array::ffi::{FFI_ArrowSchema, to_ffi}; +// TODO: Remove this once the minimum supported Arrow version is 60.1.0. +#[allow(deprecated)] use arrow_array::ffi_stream::{ArrowArrayStreamReader, FFI_ArrowArrayStream}; use arrow_array::{Array, RecordBatch, RecordBatchReader, StructArray}; @@ -1074,6 +1076,8 @@ impl Connection for ManagedConnection { let method = driver_method!(driver, ConnectionGetInfo); let status = unsafe { method(connection, codes_ptr, codes_len, &mut stream, &mut error) }; check_status(status, error)?; + // TODO: Remove this once the minimum supported Arrow version is 60.1.0. + #[allow(deprecated)] let reader = ArrowArrayStreamReader::try_new(stream)?; Ok(Box::new(reader)) } @@ -1143,6 +1147,8 @@ impl Connection for ManagedConnection { }; check_status(status, error)?; + // TODO: Remove this once the minimum supported Arrow version is 60.1.0. + #[allow(deprecated)] let reader = ArrowArrayStreamReader::try_new(stream)?; Ok(Box::new(reader)) } @@ -1192,6 +1198,8 @@ impl Connection for ManagedConnection { ) }; check_status(status, error)?; + // TODO: Remove this once the minimum supported Arrow version is 60.1.0. + #[allow(deprecated)] let reader = ArrowArrayStreamReader::try_new(stream)?; Ok(Box::new(reader)) } @@ -1216,6 +1224,8 @@ impl Connection for ManagedConnection { let method = driver_method!(driver, ConnectionGetStatisticNames); let status = unsafe { method(connection, &mut stream, &mut error) }; check_status(status, error)?; + // TODO: Remove this once the minimum supported Arrow version is 60.1.0. + #[allow(deprecated)] let reader = ArrowArrayStreamReader::try_new(stream)?; Ok(Box::new(reader)) } @@ -1273,6 +1283,8 @@ impl Connection for ManagedConnection { let method = driver_method!(driver, ConnectionGetTableTypes); let status = unsafe { method(connection, &mut stream, &mut error) }; check_status(status, error)?; + // TODO: Remove this once the minimum supported Arrow version is 60.1.0. + #[allow(deprecated)] let reader = ArrowArrayStreamReader::try_new(stream)?; Ok(Box::new(reader)) } @@ -1303,6 +1315,8 @@ impl Connection for ManagedConnection { ) }; check_status(status, error)?; + // TODO: Remove this once the minimum supported Arrow version is 60.1.0. + #[allow(deprecated)] let reader = ArrowArrayStreamReader::try_new(stream)?; Ok(Box::new(reader)) } @@ -1416,6 +1430,8 @@ impl Statement for ManagedStatement { let mut stream = FFI_ArrowArrayStream::empty(); let status = unsafe { method(statement, &mut stream, null_mut(), &mut error) }; check_status(status, error)?; + // TODO: Remove this once the minimum supported Arrow version is 60.1.0. + #[allow(deprecated)] let reader = ArrowArrayStreamReader::try_new(stream)?; Ok(Box::new(reader)) } diff --git a/rust/ffi/src/driver_exporter.rs b/rust/ffi/src/driver_exporter.rs index 72aa43add23..36873bd9abc 100644 --- a/rust/ffi/src/driver_exporter.rs +++ b/rust/ffi/src/driver_exporter.rs @@ -23,6 +23,8 @@ use std::sync::Mutex; use arrow_array::StructArray; use arrow_array::ffi::{FFI_ArrowArray, FFI_ArrowSchema, from_ffi}; +// TODO: Remove this once the minimum supported Arrow version is 60.1.0. +#[allow(deprecated)] use arrow_array::ffi_stream::{ArrowArrayStreamReader, FFI_ArrowArrayStream}; use arrow_schema::DataType; @@ -1816,6 +1818,8 @@ extern "C" fn statement_bind_stream( let mut stmt = check_err!(exported.try_statement(), error); let statement = &mut *stmt; + // TODO: Remove this once the minimum supported Arrow version is 60.1.0. + #[allow(deprecated)] let reader = check_err!(unsafe { ArrowArrayStreamReader::from_raw(stream) }, error); let reader = Box::new(reader); check_err!(statement.bind_stream(reader), error);