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

temp entry invariant fix #3831

Merged
merged 1 commit into from
Jul 16, 2023
Merged

temp entry invariant fix #3831

merged 1 commit into from
Jul 16, 2023

Conversation

SirTyson
Copy link
Contributor

Description

Fixes TEMPORARY entry invariant bug that killed preview 10 future net.

Checklist

  • Reviewed the contributing document
  • Rebased on top of master (no merge commits)
  • Ran clang-format v8.0.0 (via make format or the Visual Studio extension)
  • Compiles
  • Ran all tests
  • If change impacts performance, include supporting evidence per the performance document

@@ -961,11 +975,6 @@ mergeCasesWithEqualKeys(MergeCounters& mc, BucketInputIterator& oi,
else
{
// Merge a create+delete to nothingness.
if (newEntry.type() != DEADENTRY)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to sanity check, this code in inaccessible, right? I'm deleting it because I was thinking about if a valid TEMPORARY entry could somehow cause this to throw when I realized this branch is not possible.

@MonsieurNicolas
Copy link
Contributor

r+ f5ba8a55e68188deea2a67a87e3ec52ff95852ce

@sisuresh
Copy link
Contributor

r+ cbcfd20

@latobarita latobarita merged commit 965c75c into stellar:master Jul 16, 2023
8 checks passed
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.

4 participants