Merge AoT fragments when building an out-of-order table proxy#507
Open
gaoflow wants to merge 2 commits into
Open
Merge AoT fragments when building an out-of-order table proxy#507gaoflow wants to merge 2 commits into
gaoflow wants to merge 2 commits into
Conversation
gaoflow
force-pushed
the
fix-505-out-of-order-aot
branch
from
065f3d2 to
a7993c2
Compare
When an array of tables is split across out-of-order parts of the same
table, OutOfOrderTableProxy fed both fragments to _raw_append, which
only knows how to chain duplicate Table parts and raised
KeyAlreadyPresent. Valid documents like
[hooks]
[[hooks.Stop]]
[unrelated]
[[hooks.Stop]]
[hooks.state]
failed at parse time (the proxy is also built by __contains__). The
fragments are now presented as a new merged AoT referencing the live
element tables, so neither fragment is mutated and the parts keep
rendering their own elements.
Fixes python-poetry#505
gaoflow
force-pushed
the
fix-505-out-of-order-aot
branch
from
a7993c2 to
fa0f69e
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #505.
When an array of tables is split across out-of-order parts of the same table,
OutOfOrderTableProxy.__init__fed both fragments to_raw_append, which only knows how to chain duplicateTableparts and raisedKeyAlreadyPresent. Since the proxy is also built by__contains__, valid documents (accepted bytomllib) failed at parse time once a[hooks.*]header followed the second fragment.The fragments are now presented as a new merged
AoTthat references the live element tables — neither fragment is mutated, so the table parts keep rendering their own elements (round-trip stays byte-identical) and element-level mutations through the proxy still write through to the document. This mirrors the isolation note inOutOfOrderTableProxy.validate, which deep-copies for the same reason.The reported config only reproduces when the repeated AoT is genuinely out of order (split by an unrelated table) — contiguous repeats as literally pasted in the issue already worked; verified the merged result matches
tomllibfor both shapes.