Fix zuiFind crash / RM_ScanKey hang on SET object listpack encoding#11581
Merged
oranagra merged 12 commits intoredis:unstablefrom Dec 9, 2022
Merged
Fix zuiFind crash / RM_ScanKey hang on SET object listpack encoding#11581oranagra merged 12 commits intoredis:unstablefrom
oranagra merged 12 commits intoredis:unstablefrom
Conversation
In redis#11290, we added listpack encoding for SET object, but forgot to support it in zuiFind. Causing for example ZDIFF command to act on the SET object, it will crash. This PR add support SET listpack in zuiFind, and add tests for related commands to cover this case. Fixes redis#11578
enjoy-binbin
changed the title
enjoy-binbin
changed the title
enjoy-binbin
commented
Dec 5, 2022
zuiderkwast
reviewed
Dec 5, 2022
Contributor
zuiderkwast
left a comment
zuiderkwast
left a comment
There was a problem hiding this comment.
Thanks @enjoy-binbin for fixing this and thanks @hbina for reporting this issue so it can be fixed before Redis 7.2 is released!
It's embarrassing that I missed this function when I implemented listpack encoding for sets.
zuiderkwast suggest: there is no reason for zuiFind to go into the internals of the set. It can simply use setTypeIsMember and don't care about encoding. Co-authored-by: Viktor Söderqvist <[email protected]>
Co-authored-by: Viktor Söderqvist <[email protected]>
zuiderkwast
reviewed
Dec 5, 2022
zuiderkwast
approved these changes
Dec 7, 2022
oranagra
reviewed
Dec 7, 2022
oranagra
reviewed
Dec 7, 2022
enjoy-binbin
changed the title
oranagra
reviewed
Dec 8, 2022
sundb
reviewed
Dec 8, 2022
oranagra
reviewed
Dec 8, 2022
zuiderkwast
approved these changes
Dec 8, 2022
Contributor
zuiderkwast
left a comment
zuiderkwast
left a comment
There was a problem hiding this comment.
LGTM
Thanks for doing the extra (slightly unrelated) refactoring! I wouldn't have required it but it's an improvement definitely.
Member
|
do we wanna take this opportunity and improve the hash scan code to use lpGetValue instead of lpGet? |
oranagra
approved these changes
Dec 9, 2022
Member
oranagra
left a comment
oranagra
left a comment
There was a problem hiding this comment.
great.
can you please update the top comment to mention the additional changes and their implications (performance)
madolson
pushed a commit
to madolson/redis
that referenced
this pull request
Apr 19, 2023
…edis#11581) In redis#11290, we added listpack encoding for SET object. But forgot to support it in zuiFind, causes ZINTER, ZINTERSTORE, ZINTERCARD, ZIDFF, ZDIFFSTORE to crash. And forgot to support it in RM_ScanKey, causes it hang. This PR add support SET listpack in zuiFind, and in RM_ScanKey. And add tests for related commands to cover this case. Other changes: - There is no reason for zuiFind to go into the internals of the SET. It can simply use setTypeIsMember and don't care about encoding. - Remove the `#include "intset.h"` from server.h reduce the chance of accidental intset API use. - Move setTypeAddAux, setTypeRemoveAux and setTypeIsMemberAux interfaces to the header. - In scanGenericCommand, use setTypeInitIterator and setTypeNext to handle OBJ_SET scan. - In RM_ScanKey, improve hash scan mode, use lpGetValue like zset, they can share code and better performance. The zuiFind part fixes redis#11578 Co-authored-by: Oran Agra <[email protected]> Co-authored-by: Viktor Söderqvist <[email protected]>
enjoy-binbin
added a commit
to enjoy-binbin/redis
that referenced
this pull request
Jul 31, 2023
…edis#11581) In redis#11290, we added listpack encoding for SET object. But forgot to support it in zuiFind, causes ZINTER, ZINTERSTORE, ZINTERCARD, ZIDFF, ZDIFFSTORE to crash. And forgot to support it in RM_ScanKey, causes it hang. This PR add support SET listpack in zuiFind, and in RM_ScanKey. And add tests for related commands to cover this case. Other changes: - There is no reason for zuiFind to go into the internals of the SET. It can simply use setTypeIsMember and don't care about encoding. - Remove the `#include "intset.h"` from server.h reduce the chance of accidental intset API use. - Move setTypeAddAux, setTypeRemoveAux and setTypeIsMemberAux interfaces to the header. - In scanGenericCommand, use setTypeInitIterator and setTypeNext to handle OBJ_SET scan. - In RM_ScanKey, improve hash scan mode, use lpGetValue like zset, they can share code and better performance. The zuiFind part fixes redis#11578 Co-authored-by: Oran Agra <[email protected]> Co-authored-by: Viktor Söderqvist <[email protected]>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
In #11290, we added listpack encoding for SET object.
But forgot to support it in zuiFind, causes ZINTER, ZINTERSTORE,
ZINTERCARD, ZIDFF, ZDIFFSTORE to crash.
And forgot to support it in RM_ScanKey, causes it hang.
This PR add support SET listpack in zuiFind, and in RM_ScanKey.
And add tests for related commands to cover this case.
Other changes:
It can simply use setTypeIsMember and don't care about encoding.
#include "intset.h"from server.h reduce the chance ofaccidental intset API use.
interfaces to the header.
to handle OBJ_SET scan.
they can share code and better performance.
The zuiFind part fixes #11578