bughz/predixy
1
0
Fork 0
mirror of https://github.com/joyieldInc/predixy.git synced 2025-12-24 22:46:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add custom command exclusive mode checking

Browse Source
This commit is contained in:
Yoon 2018-04-10 10:32:59 +09:00
parent 75228f3272
commit aa013991f7
2 changed files with 52 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
conf/command.conf
View File

@ -10,40 +10,39 @@ CustomCommand {
# Currently support only 1 key with first argument.
minArgs 3 # minimum arguments(including command itself), default is 2(key only)
maxArgs 3 # maximum arguments(including command itself), default is 2(key only)
mode Read,Write # a command mode Read/Write/Admin is exclusive, default is Write
mode Write # a command mode Read/Write/Admin is exclusive, default is Write
}
# hello.repl2 <list-key>
# just skipped since minArgs = 2, maxArgs = 2, mode = Read,Write are default values
# just skipped since minArgs = 2, maxArgs = 2, mode = Write are default values
hello.repl2 {
mode Read,Write
}
# hello.toggle.case key
hello.toggle.case {
mode Read,Write
mode Write
}
# hello.more.expire key milliseconds
hello.more.expire {
minArgs 3
maxArgs 3
mode Read,Write
mode Write
}
# hello.zsumrange key startscore endscore
hello.zsumrange {
minArgs 4
maxArgs 4
mode Read,Write
mode Write
}
# hello.lexrange key min_lex max_lex min_age max_age
hello.lexrange {
minArgs 6
maxArgs 6
mode Read,Write
mode Write
}
# hello.hcopy key srcfield dstfield
hello.hcopy {
minArgs 4
maxArgs 4
mode Read,Write
mode Write
}
# from redis source src/modules/hellotype.c
@ -51,16 +50,16 @@ CustomCommand {
hello.insert {
minArgs 3
maxArgs 3
mode Read,Write
mode Write
}
# hellotype.range key first count
hellotype.range {
minArgs 4
maxArgs 4
mode Read,Write
mode Write
}
# hellotype.len key
hello.len {
mode Read,Write
mode Write
}
}

29
src/Conf.cpp
View File

@ -381,16 +381,14 @@ void Conf::setCustomCommand(const ConfParser::Node* node)
CustomCommandConf::init(cc, p->key.c_str(), Command::Sentinel);
auto s = p->sub;
if (!s) {
Throw(InvalidValue, "%s:%d CustomCommand.Command require scope value",
node->file, node->line);
Throw(InvalidValue, "%s:%d CustomCommand.Command require scope value", node->file, node->line);
}
for (;s ; s = s->next) {
if (setInt(cc.cmd.minArgs, "minArgs", s, 2)) {
} else if (setInt(cc.cmd.maxArgs, "maxArgs", s, 2, 9999)) {
} else if (setCommandMode(cc.cmd.mode, "mode", s)) {
} else {
Throw(UnknownKey, "%s:%d unknown key %s",
s->file, s->line, s->key.c_str());
Throw(UnknownKey, "%s:%d unknown key %s", s->file, s->line, s->key.c_str());
}
}
Command::addCustomCommand(&cc.cmd);
@ -399,34 +397,43 @@ void Conf::setCustomCommand(const ConfParser::Node* node)
bool Conf::setCommandMode(int& mode, const char* name, const ConfParser::Node* n, const int defaultMode)
{
if (strcasecmp(name, n->key.c_str()) == 0) {
if (strcasecmp(name, n->key.c_str()) != 0) {
return false;
}
if (n->val.size() == 0) {
mode = defaultMode;
} else {
mode = Command::Unknown;
}
mode = 0;
int used = 0;
std::string mask;
std::istringstream is(n->val);
while (std::getline(is, mask, ',')) {
if ((strcasecmp(mask.c_str(), "Write") == 0)) {
used++;
mode |= Command::Write;
} else if ((strcasecmp(mask.c_str(), "Read") == 0)) {
used++;
mode |= Command::Read;
} else if ((strcasecmp(mask.c_str(), "Admin") == 0)) {
used++;
mode |= Command::Admin;
} else if ((strcasecmp(mask.c_str(), "KeyAt2") == 0)) {
mode |= Command::KeyAt2;
} else if ((strcasecmp(mask.c_str(), "KeyAt3") == 0)) {
mode |= Command::KeyAt3;
} else {
Throw(InvalidValue, "%s:%d %s %s is not an mode",
n->file, n->line, name, n->val.c_str());
Throw(InvalidValue, "%s:%d unknown mode %s", n->file, n->line, mask.c_str());
}
}
if (used == 0) {
Throw(InvalidValue, "%s:%d %s command require exclusive mode", n->file, n->line, name);
} else if (used > 1) {
Throw(InvalidValue, "%s:%d %s command duplicated exclusive mode", n->file, n->line, name);
}
}
return true;
}
return false;
}
void Conf::setDC(DCConf& dc, const ConfParser::Node* node)
{