thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55980 from ClickHouse/pr-cleanup-remote-source

Browse Source 
RemoteSource: remove unnecessary flag
This commit is contained in:
Igor Nikonov 2023-11-20 12:41:08 +01:00 committed by GitHub
commit fb88c4dfdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Processors/Sources/RemoteSource.cpp
View File

@ -52,7 +52,7 @@ void RemoteSource::setStorageLimits(const std::shared_ptr<const StorageLimitsLis
ISource::Status RemoteSource::prepare()
{
/// Check if query was cancelled before returning Async status. Otherwise it may lead to infinite loop.
if (was_query_canceled)
if (isCancelled())
{
getPort().finish();
return Status::Finished;
@ -77,7 +77,7 @@ ISource::Status RemoteSource::prepare()
std::optional<Chunk> RemoteSource::tryGenerate()
{
/// onCancel() will do the cancel if the query was sent.
if (was_query_canceled)
if (isCancelled())
return {};
if (!was_query_sent)
@ -169,7 +169,6 @@ std::optional<Chunk> RemoteSource::tryGenerate()
void RemoteSource::onCancel()
{
was_query_canceled = true;
query_executor->cancel();
}
@ -177,7 +176,6 @@ void RemoteSource::onUpdatePorts()
{
if (getPort().isFinished())
{
was_query_canceled = true;
query_executor->finish();
}
}

1
src/Processors/Sources/RemoteSource.h
View File

@ -39,7 +39,6 @@ protected:
void onCancel() override;
private:
std::atomic<bool> was_query_canceled = false;
bool was_query_sent = false;
bool add_aggregation_info = false;
RemoteQueryExecutorPtr query_executor;