mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: remove redundant ToLower call from the HSET function (#1141)

Browse source 
fix: remove redundant ToLower call from HSET function

The call was left during big refactoring when we removed command name from the
arguments slice passed to commands.

Fixes #1140

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2023-04-26 09:43:30 +02:00 • committed by GitHub
parent ce5db032fc
commit 0b13eaa943
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/server/generic_family.cc
View file

@ -723,8 +723,7 @@ void GenericFamily::Expire(CmdArgList args, ConnectionContext* cntx) {
}
if (int_arg > kMaxExpireDeadlineSec || int_arg < -kMaxExpireDeadlineSec) {
ToLower(&args[0]);
return (*cntx)->SendError(InvalidExpireTime(ArgS(args, 0)));
return (*cntx)->SendError(InvalidExpireTime(cntx->cid->name()));
}
int_arg = std::max(int_arg, -1L);

6
src/server/hset_family.cc
View file

@ -955,10 +955,11 @@ void HSetFamily::HScan(CmdArgList args, ConnectionContext* cntx) {
void HSetFamily::HSet(CmdArgList args, ConnectionContext* cntx) {
string_view key = ArgS(args, 0);
ToLower(&args[0]);
string_view cmd{cntx->cid->name()};
if (args.size() % 2 != 1) {
return (*cntx)->SendError(facade::WrongNumArgsError("hset"), kSyntaxErrType);
return (*cntx)->SendError(facade::WrongNumArgsError(cmd), kSyntaxErrType);
}
args.remove_prefix(1);
@ -967,7 +968,6 @@ void HSetFamily::HSet(CmdArgList args, ConnectionContext* cntx) {
};
OpResult<uint32_t> result = cntx->transaction->ScheduleSingleHopT(std::move(cb));
string_view cmd{cntx->cid->name()};
if (result && cmd == "HSET") {
(*cntx)->SendLong(*result);

6
src/server/hset_family_test.cc
View file

@ -225,4 +225,10 @@ TEST_F(HSetFamilyTest, TriggerConvertToStrMap) {
EXPECT_THAT(Run({"HLEN", "hk"}), IntArg(kElements));
}
TEST_F(HSetFamilyTest, Issue1140) {
Run({"HSET", "CaseKey", "Foo", "Bar"});
EXPECT_EQ("Bar", Run({"HGET", "CaseKey", "Foo"}));
}
} // namespace dfly

3
src/server/string_family.cc
View file

@ -1092,8 +1092,7 @@ void StringFamily::SetExGeneric(bool seconds, CmdArgList args, ConnectionContext
}
if (unit_vals < 1 || unit_vals >= kMaxExpireDeadlineSec) {
ToLower(&args[0]);
return (*cntx)->SendError(InvalidExpireTime(ArgS(args, 0)));
return (*cntx)->SendError(InvalidExpireTime(cntx->cid->name()));
}
SetCmd::SetParams sparams;