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

alexey-milovidov · web-flow · commit 827990d68160 · 2020-07-09T07:06:07.000+03:00
Fix virtual columns filter
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
@@ -14,6 +14,7 @@
 
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnsCommon.h>
+#include <Columns/FilterDescription.h>
 
 #include <Storages/VirtualColumnUtils.h>
 #include <IO/WriteHelpers.h>
@@ -127,12 +128,21 @@ void filterBlockWithQuery(const ASTPtr & query, Block & block, const Context & c
     /// Filter the block.
     String filter_column_name = expression_ast->getColumnName();
     ColumnPtr filter_column = block_with_filter.getByName(filter_column_name).column->convertToFullColumnIfConst();
-    const IColumn::Filter & filter = typeid_cast<const ColumnUInt8 &>(*filter_column).getData();
+
+    ConstantFilterDescription constant_filter(*filter_column);
+
+    if (constant_filter.always_true)
+        return;
+
+    if (constant_filter.always_false)
+        block = block.cloneEmpty();
+
+    FilterDescription filter(*filter_column);
 
     for (size_t i = 0; i < block.columns(); ++i)
     {
         ColumnPtr & column = block.safeGetByPosition(i).column;
-        column = column->filter(filter, -1);
+        column = column->filter(*filter.data, -1);
     }
 }
 
diff --git a/tests/queries/0_stateless/01389_filter_by_virtual_columns.reference b/tests/queries/0_stateless/01389_filter_by_virtual_columns.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01389_filter_by_virtual_columns.sql b/tests/queries/0_stateless/01389_filter_by_virtual_columns.sql
@@ -0,0 +1,2 @@
+SELECT count() FROM system.parts WHERE table = NULL AND database = currentDatabase();
+SELECT DISTINCT marks FROM system.parts WHERE (table = NULL) AND (database = currentDatabase()) AND (active = 1);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+SELECT count() FROM system.parts WHERE table = NULL AND database = currentDatabase();`
	`2`	`+SELECT DISTINCT marks FROM system.parts WHERE (table = NULL) AND (database = currentDatabase()) AND (active = 1);`