thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-25 03:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8486 from amosbird/betterprewhere

Browse Source 
Add prewhere test
This commit is contained in:
alexey-milovidov 2019-12-31 21:01:12 +03:00 committed by GitHub
commit fdcf971dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/Storages/MergeTree/MergeTreeRangeReader.cpp
View File

@ -316,7 +316,8 @@ void MergeTreeRangeReader::ReadResult::optimize()
/// Check if const 1 after shrink
if (countBytesInResultFilter(filter->getData()) + total_zero_rows_in_tails == total_rows_per_granule)
{
num_rows = total_rows_per_granule = total_rows_per_granule - total_zero_rows_in_tails;
total_rows_per_granule = total_rows_per_granule - total_zero_rows_in_tails;
num_rows = total_rows_per_granule;
setFilterConstTrue();
shrink(columns); /// shrink acts as filtering in such case
}
@ -326,7 +327,8 @@ void MergeTreeRangeReader::ReadResult::optimize()
IColumn::Filter & new_data = new_filter->getData();
collapseZeroTails(filter->getData(), new_data);
num_rows = total_rows_per_granule = new_filter->size();
total_rows_per_granule = new_filter->size();
num_rows = total_rows_per_granule;
filter_original = filter;
filter_holder_original = std::move(filter_holder);
filter = new_filter.get();

2
dbms/tests/queries/0_stateless/01055_prewhere_bugs.reference Normal file
View File

@ -0,0 +1,2 @@
43
1

14
dbms/tests/queries/0_stateless/01055_prewhere_bugs.sql Normal file
View File

@ -0,0 +1,14 @@
DROP TABLE IF EXISTS test_prewhere_default_column;
DROP TABLE IF EXISTS test_prewhere_column_type;
CREATE TABLE test_prewhere_default_column (APIKey UInt8, SessionType UInt8) ENGINE = MergeTree() PARTITION BY APIKey ORDER BY tuple();
INSERT INTO test_prewhere_default_column VALUES( 42, 42 );
ALTER TABLE test_prewhere_default_column ADD COLUMN OperatingSystem UInt64 DEFAULT SessionType+1;
SELECT OperatingSystem FROM test_prewhere_default_column PREWHERE SessionType = 42;
CREATE TABLE test_prewhere_column_type (`a` LowCardinality(String), `x` Nullable(Int32)) ENGINE = MergeTree ORDER BY tuple();
INSERT INTO test_prewhere_column_type VALUES ('', 2);
SELECT a, y FROM test_prewhere_column_type prewhere (x = 2) AS y;