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

Fix data race of DeltaIndexManager. #4675

Merged
merged 2 commits into from
Apr 15, 2022
Merged

Fix data race of DeltaIndexManager. #4675

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a29388
Fix data race.
JinheLin Apr 15, 2022
9e83c20
Merge branch 'release-5.2' into fix-data-race
solotzg Apr 15, 2022
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
6 changes: 2 additions & 4 deletions dbms/src/Storages/DeltaMerge/DeltaIndexManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,8 @@ void DeltaIndexManager::refreshRef(const DeltaIndexPtr & index)
current_size += holder.size;

removeOverflow(removed);
CurrentMetrics::set(CurrentMetrics::DT_DeltaIndexCacheSize, current_size);
}

CurrentMetrics::set(CurrentMetrics::DT_DeltaIndexCacheSize, current_size);
}

void DeltaIndexManager::deleteRef(const DeltaIndexPtr & index)
Expand Down Expand Up @@ -111,9 +110,8 @@ void DeltaIndexManager::deleteRef(const DeltaIndexPtr & index)
lru_queue.erase(holder.queue_it);
// Remove it later
index_map.erase(it);
CurrentMetrics::set(CurrentMetrics::DT_DeltaIndexCacheSize, current_size);
}

CurrentMetrics::set(CurrentMetrics::DT_DeltaIndexCacheSize, current_size);
}

DeltaIndexPtr DeltaIndexManager::getRef(UInt64 index_id)
Expand Down