Skip to content
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
24 changes: 12 additions & 12 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions rust/driver/dummy/tests/driver_exporter_dummy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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<u32> = info
.column(0)
Expand Down
16 changes: 16 additions & 0 deletions rust/driver_manager/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down Expand Up @@ -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))
}
Expand Down Expand Up @@ -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))
}
Expand Down Expand Up @@ -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))
}
Expand All @@ -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))
}
Expand Down Expand Up @@ -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))
}
Expand Down Expand Up @@ -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))
}
Expand Down Expand Up @@ -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))
}
Expand Down
4 changes: 4 additions & 0 deletions rust/ffi/src/driver_exporter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -1816,6 +1818,8 @@ extern "C" fn statement_bind_stream<DriverType: Driver>(
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);
Expand Down
Loading