mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 10:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Refactor transaction (#697)

Browse source 
* refactor(server): Transaction naming

Signed-off-by: Vladislav <vlad@dragonflydb.io>
This commit is contained in:
Vladislav 2023-01-17 15:53:12 +03:00 • committed by GitHub
parent b2edf9c848
commit 9536c0a645
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 299 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server/blocking_controller.cc
View file

@ -90,7 +90,7 @@ void BlockingController::RunStep(Transaction* completed_t) {
if (completed_t) {
awakened_transactions_.erase(completed_t);
auto dbit = watched_dbs_.find(completed_t->db_index());
auto dbit = watched_dbs_.find(completed_t->GetDbIndex());
if (dbit != watched_dbs_.end()) {
DbWatchTable& wt = *dbit->second;
@ -100,7 +100,7 @@ void BlockingController::RunStep(Transaction* completed_t) {
for (size_t i = 0; i < lock_args.args.size(); i += lock_args.key_step) {
string_view key = lock_args.args[i];
if (wt.AddAwakeEvent(WatchQueue::ACTIVE, key)) {
awakened_indices_.emplace(completed_t->db_index());
awakened_indices_.emplace(completed_t->GetDbIndex());
}
}
}
@ -139,7 +139,7 @@ void BlockingController::RunStep(Transaction* completed_t) {
void BlockingController::AddWatched(ArgSlice keys, Transaction* trans) {
VLOG(1) << "AddWatched [" << owner_->shard_id() << "] " << trans->DebugId();
auto [dbit, added] = watched_dbs_.emplace(trans->db_index(), nullptr);
auto [dbit, added] = watched_dbs_.emplace(trans->GetDbIndex(), nullptr);
if (added) {
dbit->second.reset(new DbWatchTable);
}
@ -154,7 +154,7 @@ void BlockingController::AddWatched(ArgSlice keys, Transaction* trans) {
if (!res->second->items.empty()) {
Transaction* last = res->second->items.back().get();
DCHECK_GT(last->use_count(), 0u);
DCHECK_GT(last->GetUseCount(), 0u);
// Duplicate keys case. We push only once per key.
if (last == trans)
@ -169,7 +169,7 @@ void BlockingController::AddWatched(ArgSlice keys, Transaction* trans) {
void BlockingController::RemoveWatched(ArgSlice keys, Transaction* trans) {
VLOG(1) << "RemoveWatched [" << owner_->shard_id() << "] " << trans->DebugId();
auto dbit = watched_dbs_.find(trans->db_index());
auto dbit = watched_dbs_.find(trans->GetDbIndex());
if (dbit == watched_dbs_.end())
return;