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

Fix data race of DeltaIndex::toString (#5948) #5954

Merged
merged 3 commits into from
Oct 10, 2022
Merged

Fix data race of DeltaIndex::toString (#5948) #5954

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83363c2
This is an automated cherry-pick of #5948
JinheLin Sep 19, 2022
c7f305e
Resolve conflict.
JinheLin Oct 9, 2022
2d6896a
Merge branch 'release-6.1' into cherry-pick-5948-to-release-6.1
ti-chi-bot Oct 9, 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
11 changes: 7 additions & 4 deletions dbms/src/Storages/DeltaMerge/DeltaIndex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,13 @@ class DeltaIndex

String toString()
{
std::stringstream s;
s << "{placed rows:" << placed_rows << ", deletes:" << placed_deletes << ", delta tree: " << delta_tree->numEntries() << "|"
<< delta_tree->numInserts() << "|" << delta_tree->numDeletes() << "}";
return s.str();
std::scoped_lock lock(mutex);
return fmt::format("<placed_rows={} placed_deletes={} tree_entries={} tree_inserts={} tree_deletes={}>",
placed_rows,
placed_deletes,
delta_tree->numEntries(),
delta_tree->numInserts(),
delta_tree->numDeletes());
}

UInt64 getId() const { return id; }
Expand Down