fix: Fix ODR violation coming from DuckLogicalOperator.h #12016
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary: DuckLogicalOperator.h defines a bunch of DuckDB logical plan nodes that would come from duckdb-internal.hpp but we can't include that file. facebookincubator#11930 added LogicalOrder and included a minimal version of the definition in DuckDB 0.8.1 not including a bunch of fields/functions we don't use. I see minimal versions of other plan nodes are likewise used in the file, but for whatever reason, this one in particular is tripping up ODR issue detection during linking when UBSan is enabled. The fix I offer here is to copy the definition verbatim from duckdb/planner/operator/logical_order.hpp. I also noticed some unnecessary includes in velox/parse/QueryPlanner.cpp introduced by that PR while debugging which I've removed here for cleanliness, they're not critical to the fix. Differential Revision: D67804092
facebook-github-bot
added
the
CLA Signed
|
This pull request was exported from Phabricator. Differential Revision: D67804092 |
✅ Deploy Preview for meta-velox canceled.
|
xiaoxmeng
approved these changes
Jan 3, 2025
|
This pull request has been merged in 8b3b55a. |
athmaja-n
pushed a commit
to athmaja-n/velox
that referenced
this pull request
Jan 10, 2025
…ubator#12016) Summary: Pull Request resolved: facebookincubator#12016 DuckLogicalOperator.h defines a bunch of DuckDB logical plan nodes that would come from duckdb-internal.hpp but we can't include that file. facebookincubator#11930 added LogicalOrder and included a minimal version of the definition in DuckDB 0.8.1 not including a bunch of fields/functions we don't use. I see minimal versions of other plan nodes are likewise used in the file, but for whatever reason, this one in particular is tripping up ODR issue detection during linking when UBSan is enabled. The fix I offer here is to copy the definition verbatim from duckdb/planner/operator/logical_order.hpp. I also noticed some unnecessary includes in velox/parse/QueryPlanner.cpp introduced by that PR while debugging which I've removed here for cleanliness, they're not critical to the fix. Reviewed By: xiaoxmeng, kgpai Differential Revision: D67804092 fbshipit-source-id: 7f3363c0bdd340d180da431222f5e7b1b1913f4f
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
DuckLogicalOperator.h defines a bunch of DuckDB logical plan nodes that would come from
duckdb-internal.hpp but we can't include that file.
#11930 added LogicalOrder and included a minimal version of
the definition in DuckDB 0.8.1 not including a bunch of fields/functions we don't use. I see minimal versions
of other plan nodes are likewise used in the file, but for whatever reason, this one in particular is tripping up
ODR issue detection during linking when UBSan is enabled.
The fix I offer here is to copy the definition verbatim from duckdb/planner/operator/logical_order.hpp.
I also noticed some unnecessary includes in velox/parse/QueryPlanner.cpp introduced by that PR while
debugging which I've removed here for cleanliness, they're not critical to the fix.
Differential Revision: D67804092