[Data] Fixing handling of renames in projection pushdown (#58033)#58037
[Data] Fixing handling of renames in projection pushdown (#58033)#58037aslonnie merged 1 commit intoreleases/2.51.0from
Conversation
## Description This change properly handles of pushing of the renaming projections into read ops (that support projections, like parquet reads). ## Related issues > Link related issues: "Fixes #1234", "Closes #1234", or "Related to #1234". ## Additional information > Optional: Add implementation details, API changes, usage examples, screenshots, etc. --------- Signed-off-by: Alexey Kudinkin <ak@anyscale.com>
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request refactors the projection pushdown logic to correctly handle column renames, which is a great improvement. The core idea is to distinguish simple projections (selects/renames) from complex ones and push down the rename map to the data source for simple cases, avoiding an extra MapBatches operator. The changes are well-structured, introducing a collapse_transitive_map utility for chained renames and updating the ParquetDatasource and logical operators accordingly. The logic seems sound, but I have one suggestion to improve the robustness and clarity of a new helper function.
| def _combine_rename_map( | ||
| prev_column_rename_map: Optional[Dict[str, str]], | ||
| new_column_rename_map: Optional[Dict[str, str]], | ||
| ): | ||
| if not prev_column_rename_map: | ||
| combined = new_column_rename_map | ||
| elif not new_column_rename_map: | ||
| combined = prev_column_rename_map | ||
| else: | ||
| combined = prev_column_rename_map | new_column_rename_map | ||
|
|
||
| return collapse_transitive_map(combined) |
There was a problem hiding this comment.
This function is missing a return type hint. Based on its usage, it should be -> Dict[str, str].
Additionally, the combined variable can be None if one of the input rename maps is None. While collapse_transitive_map currently handles None input by returning {}, relying on this implicit behavior can be brittle. It's safer and clearer to ensure a dictionary is always passed.
I suggest adding the type hint and making the None handling explicit by using combined or {}.
| def _combine_rename_map( | |
| prev_column_rename_map: Optional[Dict[str, str]], | |
| new_column_rename_map: Optional[Dict[str, str]], | |
| ): | |
| if not prev_column_rename_map: | |
| combined = new_column_rename_map | |
| elif not new_column_rename_map: | |
| combined = prev_column_rename_map | |
| else: | |
| combined = prev_column_rename_map | new_column_rename_map | |
| return collapse_transitive_map(combined) | |
| def _combine_rename_map( | |
| prev_column_rename_map: Optional[Dict[str, str]], | |
| new_column_rename_map: Optional[Dict[str, str]], | |
| ) -> Dict[str, str]: | |
| if not prev_column_rename_map: | |
| combined = new_column_rename_map | |
| elif not new_column_rename_map: | |
| combined = prev_column_rename_map | |
| else: | |
| combined = prev_column_rename_map | new_column_rename_map | |
| return collapse_transitive_map(combined or {}) |
…#58033) (ray-project#58037) ## Description Cherry-pick of ray-project#58033 ## Related issues > Link related issues: "Fixes ray-project#1234", "Closes ray-project#1234", or "Related to ray-project#1234". ## Additional information > Optional: Add implementation details, API changes, usage examples, screenshots, etc. --------- > Thank you for contributing to Ray! 🚀 > Please review the [Ray Contribution Guide](https://docs.ray.io/en/master/ray-contribute/getting-involved.html) before opening a pull request. >⚠️ Remove these instructions before submitting your PR. > 💡 Tip: Mark as draft if you want early feedback, or ready for review when it's complete. ## Description > Briefly describe what this PR accomplishes and why it's needed. ## Related issues > Link related issues: "Fixes ray-project#1234", "Closes ray-project#1234", or "Related to ray-project#1234". ## Additional information > Optional: Add implementation details, API changes, usage examples, screenshots, etc. Signed-off-by: Alexey Kudinkin <ak@anyscale.com>
2 participants
Description
Cherry-pick of #58033
Related issues
Additional information
Description
Related issues
Additional information