adriangb commented on code in PR #21807:
URL: https://github.com/apache/datafusion/pull/21807#discussion_r3139916705
##########
datafusion/physical-expr-common/src/physical_expr.rs:
##########
@@ -163,6 +163,9 @@ pub trait PhysicalExpr: Any + Send + Sync + Display + Debug
+ DynEq + DynHash {
fn children(&self) -> Vec<&Arc<dyn PhysicalExpr>>;
/// Returns a new PhysicalExpr where all children were replaced by new
exprs.
+ ///
+ /// If the implementation returns a [`PhysicalExpr::expression_id`], then
+ /// the identifier should be preserved by the new expression.
Review Comment:
👍🏻
##########
datafusion/physical-expr/src/expressions/dynamic_filters.rs:
##########
@@ -495,9 +377,67 @@ impl DynamicFilterPhysicalExpr {
}
/// Generate a new expression id for this filter.
- pub fn new_expression_id() -> u64 {
+ fn new_expression_id() -> u64 {
random::<u64>()
}
+
+ /// Return the filter's original children (before any remapping).
+ pub fn original_children(&self) -> &[Arc<dyn PhysicalExpr>] {
+ &self.children
+ }
+
+ /// Return the filter's remapped children, if any have been set via
+ /// [`PhysicalExpr::with_new_children`].
+ pub fn remapped_children(&self) -> Option<&[Arc<dyn PhysicalExpr>]> {
+ self.remapped_children.as_deref()
+ }
+
+ /// Rebuild a `DynamicFilterPhysicalExpr` from its stored parts. Used by
+ /// proto deserialization to preserve `expression_id` across a roundtrip
+ /// rather than minting a fresh one.
+ ///
+ /// **Warning:** intended only for `datafusion-proto` (de)serialization.
+ /// Not a stable API.
+ pub fn from_parts(
+ expression_id: u64,
+ children: Vec<Arc<dyn PhysicalExpr>>,
+ remapped_children: Option<Vec<Arc<dyn PhysicalExpr>>>,
+ inner: Inner,
+ ) -> Self {
+ let state = if inner.is_complete {
+ FilterState::Complete {
+ generation: inner.generation,
+ }
+ } else {
+ FilterState::InProgress {
+ generation: inner.generation,
+ }
+ };
+ let (state_watch, _) = watch::channel(state);
+
+ Self {
+ children,
+ remapped_children,
+ expression_id,
+ inner: Arc::new(RwLock::new(inner)),
+ state_watch,
+ data_type: Arc::new(RwLock::new(None)),
+ nullable: Arc::new(RwLock::new(None)),
+ }
+ }
Review Comment:
Yeah unfortunately I think this is once again just the shape the current
proto stuff forces everything into.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
