mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-15 17:51:06 +00:00
Code Activity

fix: zset store conclude transaction on error (#3755)

Browse source
This commit is contained in:
Andy Dunstall 2024-09-21 17:08:53 +01:00 committed by GitHub
parent ce79da0f7a
commit 9dd79657ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/server/zset_family.cc
View file

@ -1762,8 +1762,12 @@ void ZBooleanOperation(CmdArgList args, ConnectionContext* cntx, bool is_union,
for (auto& op_res : maps) { for (auto& op_res : maps) {
if (op_res.status() == OpStatus::SKIPPED) if (op_res.status() == OpStatus::SKIPPED)
continue; continue;
if (!op_res) if (!op_res) {
if (store) {
cntx->transaction->Conclude();
}
return cntx->SendError(op_res.status()); return cntx->SendError(op_res.status());
}
if (result.empty()) if (result.empty())
result = std::move(op_res.value()); result = std::move(op_res.value());