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

Update test.

Browse Source
This commit is contained in:
Nikolai Kochetov 2022-05-31 19:40:50 +00:00
parent 157760ac85
commit 9954c59dc1
5 changed files with 95 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Processors/IProcessor.h
View File

@ -320,7 +320,7 @@ public:
const StorageLimitsList & limits;
};
/// Set limits fro current storage.
/// Set limits for current storage.
/// Different limits may be applied to different storages, we need to keep it per processor.
/// This method is need to be override only for sources.
virtual void setStorageLimits(const std::shared_ptr<const StorageLimitsList> & /*storage_limits*/) {}

8
src/Processors/ISource.cpp
View File

@ -21,7 +21,7 @@ ISource::ISource(Block header, bool enable_auto_progress)
ISource::Status ISource::prepare()
{
if (finished || isCancelled())
if (finished)
{
output.finish();
return Status::Finished;
@ -40,6 +40,12 @@ ISource::Status ISource::prepare()
output.pushData(std::move(current_chunk));
has_input = false;
if (isCancelled())
{
output.finish();
return Status::Finished;
}
if (got_exception)
{
finished = true;

4
src/QueryPipeline/SizeLimits.cpp
View File

@ -35,9 +35,9 @@ bool SizeLimits::check(UInt64 rows, UInt64 bytes, const char * what, int too_man
bool SizeLimits::softCheck(UInt64 rows, UInt64 bytes) const
{
if (max_rows && rows > max_rows)
if (max_rows && rows >= max_rows)
return false;
if (max_bytes && bytes > max_bytes)
if (max_bytes && bytes >= max_bytes)
return false;
return true;
}

4
tests/queries/0_stateless/02313_multiple_limits.reference
View File

@ -1,2 +1,6 @@
45
45
20
1
20
1

81
tests/queries/0_stateless/02313_multiple_limits.sql
View File

@ -23,3 +23,84 @@ FROM
)
SETTINGS max_rows_to_read = 10, read_overflow_mode = 'break', max_block_size = 2
);
SELECT count()
FROM
(
SELECT x
FROM
(
SELECT zero AS x
FROM system.zeros
SETTINGS max_block_size = 2, max_rows_to_read = 10, read_overflow_mode = 'break'
)
UNION ALL
SELECT x
FROM
(
SELECT zero + 1 AS x
FROM system.zeros
SETTINGS max_block_size = 2, max_rows_to_read = 20, read_overflow_mode = 'break'
)
);
SELECT sum(x) >= 10
FROM
(
SELECT x
FROM
(
SELECT zero AS x
FROM system.zeros
SETTINGS max_block_size = 2, max_rows_to_read = 10, read_overflow_mode = 'break'
)
UNION ALL
SELECT x
FROM
(
SELECT zero + 1 AS x
FROM system.zeros
SETTINGS max_block_size = 2, max_rows_to_read = 20, read_overflow_mode = 'break'
)
);
SELECT count()
FROM
(
SELECT x
FROM
(
SELECT zero AS x
FROM system.zeros
SETTINGS max_block_size = 2, max_rows_to_read = 20, read_overflow_mode = 'break'
)
UNION ALL
SELECT x
FROM
(
SELECT zero + 1 AS x
FROM system.zeros
SETTINGS max_block_size = 2, max_rows_to_read = 10, read_overflow_mode = 'break'
)
);
SELECT sum(x) <= 10
FROM
(
SELECT x
FROM
(
SELECT zero AS x
FROM system.zeros
SETTINGS max_block_size = 2, max_rows_to_read = 20, read_overflow_mode = 'break'
)
UNION ALL
SELECT x
FROM
(
SELECT zero + 1 AS x
FROM system.zeros
SETTINGS max_block_size = 2, max_rows_to_read = 10, read_overflow_mode = 'break'
)
);