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

Merge pull request #22978 from ClickHouse/filter-by-virtual-columns-fix

Browse Source 
Fix trivial mistake in filtering by virtual columns
This commit is contained in:
Maksim Kita 2021-04-13 11:42:16 +03:00 committed by GitHub
commit 305d3d6b16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/test/fasttest/run.sh
View File

@ -300,6 +300,7 @@ function run_tests
01663_aes_msan # Depends on OpenSSL 01663_aes_msan # Depends on OpenSSL
01667_aes_args_check # Depends on OpenSSL 01667_aes_args_check # Depends on OpenSSL
01776_decrypt_aead_size_check # Depends on OpenSSL 01776_decrypt_aead_size_check # Depends on OpenSSL
01811_filter_by_null # Depends on OpenSSL
01281_unsucceeded_insert_select_queries_counter 01281_unsucceeded_insert_select_queries_counter
01292_create_user 01292_create_user
01294_lazy_database_concurrent 01294_lazy_database_concurrent

4
src/Storages/MergeTree/MergeTreeIndexSet.cpp
View File

@ -299,6 +299,10 @@ bool MergeTreeIndexConditionSet::mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx
auto column auto column
= result.getByName(expression_ast->getColumnName()).column->convertToFullColumnIfConst()->convertToFullColumnIfLowCardinality(); = result.getByName(expression_ast->getColumnName()).column->convertToFullColumnIfConst()->convertToFullColumnIfLowCardinality();
if (column->onlyNull())
return false;
const auto * col_uint8 = typeid_cast<const ColumnUInt8 *>(column.get()); const auto * col_uint8 = typeid_cast<const ColumnUInt8 *>(column.get());
const NullMap * null_map = nullptr; const NullMap * null_map = nullptr;

4
src/Storages/MergeTree/MergeTreeRangeReader.cpp
View File

@ -486,9 +486,13 @@ void MergeTreeRangeReader::ReadResult::setFilter(const ColumnPtr & new_filter)
ConstantFilterDescription const_description(*new_filter); ConstantFilterDescription const_description(*new_filter);
if (const_description.always_true) if (const_description.always_true)
{
setFilterConstTrue(); setFilterConstTrue();
}
else if (const_description.always_false) else if (const_description.always_false)
{
clear(); clear();
}
else else
{ {
FilterDescription filter_description(*new_filter); FilterDescription filter_description(*new_filter);

5
src/Storages/VirtualColumnUtils.cpp
View File

@ -191,10 +191,15 @@ void filterBlockWithQuery(const ASTPtr & query, Block & block, ContextPtr contex
ConstantFilterDescription constant_filter(*filter_column); ConstantFilterDescription constant_filter(*filter_column);
if (constant_filter.always_true) if (constant_filter.always_true)
{
return; return;
}
if (constant_filter.always_false) if (constant_filter.always_false)
{
block = block.cloneEmpty(); block = block.cloneEmpty();
return;
}
FilterDescription filter(*filter_column); FilterDescription filter(*filter_column);

0
tests/queries/0_stateless/01811_filter_by_null.reference Normal file
View File

9
tests/queries/0_stateless/01811_filter_by_null.sql Normal file
View File

@ -0,0 +1,9 @@
DROP TABLE IF EXISTS test_01344;
CREATE TABLE test_01344 (x String, INDEX idx (x) TYPE set(10) GRANULARITY 1) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;
INSERT INTO test_01344 VALUES ('Hello, world');
SELECT NULL FROM test_01344 WHERE ignore(1) = NULL;
SELECT NULL FROM test_01344 WHERE encrypt(ignore(encrypt(NULL, '0.0001048577', lcm(2, 65537), NULL, inf, NULL), lcm(-2, 1048575)), '-0.0000000001', lcm(NULL, NULL)) = NULL;
SELECT NULL FROM test_01344 WHERE ignore(x, lcm(NULL, 1048576), -2) = NULL;
DROP TABLE test_01344;