mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-14 11:58:02 +00:00
Code Activity

fix(server): Fix db_slice insertion bug with callbacks (#499)

Browse source 
Signed-off-by: Vladislav Oleshko <vlad@dragonflydb.io>
This commit is contained in:
Vladislav 2022-11-17 07:53:09 +03:00 committed by GitHub
parent 6f45e80137
commit a6964b3538
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/db_slice.cc
View file

@ -340,7 +340,7 @@ tuple<PrimeIterator, ExpireIterator, bool> DbSlice::AddOrFind2(const Context& cn
auto res = FindExt(cntx, key);
if (IsValid(res.first)) {
return tuple_cat(res, make_tuple(true));
return tuple_cat(res, make_tuple(false));
}
// It's a new entry.

28
src/server/dragonfly_test.cc
View file

@ -721,6 +721,34 @@ TEST_F(DflyEngineTest, Bug468) {
ASSERT_FALSE(service_->IsLocked(0, "foo"));
}
TEST_F(DflyEngineTest, Bug496) {
shard_set->pool()->AwaitFiberOnAll([&](unsigned index, ProactorBase* base) {
EngineShard* shard = EngineShard::tlocal();
if (shard == nullptr)
return;
auto& db = shard->db_slice();
int cb_hits = 0;
uint32_t cb_id =
db.RegisterOnChange([&cb_hits](DbIndex, const DbSlice::ChangeReq&) { cb_hits++; });
auto [_, added] = db.AddOrFind({}, "key-1");
EXPECT_TRUE(added);
EXPECT_EQ(cb_hits, 1);
tie(_, added) = db.AddOrFind({}, "key-1");
EXPECT_FALSE(added);
EXPECT_EQ(cb_hits, 1);
tie(_, added) = db.AddOrFind({}, "key-2");
EXPECT_TRUE(added);
EXPECT_EQ(cb_hits, 2);
db.UnregisterOnChange(cb_id);
});
}
// TODO: to test transactions with a single shard since then all transactions become local.
// To consider having a parameter in dragonfly engine controlling number of shards
// unconditionally from number of cpus. TO TEST BLPOP under multi for single/multi argument case.