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.

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

disable profile info of SharedQueryBlockInputStream.h #5621

Merged
merged 4 commits into from
Aug 15, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion dbms/src/DataStreams/IProfilingBlockInputStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class IProfilingBlockInputStream : public IBlockInputStream

Block read() override final;

Block read(FilterPtr & res_filter, bool return_filter) override final;
Block read(FilterPtr & res_filter, bool return_filter) override;

/** The default implementation calls readPrefixImpl() on itself, and then readPrefix() recursively for all children.
* There are cases when you do not want `readPrefix` of children to be called synchronously, in this function,
Expand Down
9 changes: 8 additions & 1 deletion dbms/src/DataStreams/SharedQueryBlockInputStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ class SharedQueryBlockInputStream : public IProfilingBlockInputStream
}

protected:
Block readImpl() override
/// The BlockStreamProfileInfo of SharedQuery is useless,
/// and it will trigger tsan UT fail because of data race.
/// So overriding method `read` here.
Block read(FilterPtr &, bool) override
{
std::unique_lock lock(mutex);

Expand All @@ -134,6 +137,10 @@ class SharedQueryBlockInputStream : public IProfilingBlockInputStream

return block;
}
Block readImpl() override
{
throw Exception("Unsupport");
}

void fetchBlocks()
{
Expand Down
1 change: 0 additions & 1 deletion tests/sanitize/tsan.suppression
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
race:dbms/src/Common/TiFlashMetrics.h
race:dbms/src/DataStreams/BlockStreamProfileInfo.h