Do not store intermediate commits during merge/transplant #6677
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
adutra
previously approved these changes
Apr 25, 2023
snazy
reviewed
Apr 25, 2023
servers/jax-rs-tests/src/main/java/org/projectnessie/jaxrs/tests/BaseTestNessieApi.java
Outdated
Show resolved
Hide resolved
dimas-b
force-pushed
the
fix-dry-run-merge
branch
from
e19b565
to
e26c568
Compare
snazy
previously approved these changes
Apr 28, 2023
|
I going to push some significant changes (after resolving conflicts). Adding test utilities for validating storage writes (or absence of them). |
* Do not store objects during dry runs. * Do not store objects when conflicts are detected. Use a BatchingPersist during unsquashed merge/transplant execution and flush only on success. This is to allow CommitLogic to 'see' intermediate commits without writing them to storage. Batching writes in this case is a secondary effect. Move PersistDelegate to top level. Add test tooling to allow validating whether any storage writes happened since a checkpoint. Also add a test case to make sure dry run merge/transplant operations at the API level. Note: exact response messages differ between old and new model in this case, but substantial information is the same (keys from the merge/transplant request). Fixes projectnessie#6674
dimas-b
force-pushed
the
fix-dry-run-merge
branch
from
e26c568
to
b27f166
Compare
dimas-b
changed the title
snazy
approved these changes
May 2, 2023
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.
Do not store objects during dry runs.
Do not store objects when conflicts are detected.
Use a BatchingPersist during unsquashed merge/transplant execution and
flush only on success. This is to allow CommitLogic to 'see'
intermediate commits without writing them to storage. Batching writes in
this case is a secondary effect.
Move PersistDelegate to top level.
Add test tooling to allow validating whether any storage writes happened
since a checkpoint.
Also add a test case to make sure dry run merge/transplant operations
at the API level.
Note: exact response messages differ between old and new model in
this case, but substantial information is the same (keys from the
merge/transplant request).
Fixes #6674