Skip to content

Commit 467c413

Browse files
wip
1 parent 5d043f7 commit 467c413

2 files changed

Lines changed: 1 addition & 22 deletions

File tree

datafusion/ffi/src/physical_expr/mod.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ pub struct FFI_PhysicalExpr {
112112

113113
pub fmt_sql: unsafe extern "C" fn(&Self) -> FFI_Result<SString>,
114114

115-
#[deprecated(
116-
since = "54.0.0",
117-
note = "downcast to `DynamicFilterPhysicalExpr` and call `current()` instead"
118-
)]
119115
pub snapshot: unsafe extern "C" fn(&Self) -> FFI_Result<FFI_Option<FFI_PhysicalExpr>>,
120116

121117
pub snapshot_generation: unsafe extern "C" fn(&Self) -> u64,
@@ -368,7 +364,6 @@ unsafe extern "C" fn fmt_sql_fn_wrapper(expr: &FFI_PhysicalExpr) -> FFI_Result<S
368364
FFI_Result::Ok(result.into())
369365
}
370366

371-
#[allow(deprecated)]
372367
unsafe extern "C" fn snapshot_fn_wrapper(
373368
expr: &FFI_PhysicalExpr,
374369
) -> FFI_Result<FFI_Option<FFI_PhysicalExpr>> {
@@ -432,7 +427,6 @@ unsafe extern "C" fn clone_fn_wrapper(expr: &FFI_PhysicalExpr) -> FFI_PhysicalEx
432427
propagate_statistics: propagate_statistics_fn_wrapper,
433428
get_properties: get_properties_fn_wrapper,
434429
fmt_sql: fmt_sql_fn_wrapper,
435-
#[expect(deprecated)]
436430
snapshot: snapshot_fn_wrapper,
437431
snapshot_generation: snapshot_generation_fn_wrapper,
438432
is_volatile_node: is_volatile_node_fn_wrapper,
@@ -476,7 +470,6 @@ impl From<Arc<dyn PhysicalExpr>> for FFI_PhysicalExpr {
476470
propagate_statistics: propagate_statistics_fn_wrapper,
477471
get_properties: get_properties_fn_wrapper,
478472
fmt_sql: fmt_sql_fn_wrapper,
479-
#[expect(deprecated)]
480473
snapshot: snapshot_fn_wrapper,
481474
snapshot_generation: snapshot_generation_fn_wrapper,
482475
is_volatile_node: is_volatile_node_fn_wrapper,
@@ -700,7 +693,6 @@ impl PhysicalExpr for ForeignPhysicalExpr {
700693

701694
fn snapshot(&self) -> Result<Option<Arc<dyn PhysicalExpr>>> {
702695
unsafe {
703-
#[allow(deprecated)]
704696
let result = df_result!((self.expr.snapshot)(&self.expr))?;
705697
Ok(result
706698
.map(|expr| <Arc<dyn PhysicalExpr>>::from(&expr))
@@ -947,6 +939,7 @@ mod tests {
947939
assert_eq!(left, right);
948940
}
949941

942+
/// The snapshot API is deprecated.
950943
#[allow(deprecated)]
951944
#[test]
952945
fn ffi_physical_expr_snapshots() -> Result<(), DataFusionError> {

datafusion/physical-expr/src/expressions/dynamic_filters.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -689,20 +689,6 @@ mod test {
689689
assert!(arr_1.eq(&expected));
690690
}
691691

692-
#[test]
693-
fn test_current() {
694-
let expr = lit(42) as Arc<dyn PhysicalExpr>;
695-
let dynamic_filter = DynamicFilterPhysicalExpr::new(vec![], Arc::clone(&expr));
696-
697-
// Read the current expression.
698-
assert_eq!(&dynamic_filter.current().unwrap(), &expr);
699-
700-
// Update the current expression.
701-
let new_expr = lit(100) as Arc<dyn PhysicalExpr>;
702-
dynamic_filter.update(Arc::clone(&new_expr)).unwrap();
703-
assert_eq!(&dynamic_filter.current().unwrap(), &new_expr);
704-
}
705-
706692
#[allow(deprecated)]
707693
#[test]
708694
fn test_snapshot() {

0 commit comments

Comments
 (0)