fix: replace string_view with string in RaxTreeMap::FindIterator #3982
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
Signed-off-by: kostas <kostas@dragonflydb.io>
dranikpg
approved these changes
Oct 24, 2024
Comment on lines
+96
to
+100
| for (auto it = begin(); it != end(); ++it) { | ||
| V* ptr = &(*it).second; | ||
| std::allocator_traits<decltype(alloc_)>::destroy(alloc_, ptr); | ||
| alloc_.deallocate(ptr, 1); | ||
| } |
There was a problem hiding this comment.
I really forgot this 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻 🤦🏻
| @@ -113,7 +119,8 @@ template <typename V> struct RaxTreeMap { | |||
|
|
|||
| FindIterator find(std::string_view key) const { | |||
| if (void* ptr = raxFind(tree_, to_key_ptr(key), key.size()); ptr != raxNotFound) | |||
| return FindIterator{std::pair<std::string_view, V&>(key, *reinterpret_cast<V*>(ptr))}; | |||
| return FindIterator{std::pair<std::string, V&>(std::string(key), *reinterpret_cast<V*>(ptr))}; | |||
There was a problem hiding this comment.
I know it's dangerous, but it also means every lookup is a copy
There was a problem hiding this comment.
Well we already leaked in the tests 😄 I will figure out something and push it. I will merge this and follow up
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.
The main problem is that
find(std::string_view key)returns aFindIteratorwhich contains thekeythat was passed as argument in the call tofindand not the actualkey contained and allocated within raxand is easy dangle:res now contains a dangling pointer because the internal string_view now points to the temporary (std::string("some_key")) which got deallocated at the end of the expression above.
The simplest solution is to make
FindIteratorown the key. (yes it does copy which is not great but it avoids dangling pointers).We can always optimize the copy later.
Also fixes a memory leak in the destructor: we need to iterate over all the available children in the rax tree and delete the data we allocated before we call
raxFree.