Generic check to find duplicate option in the command. #667
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: Shivshankar-Reddy <[email protected]>
Signed-off-by: Shivshankar-Reddy <[email protected]>
Signed-off-by: Shivshankar-Reddy <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## unstable #667 +/- ##
============================================
+ Coverage 70.21% 70.26% +0.05%
============================================
Files 110 110
Lines 60069 60102 +33
============================================
+ Hits 42175 42231 +56
+ Misses 17894 17871 -23
|
hpatro
added
the
breaking-change
hpatro
reviewed
Jul 1, 2024
| @@ -3710,6 +3710,60 @@ int commandCheckArity(client *c, sds *err) { | |||
| return 1; | |||
| } | |||
|
|
|||
| int findDuplicatesOptions(client *c, const char *token) { | |||
There was a problem hiding this comment.
Suggested change
| int findDuplicatesOptions(client *c, const char *token) { | |
| int findDuplicateOptions(client *c, const char *token) { |
Comment on lines
+3748
to
+3755
| if (!findDuplicatesOptions(c, c->cmd->args[iter].subargs[subiter].token)) { | ||
| if (err) { | ||
| *err = sdsnew(NULL); | ||
| *err = sdscatprintf(*err, "duplicate '%s' option for '%s' command", | ||
| c->cmd->args[iter].subargs[subiter].token, c->cmd->fullname); | ||
| } | ||
| return 0; | ||
| } |
There was a problem hiding this comment.
Do we want to perform an early exit on first duplicate or capture all the duplicate parameters?
Comment on lines
+3756
to
+3758
| } else { | ||
| continue; | ||
| } |
Comment on lines
+3760
to
+3762
| } else { | ||
| continue; | ||
| } |
Comment on lines
+3715
to
+3724
| for (int j = 2, k = c->argc - 1; j <= k; j++, k--) { | ||
| if (!strcasecmp(token, c->argv[j]->ptr)) { | ||
| matched++; | ||
| } | ||
| if (j != k && !strcasecmp(token, c->argv[k]->ptr)) { | ||
| matched++; | ||
| } | ||
| if (matched > 1) { | ||
| return 0; | ||
| } |
There was a problem hiding this comment.
Do we need two pointers here? How about the following ?
int count = 0;
for (int i = 2; i < argc; i++) {
if (!strcasecmp(token, c->argv[i]->ptr)) {
count++;
if (count > 1) {
return 0;
}
}
}
| int findDuplicatesOptions(client *c, const char *token) { | ||
| int matched = 0; | ||
| for (int j = 2, k = c->argc - 1; j <= k; j++, k--) { | ||
| if (!strcasecmp(token, c->argv[j]->ptr)) { |
There was a problem hiding this comment.
How do we handle the case if another field has the same value as the token ?
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.
This fixes #571 .
Added a generic check in processCommand as similar to arity check.
Will close #602 as it focuses on only few commands.