-
Notifications
You must be signed in to change notification settings - Fork 175
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: Fix merge conflicts from merging comet-parquet-exec into main #1320
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks @andygrove
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm thanks @andygrove
@andygrove @parthchandra @comphead Looks like common/src/main/scala/org/apache/spark/sql/comet/util/Utils.scala and common/src/main/scala/org/apache/spark/sql/comet/CometArrowUtils.scala are unmerged/duplicates |
native/core/src/parquet/parquet_support.rs and native/spark-expr/src/conversion_funcs/cast.rs are also unmerged/duplicates I think we really should work on revert the this commit and previous commit and do a proper merge |
@kazuyukitanimura I don't see duplicates of any of the above files. Can you clarify what you mean by unmerged? |
@parthchandra E.g. for the utils file fromArrowType is defined in both files
|
looks like offheap mode check is re-introduced |
Oh, I get it now. We did duplicate code in the feature branch (CometArrowUtils and Utils both duplicate code from Spark. Let me clean this up in a followup)
Yes. The plans are different when the scans are different. We generated new plans for the different scan types but did not turn them on. The two new scan implementations do not yet pass all the unit tests so turning on plan stability for them is a little premature |
Which issue does this PR close?
N/A
Rationale for this change
Fix issues from #1318
What changes are included in this PR?
How are these changes tested?