Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: hset family replies and trim #3748

Closed
wants to merge 2 commits into from
Closed

chore: hset family replies and trim #3748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
876190f
chore: hset family replies and trim
dranikpg Sep 20, 2024
7b9c55d
chore: small fix in RETURN_ON_BAD_STATUS
dranikpg Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/server/error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using facade::kWrongTypeErr;
do { \
OpStatus __s = (x).status(); \
if (__s != OpStatus::OK) { \
return (x).status(); \
return __s; \
} \
} while (0)

Expand Down
76 changes: 29 additions & 47 deletions src/server/hset_family.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,7 @@ OpStatus OpIncrBy(const OpArgs& op_args, string_view key, string_view field, Inc
auto& db_slice = op_args.GetDbSlice();
auto op_res = db_slice.AddOrFind(op_args.db_cntx, key);
RETURN_ON_BAD_STATUS(op_res);
if (!op_res) {
return op_res.status();
}

auto& add_res = *op_res;

DbTableStats* stats = db_slice.MutableStats(op_args.db_cntx.db_index);
Expand Down Expand Up @@ -346,9 +344,7 @@ OpResult<uint32_t> OpDel(const OpArgs& op_args, string_view key, CmdArgList valu

auto& db_slice = op_args.GetDbSlice();
auto it_res = db_slice.FindMutable(op_args.db_cntx, key, OBJ_HASH);

if (!it_res)
return it_res.status();
RETURN_ON_BAD_STATUS(it_res);

PrimeValue& pv = it_res->it->second;
op_args.shard->search_indices()->RemoveDoc(key, op_args.db_cntx, pv);
Expand Down Expand Up @@ -411,9 +407,7 @@ OpResult<vector<OptStr>> OpHMGet(const OpArgs& op_args, std::string_view key, Cm

auto& db_slice = op_args.GetDbSlice();
auto it_res = db_slice.FindReadOnly(op_args.db_cntx, key, OBJ_HASH);

if (!it_res)
return it_res.status();
RETURN_ON_BAD_STATUS(it_res);

const PrimeValue& pv = (*it_res)->second;

Expand Down Expand Up @@ -506,8 +500,7 @@ OpResult<int> OpExist(const OpArgs& op_args, string_view key, string_view field)
OpResult<string> OpGet(const OpArgs& op_args, string_view key, string_view field) {
auto& db_slice = op_args.GetDbSlice();
auto it_res = db_slice.FindReadOnly(op_args.db_cntx, key, OBJ_HASH);
if (!it_res)
return it_res.status();
RETURN_ON_BAD_STATUS(it_res);

const PrimeValue& pv = (*it_res)->second;
void* ptr = pv.RObjPtr();
Expand Down Expand Up @@ -706,6 +699,23 @@ OpResult<uint32_t> OpSet(const OpArgs& op_args, string_view key, CmdArgList valu
return created;
}

struct HSetReplies {
HSetReplies(ConnectionContext* cntx)
: rb{static_cast<RedisReplyBuilder*>(cntx->reply_builder())} {
DCHECK(dynamic_cast<RedisReplyBuilder*>(cntx->reply_builder()));
}

template <typename T> void Send(OpResult<T> res) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember you added a similar approach on Sets (although it was not the exact same logic). What I don't remember if you added this on another family. If you did check if there is simlar logic and extract it into a base class which we can the reuse among families with this exact same pattern of replies (if they exist in the first place).

static_assert(is_integral_v<T>);
if (res)
rb->SendLong(*res);
else
rb->SendError(res.status());
}

RedisReplyBuilder* rb;
};

void HGetGeneric(CmdArgList args, ConnectionContext* cntx, uint8_t getall_mask) {
string_view key = ArgS(args, 0);

Expand Down Expand Up @@ -753,12 +763,7 @@ void HSetEx(CmdArgList args, ConnectionContext* cntx) {
return OpSet(t->GetOpArgs(shard), key, fields, op_sp);
};

OpResult<uint32_t> result = cntx->transaction->ScheduleSingleHopT(std::move(cb));
if (result) {
cntx->SendLong(*result);
} else {
cntx->SendError(result.status());
}
HSetReplies{cntx}.Send(cntx->transaction->ScheduleSingleHopT(cb));
}

} // namespace
Expand All @@ -772,24 +777,16 @@ void HSetFamily::HDel(CmdArgList args, ConnectionContext* cntx) {
};

OpResult<uint32_t> result = cntx->transaction->ScheduleSingleHopT(std::move(cb));
if (result || result.status() == OpStatus::KEY_NOTFOUND) {
cntx->SendLong(*result);
} else {
cntx->SendError(result.status());
}
if (result.status() == OpStatus::KEY_NOTFOUND)
result = OpResult<uint32_t>(0);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add unit test for this please

HSetReplies{cntx}.Send(result);
}

void HSetFamily::HLen(CmdArgList args, ConnectionContext* cntx) {
string_view key = ArgS(args, 0);

auto cb = [&](Transaction* t, EngineShard* shard) { return OpLen(t->GetOpArgs(shard), key); };

OpResult<uint32_t> result = cntx->transaction->ScheduleSingleHopT(std::move(cb));
if (result) {
cntx->SendLong(*result);
} else {
cntx->SendError(result.status());
}
HSetReplies{cntx}.Send(cntx->transaction->ScheduleSingleHopT(cb));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also here if key not found should return 0 and not key not found
maybe also add a unit test for this and hdel

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh I see that this logic for hlen is in the OpLen implementation, this is confusing, I would add this logic to OpDel as well instead of the change in line 781

}

void HSetFamily::HExists(CmdArgList args, ConnectionContext* cntx) {
Expand All @@ -800,12 +797,7 @@ void HSetFamily::HExists(CmdArgList args, ConnectionContext* cntx) {
return OpExist(t->GetOpArgs(shard), key, field);
};

OpResult<int> result = cntx->transaction->ScheduleSingleHopT(std::move(cb));
if (result) {
cntx->SendLong(*result);
} else {
cntx->SendError(result.status());
}
HSetReplies{cntx}.Send(cntx->transaction->ScheduleSingleHopT(cb));
}

void HSetFamily::HMGet(CmdArgList args, ConnectionContext* cntx) {
Expand Down Expand Up @@ -1016,12 +1008,7 @@ void HSetFamily::HSetNx(CmdArgList args, ConnectionContext* cntx) {
return OpSet(t->GetOpArgs(shard), key, args, OpSetParams{.skip_if_exists = true});
};

OpResult<uint32_t> result = cntx->transaction->ScheduleSingleHopT(std::move(cb));
if (result) {
cntx->SendLong(*result);
} else {
cntx->SendError(result.status());
}
HSetReplies{cntx}.Send(cntx->transaction->ScheduleSingleHopT(cb));
}

void HSetFamily::HStrLen(CmdArgList args, ConnectionContext* cntx) {
Expand All @@ -1032,12 +1019,7 @@ void HSetFamily::HStrLen(CmdArgList args, ConnectionContext* cntx) {
return OpStrLen(t->GetOpArgs(shard), key, field);
};

OpResult<size_t> result = cntx->transaction->ScheduleSingleHopT(std::move(cb));
if (result) {
cntx->SendLong(*result);
} else {
cntx->SendError(result.status());
}
HSetReplies{cntx}.Send(cntx->transaction->ScheduleSingleHopT(cb));
}

void StrVecEmplaceBack(StringVec& str_vec, const listpackEntry& lp) {
Expand Down
Loading