Merge pull request #11608 from ClickHouse/fix-nullable-prewhere-type

alexey-milovidov · web-flow · commit f53da4d36b8c · 2020-06-13T20:29:12.000+03:00
Fix nullable prewhere type
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.cpp b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
@@ -905,7 +905,9 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
             if (prewhere->remove_prewhere_column)
                 result.columns.erase(result.columns.begin() + prewhere_column_pos);
             else
-                result.columns[prewhere_column_pos] = DataTypeUInt8().createColumnConst(result.num_rows, 1u)->convertToFullColumnIfConst();
+                result.columns[prewhere_column_pos] =
+                        getSampleBlock().getByName(prewhere->prewhere_column_name).type->
+                                createColumnConst(result.num_rows, 1u)->convertToFullColumnIfConst();
         }
     }
     /// Filter in WHERE instead
diff --git a/tests/queries/0_stateless/01305_nullable-prewhere_bug.reference b/tests/queries/0_stateless/01305_nullable-prewhere_bug.reference
@@ -0,0 +1 @@
+some_field_value	1
diff --git a/tests/queries/0_stateless/01305_nullable-prewhere_bug.sql b/tests/queries/0_stateless/01305_nullable-prewhere_bug.sql
@@ -0,0 +1,5 @@
+drop table if exists data;
+CREATE TABLE data (ts DateTime, field String, num_field Nullable(Float64)) ENGINE = MergeTree() PARTITION BY ts ORDER BY ts;
+insert into data values(toDateTime('2020-05-14 02:08:00'),'some_field_value',7.);
+SELECT field, countIf(num_field > 6.0) FROM data PREWHERE (num_field>6.0) GROUP BY field;
+drop table if exists data;

Original file line number	Diff line number	Diff line change
`@@ -905,7 +905,9 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r`
`905`	`905`	`if (prewhere->remove_prewhere_column)`
`906`	`906`	`result.columns.erase(result.columns.begin() + prewhere_column_pos);`
`907`	`907`	`else`
`908`		`- result.columns[prewhere_column_pos] = DataTypeUInt8().createColumnConst(result.num_rows, 1u)->convertToFullColumnIfConst();`
	`908`	`+ result.columns[prewhere_column_pos] =`
	`909`	`+ getSampleBlock().getByName(prewhere->prewhere_column_name).type->`
	`910`	`+ createColumnConst(result.num_rows, 1u)->convertToFullColumnIfConst();`
`909`	`911`	`}`
`910`	`912`	`}`
`911`	`913`	`/// Filter in WHERE instead`