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

chore: refactor a common code into a function (#1685)

Browse source 
Also, fix unreliable time measurement for http latency metric.

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2023-08-10 05:50:43 +03:00 • committed by GitHub
parent 663c1f9e1b
commit f2ddbe7307
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/server/main_service.cc
View file

@ -896,7 +896,7 @@ void Service::DispatchCommand(CmdArgList args, facade::ConnectionContext* cntx)
DispatchMonitor(dfly_cntx, args);
}
uint64_t start_ns = ProactorBase::GetMonotonicTimeNs(), end_ns;
uint64_t start_ns = absl::GetCurrentTimeNanos();
if (cid->opt_mask() & CO::DENYOOM) {
int64_t used_memory = etl.GetUsedMemory(start_ns);
@ -951,7 +951,7 @@ void Service::DispatchCommand(CmdArgList args, facade::ConnectionContext* cntx)
dfly_cntx->reply_builder()->CloseConnection();
}
end_ns = ProactorBase::GetMonotonicTimeNs();
uint64_t end_ns = ProactorBase::GetMonotonicTimeNs();
request_latency_usec.IncBy(cid->name(), (end_ns - start_ns) / 1000);
if (!dispatching_in_multi) {
@ -1277,12 +1277,7 @@ void Service::CallFromScript(ConnectionContext* cntx, Interpreter::CallArgs& ca)
}
void Service::Eval(CmdArgList args, ConnectionContext* cntx) {
uint32_t num_keys;
CHECK(absl::SimpleAtoi(ArgS(args, 1), &num_keys)); // we already validated this
string_view body = ArgS(args, 0);
// body = absl::StripAsciiWhitespace(body);
if (body.empty()) {
return (*cntx)->SendNull();
@ -1298,31 +1293,25 @@ void Service::Eval(CmdArgList args, ConnectionContext* cntx) {
string sha{move(res.value())};
EvalArgs eval_args;
eval_args.sha = sha;
eval_args.keys = args.subspan(2, num_keys);
eval_args.args = args.subspan(2 + num_keys);
uint64_t start = absl::GetCurrentTimeNanos();
EvalInternal(eval_args, interpreter, cntx);
uint64_t end = absl::GetCurrentTimeNanos();
ss->RecordCallLatency(sha, (end - start) / 1000);
CallSHA(args, sha, interpreter, cntx);
}
void Service::EvalSha(CmdArgList args, ConnectionContext* cntx) {
string_view num_keys_str = ArgS(args, 1);
uint32_t num_keys;
CHECK(absl::SimpleAtoi(num_keys_str, &num_keys));
ToLower(&args[0]);
string_view sha = ArgS(args, 0);
ServerState* ss = ServerState::tlocal();
auto interpreter = ss->BorrowInterpreter();
absl::Cleanup clean = [ss, interpreter]() { ss->ReturnInterpreter(interpreter); };
CallSHA(args, sha, interpreter, cntx);
}
void Service::CallSHA(CmdArgList args, string_view sha, Interpreter* interpreter,
ConnectionContext* cntx) {
uint32_t num_keys;
CHECK(absl::SimpleAtoi(ArgS(args, 1), &num_keys)); // we already validated this
EvalArgs ev_args;
ev_args.sha = sha;
ev_args.keys = args.subspan(2, num_keys);
@ -1332,7 +1321,7 @@ void Service::EvalSha(CmdArgList args, ConnectionContext* cntx) {
EvalInternal(ev_args, interpreter, cntx);
uint64_t end = absl::GetCurrentTimeNanos();
ss->RecordCallLatency(sha, (end - start) / 1000);
ServerState::tlocal()->RecordCallLatency(sha, (end - start) / 1000);
}
optional<ScriptMgr::ScriptParams> LoadScipt(string_view sha, ScriptMgr* script_mgr,

2
src/server/main_service.h
View file

@ -140,6 +140,8 @@ class Service : public facade::ServiceInterface {
const CommandId* FindCmd(CmdArgList args) const;
void EvalInternal(const EvalArgs& eval_args, Interpreter* interpreter, ConnectionContext* cntx);
void CallSHA(CmdArgList args, std::string_view sha, Interpreter* interpreter,
ConnectionContext* cntx);
// Return optional payload - first received error that occured when executing commands.
std::optional<facade::CapturingReplyBuilder::Payload> FlushEvalAsyncCmds(ConnectionContext* cntx,