limadog9 commented on PR #25835: URL: https://github.com/apache/datafusion/pull/25835#issuecomment-5911885358
@kumarUjjawal, could you please take a look at the conflict-resolution merge in 6f71e2e4b and approve the queued workflows so CI can run? The update merges `main` into this branch and resolves the three conflicting blocks in `datafusion/physical-plan/src/filter.rs`: combining the `IsNullExpr` and `LikeExpr` imports, preserving both the PR's string-selectivity helpers and `main`'s filter-statistics helpers, and retaining both sets of tests with the correct function boundaries and test attributes. GitHub now reports no merge conflicts, and your existing approval is still present. However, the push triggered seven workflows that require maintainer approval. I hadn't accounted for that additional approval step before the update—sorry for the extra interruption. `cargo fmt --all` passed. Full workspace Clippy was blocked by Windows protobuf build errors and an existing Windows-only example warning; the focused test run was stopped before completion, so CI validation is still pending. -- 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]
