Skip to content

pika
pika

镜像 / OpenAtomFoundation / pika
9 个月 前同步成功

通知 0
Star 0
Fork 0
pika
pika

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 4549e8b8 编写于 作者: F fancyrabbit 提交者： Zhao Minghuan
浏览文件
操作

fix compile err

上级 29b75fbd
隐藏空白更改
内联 并排
Showing with 48 addition and 43 deletion
include/pika_slot.h
浏览文件 @ 4549e8b8
......@@ -45,7 +45,7 @@ private:
std::string key_;
char key_type_;
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
int SlotKeyPop();
};
......@@ -61,7 +61,7 @@ private:
int64_t slot_num_;
char key_type_;
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
int KeyTypeCheck();
int SlotKeyRemCheck();
};
......@@ -71,7 +71,7 @@ public:
SlotsInfoCmd() {}
virtual void Do();
private:
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsHashKeyCmd : public Cmd {
......@@ -80,7 +80,7 @@ public:
virtual void Do();
private:
std::vector<std::string> keys_;
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsReloadCmd : public Cmd {
......@@ -88,7 +88,7 @@ public:
SlotsReloadCmd() {}
virtual void Do();
private:
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsReloadOffCmd : public Cmd {
......@@ -96,7 +96,7 @@ public:
SlotsReloadOffCmd() {}
virtual void Do();
private:
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsDelCmd : public Cmd {
......@@ -105,7 +105,7 @@ public:
virtual void Do();
private:
std::vector<std::string> slots_;
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsScanCmd : public Cmd {
......@@ -115,7 +115,7 @@ public:
private:
std::string key_, pattern_;
int64_t cursor_, count_;
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void Clear() {
pattern_ = "*";
count_ = 10;
......@@ -128,7 +128,7 @@ public:
virtual void Do();
std::vector<int> cleanup_slots_;
private:
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsCleanupOffCmd : public Cmd {
......@@ -136,7 +136,7 @@ public:
SlotsCleanupOffCmd() {}
virtual void Do();
private:
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsMgrtTagSlotAsyncCmd : public Cmd {
......@@ -152,7 +152,7 @@ private:
int64_t slot_num_;
int64_t keys_num_;
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsMgrtExecWrapperCmd : public Cmd {
......@@ -161,7 +161,7 @@ public:
virtual void Do();
private:
std::string key_;
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsMgrtAsyncStatusCmd : public Cmd {
......@@ -169,7 +169,7 @@ public:
SlotsMgrtAsyncStatusCmd() {}
virtual void Do();
private:
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsMgrtAsyncCancelCmd : public Cmd {
......@@ -177,7 +177,7 @@ public:
SlotsMgrtAsyncCancelCmd() {}
virtual void Do();
private:
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
virtual void DoInitial(const PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
};
class SlotsMgrtSenderThread: public pink::Thread {
......
src/pika_slot.cc
浏览文件 @ 4549e8b8
......@@ -594,13 +594,14 @@ static void SlotKeyLenCheck(const std::string slotKey, CmdRes& res){
return;
}
void SlotsMgrtTagSlotCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsMgrtTagSlotCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsMgrtTagSlot);
return;
}
PikaCmdArgsType::iterator it = argv.begin() + 1; //Remember the first args is the opt name
dest_ip_ = slash::StringToLower(*it++);
PikaCmdArgsType::const_iterator it = argv.begin() + 1; //Remember the first args is the opt name
dest_ip_ = *it++;
slash::StringToLower(dest_ip_);
std::string str_dest_port = *it++;
if (!slash::string2l(str_dest_port.data(), str_dest_port.size(), &dest_port_) || dest_port_ <= 0) {
......@@ -684,13 +685,14 @@ void SlotsMgrtTagSlotCmd::Do() {
return;
}
void SlotsMgrtTagOneCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsMgrtTagOneCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsMgrtTagOne);
return;
}
PikaCmdArgsType::iterator it = argv.begin() + 1; //Remember the first args is the opt name
dest_ip_ = slash::StringToLower(*it++);
PikaCmdArgsType::const_iterator it = argv.begin() + 1; //Remember the first args is the opt name
dest_ip_ = *it++;
slash::StringToLower(dest_ip_);
std::string str_dest_port = *it++;
if (!slash::string2l(str_dest_port.data(), str_dest_port.size(), &dest_port_) || dest_port_ <= 0) {
......@@ -709,7 +711,8 @@ void SlotsMgrtTagOneCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const p
return;
}
key_ = slash::StringToLower(*it++);
key_ = *it++;
slash::StringToLower(key_);
slot_num_ = SlotNum(key_);
}
......@@ -806,7 +809,7 @@ void SlotsMgrtTagOneCmd::Do() {
return;
}
void SlotsInfoCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsInfoCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsInfo);
}
......@@ -837,11 +840,11 @@ void SlotsInfoCmd::Do() {
return;
}
void SlotsHashKeyCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsHashKeyCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsHashKey);
}
std::vector<std::string>::iterator iter = argv.begin();
std::vector<std::string>::const_iterator iter = argv.begin();
keys_.assign(++iter, argv.end());
return;
}
......@@ -855,7 +858,7 @@ void SlotsHashKeyCmd::Do() {
return;
}
void SlotsReloadCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsReloadCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsReload);
}
......@@ -872,7 +875,7 @@ void SlotsReloadCmd::Do() {
return;
}
void SlotsReloadOffCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsReloadOffCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsReloadOff);
}
......@@ -885,12 +888,12 @@ void SlotsReloadOffCmd::Do() {
return;
}
void SlotsCleanupCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsCleanupCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsCleanup);
}
PikaCmdArgsType::iterator iter = argv.begin() + 1; //Remember the first args is the opt name
PikaCmdArgsType::const_iterator iter = argv.begin() + 1; //Remember the first args is the opt name
std::string slot;
long slotLong;
std::vector<int> slots;
......@@ -917,7 +920,7 @@ void SlotsCleanupCmd::Do() {
return;
}
void SlotsCleanupOffCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsCleanupOffCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsCleanupOff);
}
......@@ -930,11 +933,11 @@ void SlotsCleanupOffCmd::Do() {
return;
}
void SlotsDelCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsDelCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsDel);
}
std::vector<std::string>::iterator iter = argv.begin();
std::vector<std::string>::const_iterator iter = argv.begin();
slots_.assign(++iter, argv.end());
return;
}
......@@ -955,7 +958,7 @@ void SlotsDelCmd::Do() {
return;
}
void SlotsScanCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsScanCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsScan);
return;
......@@ -967,14 +970,14 @@ void SlotsScanCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_inf
}
size_t argc = argv.size(), index = 3;
while (index < argc) {
std::string opt = slash::StringToLower(argv[index]);
if (opt == "match" || opt == "count") {
std::string opt = argv[index];
if (!strcasecmp(opt.data(), "match") || !strcasecmp(opt.data(), "count")) {
index++;
if (index >= argc) {
res_.SetRes(CmdRes::kSyntaxErr);
return;
}
if (opt == "match") {
if (!strcasecmp(opt.data(), "match")) {
pattern_ = argv[index];
} else if (!slash::string2l(argv[index].data(), argv[index].size(), &count_)) {
res_.SetRes(CmdRes::kInvalidInt);
......@@ -1016,12 +1019,13 @@ void SlotsScanCmd::Do() {
return;
}
void SlotsMgrtTagSlotAsyncCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsMgrtTagSlotAsyncCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsMgrtTagSlotAsync);
}
PikaCmdArgsType::iterator it = argv.begin() + 1; //Remember the first args is the opt name
dest_ip_ = slash::StringToLower(*it++);
PikaCmdArgsType::const_iterator it = argv.begin() + 1; //Remember the first args is the opt name
dest_ip_ = *it++;
slash::StringToLower(dest_ip_);
std::string str_dest_port = *it++;
if (!slash::string2l(str_dest_port.data(), str_dest_port.size(), &dest_port_) || dest_port_ <= 0) {
......@@ -1088,12 +1092,13 @@ void SlotsMgrtTagSlotAsyncCmd::Do() {
return;
}
void SlotsMgrtExecWrapperCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsMgrtExecWrapperCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsMgrtExecWrapper);
}
PikaCmdArgsType::iterator it = argv.begin() + 1;
key_ = slash::StringToLower(*it++);
PikaCmdArgsType::const_iterator it = argv.begin() + 1;
key_ = *it++;
slash::StringToLower(key_);
return;
}
......@@ -1117,7 +1122,7 @@ void SlotsMgrtExecWrapperCmd::Do() {
return;
}
void SlotsMgrtAsyncStatusCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsMgrtAsyncStatusCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsMgrtAsyncStatus);
}
......@@ -1151,7 +1156,7 @@ void SlotsMgrtAsyncStatusCmd::Do() {
return;
}
void SlotsMgrtAsyncCancelCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
void SlotsMgrtAsyncCancelCmd::DoInitial(const PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
if (!ptr_info->CheckArg(argv.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameSlotsMgrtAsyncCancel);
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或