thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved performance of function arrayElement with constant array when one of element is an empty array #1889

Browse Source
This commit is contained in:
Alexey Milovidov 2018-02-13 00:06:13 +03:00
parent ac0d1f8fba
commit 3656aa0606
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbms/src/Functions/FunctionsArray.cpp
View File

@ -61,6 +61,13 @@ void FunctionArray::executeImpl(Block & block, const ColumnNumbers & arguments,
{ {
size_t num_elements = arguments.size(); size_t num_elements = arguments.size();
if (num_elements == 0)
{
/// We should return constant empty array.
block.getByPosition(result).column = block.getByPosition(result).type->createColumnConstWithDefaultValue(block.rows());
return;
}
const DataTypePtr & return_type = block.getByPosition(result).type; const DataTypePtr & return_type = block.getByPosition(result).type;
const DataTypePtr & elem_type = static_cast<const DataTypeArray &>(*return_type).getNestedType(); const DataTypePtr & elem_type = static_cast<const DataTypeArray &>(*return_type).getNestedType();
@ -91,8 +98,7 @@ void FunctionArray::executeImpl(Block & block, const ColumnNumbers & arguments,
columns[i] = columns_holder[i].get(); columns[i] = columns_holder[i].get();
} }
/** Create and fill the result array. /// Create and fill the result array.
*/
auto out = ColumnArray::create(elem_type->createColumn()); auto out = ColumnArray::create(elem_type->createColumn());
IColumn & out_data = out->getData(); IColumn & out_data = out->getData();

3
dbms/tests/queries/0_stateless/00570_empty_array_is_const.reference Normal file
View File

@ -0,0 +1,3 @@
Array(Nothing), Const(size = 1, Array(size = 1, UInt64(size = 1), Nothing(size = 0)))
Array(Array(Array(Nothing))), Const(size = 1, Array(size = 1, UInt64(size = 1), Array(size = 1, UInt64(size = 1), Array(size = 1, UInt64(size = 1), Nothing(size = 0)))))
Array(Array(UInt8)), Const(size = 1, Array(size = 1, UInt64(size = 1), Array(size = 2, UInt64(size = 2), UInt8(size = 1))))

3
dbms/tests/queries/0_stateless/00570_empty_array_is_const.sql Normal file
View File

@ -0,0 +1,3 @@
SELECT dumpColumnStructure([]);
SELECT dumpColumnStructure([[[]]]);
SELECT DISTINCT dumpColumnStructure([[], [1]]) FROM numbers(2);