Skip to content

Commit 04b5c06

Browse files
authored
fix: syntax errcode (#225)
2 parents 1309c0c + 0575ec1 commit 04b5c06

File tree

7 files changed

+54
-51
lines changed

7 files changed

+54
-51
lines changed

src/cmd_admin.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ void HelloCmd::DoCmd(PClient* client) {
258258
}
259259
next_arg += 2;
260260
} else {
261-
client->SetRes(CmdRes::kSyntaxErr, "Syntax error");
261+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameHello);
262262
return;
263263
}
264264
}
@@ -336,7 +336,7 @@ bool InfoCmd::DoInitial(PClient* client) {
336336
return false;
337337
}
338338
} else {
339-
client->SetRes(CmdRes::kSyntaxErr);
339+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameInfo);
340340
return false;
341341
}
342342
return true;
@@ -603,7 +603,7 @@ bool SortCmd::DoInitial(PClient* client) {
603603
} else if (strcasecmp(client->argv_[i].data(), "limit") == 0 && leftargs >= 2) {
604604
if (kstd::String2int(client->argv_[i + 1], &offset_) == 0 ||
605605
kstd::String2int(client->argv_[i + 2], &count_) == 0) {
606-
client->SetRes(CmdRes::kSyntaxErr);
606+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSort);
607607
return false;
608608
}
609609
i += 2;
@@ -620,7 +620,7 @@ bool SortCmd::DoInitial(PClient* client) {
620620
get_patterns_.push_back(client->argv_[i + 1]);
621621
i++;
622622
} else {
623-
client->SetRes(CmdRes::kSyntaxErr);
623+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSort);
624624
return false;
625625
}
626626
}

src/cmd_hash.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void HGetCmd::DoCmd(PClient* client) {
7474
} else if (s.IsInvalidArgument()) {
7575
client->SetRes(CmdRes::kMultiKey);
7676
} else {
77-
client->SetRes(CmdRes::kSyntaxErr, "hget cmd error");
77+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameHGet);
7878
}
7979
}
8080

@@ -419,7 +419,7 @@ void HSetNXCmd::DoCmd(PClient* client) {
419419
} else if (s.IsInvalidArgument()) {
420420
client->SetRes(CmdRes::kMultiKey);
421421
} else {
422-
client->SetRes(CmdRes::kSyntaxErr, "hsetnx cmd error");
422+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameHSetNX);
423423
}
424424
}
425425

@@ -476,12 +476,12 @@ void HRandFieldCmd::DoCmd(PClient* client) {
476476
return;
477477
}
478478
if (argv.size() > 4) {
479-
client->SetRes(CmdRes::kSyntaxErr);
479+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameHRandField);
480480
return;
481481
}
482482
if (argv.size() > 3) {
483483
if (kWithValueString != kstd::StringToLower(argv[3])) {
484-
client->SetRes(CmdRes::kSyntaxErr);
484+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameHRandField);
485485
return;
486486
}
487487
with_values = true;

src/cmd_kv.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void GetCmd::DoCmd(PClient* client) {
3939
} else if (s.IsInvalidArgument()) {
4040
client->SetRes(CmdRes::kMultiKey);
4141
} else {
42-
client->SetRes(CmdRes::kSyntaxErr, "get key error");
42+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameGet);
4343
}
4444
}
4545

@@ -66,7 +66,7 @@ bool SetCmd::DoInitial(PClient* client) {
6666
condition_ = (condition_ == SetCmd::kNONE) ? SetCmd::kEXORPX : condition_;
6767
index++;
6868
if (index == argv_.size()) {
69-
client->SetRes(CmdRes::kSyntaxErr);
69+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSet);
7070
return false;
7171
}
7272
if (kstd::String2int(argv_[index].data(), argv_[index].size(), &sec_) == 0) {
@@ -78,7 +78,7 @@ bool SetCmd::DoInitial(PClient* client) {
7878
sec_ /= 1000;
7979
}
8080
} else {
81-
client->SetRes(CmdRes::kSyntaxErr);
81+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSet);
8282
return false;
8383
}
8484
index++;
@@ -312,7 +312,7 @@ bool BitOpCmd::DoInitial(PClient* client) {
312312
kstd::StringEqualCaseInsensitive(client->argv_[1], "or") ||
313313
kstd::StringEqualCaseInsensitive(client->argv_[1], "not") ||
314314
kstd::StringEqualCaseInsensitive(client->argv_[1], "xor"))) {
315-
client->SetRes(CmdRes::kSyntaxErr, "operation error");
315+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameBitOp);
316316
return false;
317317
}
318318
return true;
@@ -347,7 +347,7 @@ void BitOpCmd::DoCmd(PClient* client) {
347347
}
348348

349349
if (err != kPErrorOK) {
350-
client->SetRes(CmdRes::kSyntaxErr);
350+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameBitOp);
351351
} else {
352352
PString value;
353353
int64_t result_length = 0;

src/cmd_list.cc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99

1010
#include "cmd_list.h"
11+
#include "base_cmd.h"
1112
#include "src/scope_record_lock.h"
1213
#include "std_string.h"
1314
#include "store.h"
@@ -32,7 +33,7 @@ void LPushCmd::DoCmd(PClient* client) {
3233
} else if (s.IsInvalidArgument()) {
3334
client->SetRes(CmdRes::kMultiKey);
3435
} else {
35-
client->SetRes(CmdRes::kSyntaxErr, "lpush cmd error");
36+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameLPush);
3637
}
3738
}
3839

@@ -103,7 +104,7 @@ void RPushCmd::DoCmd(PClient* client) {
103104
} else if (s.IsInvalidArgument()) {
104105
client->SetRes(CmdRes::kMultiKey);
105106
} else {
106-
client->SetRes(CmdRes::kSyntaxErr, "rpush cmd error");
107+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameRPush);
107108
}
108109
}
109110

@@ -169,7 +170,7 @@ void RPopCmd::DoCmd(PClient* client) {
169170
} else if (s.IsInvalidArgument()) {
170171
client->SetRes(CmdRes::kMultiKey);
171172
} else {
172-
client->SetRes(CmdRes::kSyntaxErr, "rpop cmd error");
173+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameRPop);
173174
}
174175
}
175176

@@ -248,7 +249,7 @@ void LRangeCmd::DoCmd(PClient* client) {
248249
if (s.IsInvalidArgument()) {
249250
client->SetRes(CmdRes::kMultiKey);
250251
} else {
251-
client->SetRes(CmdRes::kSyntaxErr, "lrange cmd error");
252+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameLRange);
252253
}
253254
return;
254255
}
@@ -307,7 +308,7 @@ void LTrimCmd::DoCmd(PClient* client) {
307308
} else if (s.IsInvalidArgument()) {
308309
client->SetRes(CmdRes::kMultiKey);
309310
} else {
310-
client->SetRes(CmdRes::kSyntaxErr, "ltrim cmd error");
311+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameLTrim);
311312
}
312313
}
313314

@@ -341,7 +342,7 @@ void LSetCmd::DoCmd(PClient* client) {
341342
} else if (s.IsInvalidArgument()) {
342343
client->SetRes(CmdRes::kMultiKey);
343344
} else {
344-
client->SetRes(CmdRes::kSyntaxErr, "lset cmd error"); // just a safeguard
345+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameLSet); // just a safeguard
345346
}
346347
} else {
347348
client->SetRes(CmdRes::kInvalidInt);
@@ -373,7 +374,7 @@ void LInsertCmd::DoCmd(PClient* client) {
373374
if (s.IsInvalidArgument()) {
374375
client->SetRes(CmdRes::kMultiKey);
375376
} else {
376-
client->SetRes(CmdRes::kSyntaxErr, "linsert cmd error");
377+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameLInsert);
377378
}
378379
return;
379380
}

src/cmd_set.cc

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "cmd_set.h"
1111
#include <memory>
1212
#include <utility>
13+
#include "base_cmd.h"
1314
#include "std/std_string.h"
1415
#include "store.h"
1516

@@ -52,7 +53,7 @@ void SAddCmd::DoCmd(PClient* client) {
5253
} else if (s.IsInvalidArgument()) {
5354
client->SetRes(CmdRes::kMultiKey);
5455
} else {
55-
client->SetRes(CmdRes::kSyntaxErr, "sadd cmd error");
56+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSAdd);
5657
}
5758
}
5859

@@ -77,7 +78,7 @@ void SUnionStoreCmd::DoCmd(PClient* client) {
7778
client->SetRes(CmdRes::kMultiKey);
7879
return;
7980
}
80-
client->SetRes(CmdRes::kSyntaxErr, "sunionstore cmd error");
81+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSUnionStore);
8182
}
8283
client->AppendInteger(ret);
8384
}
@@ -172,7 +173,7 @@ void SInterStoreCmd::DoCmd(PClient* client) {
172173
if (s.IsInvalidArgument()) {
173174
client->SetRes(CmdRes::kMultiKey);
174175
} else {
175-
client->SetRes(CmdRes::kSyntaxErr, "sinterstore cmd error");
176+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSInterStore);
176177
}
177178
return;
178179
}
@@ -193,15 +194,15 @@ void SCardCmd::DoCmd(PClient* client) {
193194
if (s.IsInvalidArgument()) {
194195
client->SetRes(CmdRes::kMultiKey);
195196
} else {
196-
client->SetRes(CmdRes::kSyntaxErr, "scard cmd error");
197+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSCard);
197198
}
198199
return;
199200
}
200201
if (s.ok() || s.IsNotFound()) {
201202
client->AppendInteger(reply_Num);
202203
return;
203204
}
204-
client->SetRes(CmdRes::kSyntaxErr, "scard cmd error");
205+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSCard);
205206
}
206207

207208
SMoveCmd::SMoveCmd(const std::string& name, int16_t arity)
@@ -261,7 +262,7 @@ void SRandMemberCmd::DoCmd(PClient* client) {
261262
if (s.IsInvalidArgument()) {
262263
client->SetRes(CmdRes::kMultiKey);
263264
} else {
264-
client->SetRes(CmdRes::kSyntaxErr, "srandmember cmd error");
265+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSRandMember);
265266
}
266267
return;
267268
}
@@ -287,7 +288,7 @@ void SPopCmd::DoCmd(PClient* client) {
287288
if (s.IsInvalidArgument()) {
288289
client->SetRes(CmdRes::kMultiKey);
289290
} else {
290-
client->SetRes(CmdRes::kSyntaxErr, "spop cmd error");
291+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSPop);
291292
}
292293
return;
293294
}
@@ -306,7 +307,7 @@ void SPopCmd::DoCmd(PClient* client) {
306307
if (s.IsInvalidArgument()) {
307308
client->SetRes(CmdRes::kMultiKey);
308309
} else {
309-
client->SetRes(CmdRes::kSyntaxErr, "spop cmd error");
310+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSPop);
310311
}
311312
return;
312313
}
@@ -334,7 +335,7 @@ void SMembersCmd::DoCmd(PClient* client) {
334335
if (s.IsInvalidArgument()) {
335336
client->SetRes(CmdRes::kMultiKey);
336337
} else {
337-
client->SetRes(CmdRes::kSyntaxErr, "smembers cmd error");
338+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSMembers);
338339
}
339340
return;
340341
}
@@ -357,7 +358,7 @@ void SDiffCmd::DoCmd(PClient* client) {
357358
if (s.IsInvalidArgument()) {
358359
client->SetRes(CmdRes::kMultiKey);
359360
} else {
360-
client->SetRes(CmdRes::kSyntaxErr, "sdiff cmd error");
361+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSDiff);
361362
}
362363
return;
363364
}
@@ -383,7 +384,7 @@ void SDiffstoreCmd::DoCmd(PClient* client) {
383384
if (s.IsInvalidArgument()) {
384385
client->SetRes(CmdRes::kMultiKey);
385386
} else {
386-
client->SetRes(CmdRes::kSyntaxErr, "sdiffstore cmd error");
387+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSDiffstore);
387388
}
388389
return;
389390
}
@@ -395,7 +396,7 @@ SScanCmd::SScanCmd(const std::string& name, int16_t arity)
395396

396397
bool SScanCmd::DoInitial(PClient* client) {
397398
if (auto size = client->argv_.size(); size != 3 && size != 5 && size != 7) {
398-
client->SetRes(CmdRes::kSyntaxErr);
399+
client->SetRes(CmdRes::kSyntaxErr, kCmdNameSScan);
399400
return false;
400401
}
401402
client->SetKey(client->argv_[1]);

0 commit comments

Comments
 (0)