Assert AR table entry stability on replace #13705
Open
+3
−2
Conversation
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
jhawthorn
reviewed
Jul 3, 2025
hash.c
Outdated
Comment on lines
883
to
887
| ar_table_pair *orig_pair = pair; | ||
| (*replace)(&key, &val, arg, TRUE); | ||
|
|
||
| // TODO: pair should be same as pair before. | ||
| pair = RHASH_AR_TABLE_REF(hash, i); | ||
| HASH_ASSERT(orig_pair == pair); |
There was a problem hiding this comment.
Reading this, I think what the original TODO may have intended is that in non-debug builds, maybe we don't need to do the RHASH_AR_TABLE_REF lookup a second time? What do you think?
Suggested change
| ar_table_pair *orig_pair = pair; | |
| (*replace)(&key, &val, arg, TRUE); | |
| // TODO: pair should be same as pair before. | |
| pair = RHASH_AR_TABLE_REF(hash, i); | |
| HASH_ASSERT(orig_pair == pair); | |
| (*replace)(&key, &val, arg, TRUE); | |
| // Pair should not have moved | |
| HASH_ASSERT(pair == RHASH_AR_TABLE_REF(hash, i)); |
There was a problem hiding this comment.
This makes sense to me. I tried committing your patch but got the error:
Applying suggestions on deleted lines is currently not supported.
I'm going to manually apply your patch and push it for review.
I'd love for @ko1 to comment on his original intent for this TODO.a
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.
Improve hash internal iteration by verifying that AR table entries remain stable after
st_update_callback_funcreplaces a key-value pair. Fixes a TODO by @ko1 from 2019.