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
1 change: 1 addition & 0 deletions datafusion/datasource-parquet/src/file_format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ async fn get_file_decryption_properties(
}

#[cfg(not(feature = "parquet_encryption"))]
#[expect(clippy::unused_async)]

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drive by fix to when you run clippy and don't have the parquet_encryption feature enabled.

async fn get_file_decryption_properties(
_state: &dyn Session,
_options: &TableParquetOptions,
Expand Down
1 change: 1 addition & 0 deletions datafusion/datasource-parquet/src/opener/encryption.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ impl EncryptionContext {

#[cfg(not(feature = "parquet_encryption"))]
#[expect(dead_code)]
#[expect(clippy::unused_async)]

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drive by fix to when you run clippy and don't have the parquet_encryption feature enabled.

impl EncryptionContext {
pub(super) async fn get_file_decryption_properties(
&self,
Expand Down
1 change: 1 addition & 0 deletions datafusion/datasource-parquet/src/sink.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ async fn set_writer_encryption_properties(
}

#[cfg(not(feature = "parquet_encryption"))]
#[expect(clippy::unused_async)]

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drive by fix to when you run clippy and don't have the parquet_encryption feature enabled.

async fn set_writer_encryption_properties(
builder: WriterPropertiesBuilder,
_runtime: &Arc<RuntimeEnv>,
Expand Down
1 change: 1 addition & 0 deletions datafusion/ffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ pub mod physical_optimizer;
pub mod placement;
pub mod plan_properties;
pub mod proto;
pub mod query_planner;
pub mod record_batch_stream;
pub mod schema_provider;
pub mod session;
Expand Down
8 changes: 3 additions & 5 deletions datafusion/ffi/src/proto/logical_extension_codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pub struct FFI_LogicalExtensionCodec {
try_encode_udwf:
unsafe extern "C" fn(&Self, node: FFI_WindowUDF) -> FFI_Result<SVec<u8>>,

pub task_ctx_provider: FFI_TaskContextProvider,
pub(crate) task_ctx_provider: FFI_TaskContextProvider,

/// Used to create a clone on the provider of the execution plan. This should
/// only need to be called by the receiver of the plan.
Expand Down Expand Up @@ -295,7 +295,7 @@ impl Drop for FFI_LogicalExtensionCodec {
impl FFI_LogicalExtensionCodec {
/// Creates a new [`FFI_LogicalExtensionCodec`].
pub fn new(
codec: Arc<dyn LogicalExtensionCodec + Send>,
codec: Arc<dyn LogicalExtensionCodec>,
runtime: Option<Handle>,
task_ctx_provider: impl Into<FFI_TaskContextProvider>,
) -> Self {
Expand Down Expand Up @@ -712,14 +712,12 @@ mod tests {

#[test]
fn ffi_logical_extension_codec_local_bypass() {
let codec =
Arc::new(TestExtensionCodec {}) as Arc<dyn LogicalExtensionCodec + Send>;
let codec = Arc::new(TestExtensionCodec {}) as Arc<dyn LogicalExtensionCodec>;
let (_ctx, task_ctx_provider) = crate::util::tests::test_session_and_ctx();

let mut ffi_codec =
FFI_LogicalExtensionCodec::new(Arc::clone(&codec), None, task_ctx_provider);

let codec = codec as Arc<dyn LogicalExtensionCodec>;
// Verify local libraries can be downcast to their original
let foreign_codec: Arc<dyn LogicalExtensionCodec> = (&ffi_codec).into();
assert!(arc_ptr_eq(&foreign_codec, &codec));
Expand Down
8 changes: 3 additions & 5 deletions datafusion/ffi/src/proto/physical_extension_codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ pub struct FFI_PhysicalExtensionCodec {
unsafe extern "C" fn(&Self, node: FFI_WindowUDF) -> FFI_Result<SVec<u8>>,

/// Access the current [`TaskContext`].
task_ctx_provider: FFI_TaskContextProvider,
pub(crate) task_ctx_provider: FFI_TaskContextProvider,

/// Used to create a clone on the provider of the execution plan. This should
/// only need to be called by the receiver of the plan.
Expand Down Expand Up @@ -281,7 +281,7 @@ impl Drop for FFI_PhysicalExtensionCodec {
impl FFI_PhysicalExtensionCodec {
/// Creates a new [`FFI_PhysicalExtensionCodec`].
pub fn new(
codec: Arc<dyn PhysicalExtensionCodec + Send>,
codec: Arc<dyn PhysicalExtensionCodec>,
runtime: Option<Handle>,
task_ctx_provider: impl Into<FFI_TaskContextProvider>,
) -> Self {
Expand Down Expand Up @@ -695,14 +695,12 @@ pub(crate) mod tests {

#[test]
fn ffi_physical_extension_codec_local_bypass() {
let codec =
Arc::new(TestExtensionCodec {}) as Arc<dyn PhysicalExtensionCodec + Send>;
let codec = Arc::new(TestExtensionCodec {}) as Arc<dyn PhysicalExtensionCodec>;
let (_ctx, task_ctx_provider) = crate::util::tests::test_session_and_ctx();

let mut ffi_codec =
FFI_PhysicalExtensionCodec::new(Arc::clone(&codec), None, task_ctx_provider);

let codec = codec as Arc<dyn PhysicalExtensionCodec>;
// Verify local libraries can be downcast to their original
let foreign_codec: Arc<dyn PhysicalExtensionCodec> = (&ffi_codec).into();
assert!(arc_ptr_eq(&foreign_codec, &codec));
Expand Down
Loading
Loading