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 tsan fail in unit test JoinExecutorTestRunner.MultiJoin #6770

Merged
merged 3 commits into from
Feb 9, 2023
Merged

fix tsan fail in unit test JoinExecutorTestRunner.MultiJoin #6770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16a8c5c
update
SeaRise Feb 7, 2023
0c0878d
Merge branch 'master' into fix_tsan_multi_join
ti-chi-bot Feb 9, 2023
fe8821d
Merge branch 'master' into fix_tsan_multi_join
ti-chi-bot Feb 9, 2023
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
1 change: 1 addition & 0 deletions dbms/src/Interpreters/Join.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,6 +2136,7 @@ bool Join::needReturnNonJoinedData() const

void Join::joinTotals(Block & block) const
{
std::shared_lock lock(rwlock);
Block totals_without_keys = totals;

if (totals_without_keys)
Expand Down
12 changes: 10 additions & 2 deletions dbms/src/Interpreters/Join.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,16 @@ class Join

/** Keep "totals" (separate part of dataset, see WITH TOTALS) to use later.
*/
void setTotals(const Block & block) { totals = block; }
bool hasTotals() const { return static_cast<bool>(totals); };
void setTotals(const Block & block)
{
std::unique_lock lock(rwlock);
totals = block;
}
bool hasTotals() const
{
std::shared_lock lock(rwlock);
return static_cast<bool>(totals);
};

void joinTotals(Block & block) const;

Expand Down