You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@kvrocks.apache.org by GitBox <gi...@apache.org> on 2022/09/27 05:16:22 UTC
[GitHub] [incubator-kvrocks] tanruixiang commented on a diff in pull request #901: Support EXAT/PEXAT option in the set command
tanruixiang commented on code in PR #901:
URL: https://github.com/apache/incubator-kvrocks/pull/901#discussion_r980742338
##########
src/redis_cmd.cc:
##########
@@ -477,17 +477,34 @@ class CommandSet : public Commander {
} else if (opt == "xx" && !nx_) {
xx_ = true;
} else if (opt == "ex" && !ttl_ && !last_arg) {
- try {
- std::string s = args_[++i];
- std::string::size_type sz;
- ttl_ = std::stoi(s, &sz);
- if (sz != s.size()) {
- return Status(Status::RedisParseErr, errValueNotInterger);
- }
- } catch (std::exception &e) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int>(s);
+ if (!parse_status.IsOK()) {
Review Comment:
```suggestion
if (!parse_status) {
```
##########
src/redis_cmd.cc:
##########
@@ -477,17 +477,34 @@ class CommandSet : public Commander {
} else if (opt == "xx" && !nx_) {
xx_ = true;
} else if (opt == "ex" && !ttl_ && !last_arg) {
- try {
- std::string s = args_[++i];
- std::string::size_type sz;
- ttl_ = std::stoi(s, &sz);
- if (sz != s.size()) {
- return Status(Status::RedisParseErr, errValueNotInterger);
- }
- } catch (std::exception &e) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int>(s);
+ if (!parse_status.IsOK()) {
return Status(Status::RedisParseErr, errValueNotInterger);
}
+ ttl_ = parse_status.GetValue();
if (ttl_ <= 0) return Status(Status::RedisParseErr, errInvalidExpireTime);
+ } else if (opt == "exat" && !ttl_ && !expire_ && !last_arg) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int64_t>(s);
+ if (!parse_status.IsOK()) {
Review Comment:
```suggestion
if (!parse_status) {
```
##########
src/redis_cmd.cc:
##########
@@ -477,17 +477,34 @@ class CommandSet : public Commander {
} else if (opt == "xx" && !nx_) {
xx_ = true;
} else if (opt == "ex" && !ttl_ && !last_arg) {
- try {
- std::string s = args_[++i];
- std::string::size_type sz;
- ttl_ = std::stoi(s, &sz);
- if (sz != s.size()) {
- return Status(Status::RedisParseErr, errValueNotInterger);
- }
- } catch (std::exception &e) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int>(s);
+ if (!parse_status.IsOK()) {
return Status(Status::RedisParseErr, errValueNotInterger);
}
+ ttl_ = parse_status.GetValue();
if (ttl_ <= 0) return Status(Status::RedisParseErr, errInvalidExpireTime);
+ } else if (opt == "exat" && !ttl_ && !expire_ && !last_arg) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int64_t>(s);
+ if (!parse_status.IsOK()) {
+ return Status(Status::RedisParseErr, errValueNotInterger);
+ }
+ expire_ = parse_status.GetValue();
+ if (expire_ <= 0) return Status(Status::RedisParseErr, errInvalidExpireTime);
+ } else if (opt == "pxat" && !ttl_ && !expire_ && !last_arg) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<uint64_t>(s);
+ if (!parse_status.IsOK()) {
+ return Status(Status::RedisParseErr, errValueNotInterger);
+ }
+ uint64_t expire_ms = parse_status.GetValue();
Review Comment:
```suggestion
uint64_t expire_ms = *parse_status;
```
##########
src/redis_cmd.cc:
##########
@@ -477,17 +477,34 @@ class CommandSet : public Commander {
} else if (opt == "xx" && !nx_) {
xx_ = true;
} else if (opt == "ex" && !ttl_ && !last_arg) {
- try {
- std::string s = args_[++i];
- std::string::size_type sz;
- ttl_ = std::stoi(s, &sz);
- if (sz != s.size()) {
- return Status(Status::RedisParseErr, errValueNotInterger);
- }
- } catch (std::exception &e) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int>(s);
+ if (!parse_status.IsOK()) {
return Status(Status::RedisParseErr, errValueNotInterger);
}
+ ttl_ = parse_status.GetValue();
if (ttl_ <= 0) return Status(Status::RedisParseErr, errInvalidExpireTime);
+ } else if (opt == "exat" && !ttl_ && !expire_ && !last_arg) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int64_t>(s);
+ if (!parse_status.IsOK()) {
+ return Status(Status::RedisParseErr, errValueNotInterger);
+ }
+ expire_ = parse_status.GetValue();
+ if (expire_ <= 0) return Status(Status::RedisParseErr, errInvalidExpireTime);
+ } else if (opt == "pxat" && !ttl_ && !expire_ && !last_arg) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<uint64_t>(s);
Review Comment:
```suggestion
auto parse_status = ParseInt<int64_t>(args_[++i]);
```
##########
src/redis_cmd.cc:
##########
@@ -477,17 +477,34 @@ class CommandSet : public Commander {
} else if (opt == "xx" && !nx_) {
xx_ = true;
} else if (opt == "ex" && !ttl_ && !last_arg) {
- try {
- std::string s = args_[++i];
- std::string::size_type sz;
- ttl_ = std::stoi(s, &sz);
- if (sz != s.size()) {
- return Status(Status::RedisParseErr, errValueNotInterger);
- }
- } catch (std::exception &e) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int>(s);
+ if (!parse_status.IsOK()) {
return Status(Status::RedisParseErr, errValueNotInterger);
}
+ ttl_ = parse_status.GetValue();
if (ttl_ <= 0) return Status(Status::RedisParseErr, errInvalidExpireTime);
+ } else if (opt == "exat" && !ttl_ && !expire_ && !last_arg) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int64_t>(s);
+ if (!parse_status.IsOK()) {
+ return Status(Status::RedisParseErr, errValueNotInterger);
+ }
+ expire_ = parse_status.GetValue();
Review Comment:
```suggestion
expire_ = *parse_status;
```
##########
src/redis_cmd.cc:
##########
@@ -477,17 +477,34 @@ class CommandSet : public Commander {
} else if (opt == "xx" && !nx_) {
xx_ = true;
} else if (opt == "ex" && !ttl_ && !last_arg) {
- try {
- std::string s = args_[++i];
- std::string::size_type sz;
- ttl_ = std::stoi(s, &sz);
- if (sz != s.size()) {
- return Status(Status::RedisParseErr, errValueNotInterger);
- }
- } catch (std::exception &e) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int>(s);
+ if (!parse_status.IsOK()) {
return Status(Status::RedisParseErr, errValueNotInterger);
}
+ ttl_ = parse_status.GetValue();
Review Comment:
```suggestion
ttl_ = *parse_status;
```
##########
src/redis_cmd.cc:
##########
@@ -477,17 +477,34 @@ class CommandSet : public Commander {
} else if (opt == "xx" && !nx_) {
xx_ = true;
} else if (opt == "ex" && !ttl_ && !last_arg) {
- try {
- std::string s = args_[++i];
- std::string::size_type sz;
- ttl_ = std::stoi(s, &sz);
- if (sz != s.size()) {
- return Status(Status::RedisParseErr, errValueNotInterger);
- }
- } catch (std::exception &e) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int>(s);
+ if (!parse_status.IsOK()) {
return Status(Status::RedisParseErr, errValueNotInterger);
}
+ ttl_ = parse_status.GetValue();
if (ttl_ <= 0) return Status(Status::RedisParseErr, errInvalidExpireTime);
+ } else if (opt == "exat" && !ttl_ && !expire_ && !last_arg) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int64_t>(s);
Review Comment:
```suggestion
auto parse_status = ParseInt<int64_t>(args_[++i]);
```
##########
src/redis_cmd.cc:
##########
@@ -477,17 +477,34 @@ class CommandSet : public Commander {
} else if (opt == "xx" && !nx_) {
xx_ = true;
} else if (opt == "ex" && !ttl_ && !last_arg) {
- try {
- std::string s = args_[++i];
- std::string::size_type sz;
- ttl_ = std::stoi(s, &sz);
- if (sz != s.size()) {
- return Status(Status::RedisParseErr, errValueNotInterger);
- }
- } catch (std::exception &e) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int>(s);
+ if (!parse_status.IsOK()) {
return Status(Status::RedisParseErr, errValueNotInterger);
}
+ ttl_ = parse_status.GetValue();
if (ttl_ <= 0) return Status(Status::RedisParseErr, errInvalidExpireTime);
+ } else if (opt == "exat" && !ttl_ && !expire_ && !last_arg) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<int64_t>(s);
+ if (!parse_status.IsOK()) {
+ return Status(Status::RedisParseErr, errValueNotInterger);
+ }
+ expire_ = parse_status.GetValue();
+ if (expire_ <= 0) return Status(Status::RedisParseErr, errInvalidExpireTime);
+ } else if (opt == "pxat" && !ttl_ && !expire_ && !last_arg) {
+ std::string s = args_[++i];
+ auto parse_status = ParseInt<uint64_t>(s);
+ if (!parse_status.IsOK()) {
Review Comment:
```suggestion
if (!parse_status) {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org