Skip to content
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

fix: don't merge non-union parameters #2241

Merged
merged 2 commits into from
Feb 15, 2023

Conversation

agoose77
Copy link
Collaborator

@agoose77 agoose77 commented Feb 15, 2023

TL;DR

  • Fix old parameter logic in UnionArray._reverse_merge

TL

UnionArray._reverse_merge used to try and reconstruct parameters from the other layout. Now we just let the .simplified logic do this. We only want to take the union parameters in specific circumstances, and parameters of the contents should only be merged with parameters of the union when they intersect. UnionArray.simplified already handles

@agoose77 agoose77 requested a review from jpivarski February 15, 2023 12:42
@agoose77 agoose77 force-pushed the agoose77/fix-merge-union-parameters branch from 5a903fa to daf2a89 Compare February 15, 2023 12:43
@codecov
Copy link

codecov bot commented Feb 15, 2023

Codecov Report

Merging #2241 (daf2a89) into main (6b49960) will decrease coverage by 0.01%.
The diff coverage is n/a.

Additional details and impacted files
Impacted Files Coverage Δ
src/awkward/contents/unionarray.py 84.12% <ø> (-0.03%) ⬇️

@agoose77 agoose77 temporarily deployed to docs-preview February 15, 2023 13:00 — with GitHub Actions Inactive
@agoose77 agoose77 merged commit 2e37adf into main Feb 15, 2023
@agoose77 agoose77 deleted the agoose77/fix-merge-union-parameters branch February 15, 2023 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants