thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pick comments and style changes from #4385

Browse Source
This commit is contained in:
Alexey Milovidov 2020-03-31 23:12:04 +03:00
parent 576936f4e8
commit a87de767a7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/DataStreams/IBlockInputStream.cpp
View File

@ -74,7 +74,7 @@ Block IBlockInputStream::read()
}
else
{
/** If the thread is over, then we will ask all children to abort the execution.
/** If the stream is over, then we will ask all children to abort the execution.
* This makes sense when running a query with LIMIT
* - there is a situation when all the necessary data has already been read,
* but children sources are still working,

6
dbms/src/DataStreams/IBlockInputStream.h
View File

@ -180,7 +180,7 @@ public:
bool isCancelledOrThrowIfKilled() const;
/** What limitations and quotas should be checked.
* LIMITS_CURRENT - checks amount of data read by current stream only (BlockStreamProfileInfo is used for check).
* LIMITS_CURRENT - checks amount of data returned by current stream only (BlockStreamProfileInfo is used for check).
* Currently it is used in root streams to check max_result_{rows,bytes} limits.
* LIMITS_TOTAL - checks total amount of read data from leaf streams (i.e. data read from disk and remote servers).
* It is checks max_{rows,bytes}_to_read in progress handler and use info from ProcessListElement::progress_in for this.
@ -218,9 +218,9 @@ public:
/** Set the quota. If you set a quota on the amount of raw data,
* then you should also set mode = LIMITS_TOTAL to LocalLimits with setLimits.
*/
virtual void setQuota(const std::shared_ptr<const EnabledQuota> & quota_)
virtual void setQuota(const std::shared_ptr<const EnabledQuota> & new_quota)
{
quota = quota_;
quota = new_quota;
}
/// Enable calculation of minimums and maximums by the result columns.