[6.x] Remove insertion of extra repairs in patch queue #8278
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
|
Forward porting had enough conflicts that I'm doing a synthetic test for 6.x. It would be really nice to have tests for the patching system: #5805 |
msullivan
force-pushed
the
6x-simplify-repair
branch
from
bc436b6 to
fdbbd07
Compare
msullivan
added a commit
that referenced
this pull request
Jan 30, 2025
Currently, if there is *any* repair in a patch queue, we insert a repair after *every* patch that modifies the std schema. This was in combination with deferring all repairs until the last one in the queue, which allowed us to avoid needing to load the current standard schema in order to do a repair. But we implemented support for doing that as part of patching user extensions, so merge all of the schema repair code into that. I tested this on 5.x's substantial collection of complex patches, and then forward ported. Since I had to resolve more conflicts there than I expected, I then also injected a testing repair into the 6.x backport (#8278), which shook out that `schema_repair()` is fully broken on 6.x (fixed in #8279), but no patch-specific issues.
msullivan
added a commit
that referenced
this pull request
Jan 30, 2025
Currently, if there is *any* repair in a patch queue, we insert a repair after *every* patch that modifies the std schema. This was in combination with deferring all repairs until the last one in the queue, which allowed us to avoid needing to load the current standard schema in order to do a repair. But we implemented support for doing that as part of patching user extensions, so merge all of the schema repair code into that. I tested this on 5.x's substantial collection of complex patches, and then forward ported. Since I had to resolve more conflicts there than I expected, I then also injected a testing repair into the 6.x backport (#8278), which shook out that `schema_repair()` is fully broken on 6.x (fixed in #8279), but no patch-specific issues.
Currently, if there is *any* repair in a patch queue, we insert a repair after *every* patch that modifies the std schema. This was in combination with deferring all repairs until the last one in the queue, which allowed us to avoid needing to load the current standard schema in order to do a repair. But we implemented support for doing that as part of patching user extensions, so merge all of the schema repair code into that. I tested this on 5.x's substantial collection of complex patches, and then forward ported to master, and then backported this to 6.x.
msullivan
force-pushed
the
6x-simplify-repair
branch
from
fdbbd07 to
9ed4ac7
Compare
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.
Currently, if there is any repair in a patch queue, we insert a
repair after every patch that modifies the std schema.
This was in combination with deferring all repairs until the last one
in the queue, which allowed us to avoid needing to load the current
standard schema in order to do a repair. But we implemented support
for doing that as part of patching user extensions, so merge all of
the schema repair code into that.
I tested this on 5.x's substantial collection of complex patches (see #8277), and
then forward ported to master, and then backported this to 6.x.