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

Changes after review of #8149

Browse Source
This commit is contained in:
Alexey Milovidov 2019-12-12 22:12:18 +03:00
parent 0dc62d20e1
commit f88c94ed56
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dbms/src/Functions/array/arrayZipWithIndex.cpp → dbms/src/Functions/array/arrayZip.cpp
View File

@ -59,34 +59,19 @@ public:
auto first_argument = block.getByPosition(arguments[0]);
const auto & first_array_column = checkAndGetColumn<ColumnArray>(first_argument.column.get());
Columns res_tuple_columns(arguments.size());
res_tuple_columns[0] = first_array_column->getDataPtr();
for (size_t index = 1; index < arguments.size(); ++index)
{
const auto & argument_type_and_column = block.getByPosition(arguments[index]);
const auto & argument_array_column = checkAndGetColumn<ColumnArray>(argument_type_and_column.column.get());
if (argument_array_column->size() != first_array_column->size())
if (!first_array_column->hasEqualOffsets(*argument_array_column))
throw Exception("The argument 1 and argument " + toString(index + 1) + " of function have different array sizes",
ErrorCodes::SIZES_OF_ARRAYS_DOESNT_MATCH);
if (argument_array_column->getData().size() != first_array_column->getData().size())
throw Exception("The argument 1 and argument " + toString(index + 1) + " of function have different array sizes",
ErrorCodes::SIZES_OF_ARRAYS_DOESNT_MATCH);
}
Columns res_tuple_columns(arguments.size());
res_tuple_columns[0] = first_array_column->getDataPtr();
for (size_t argument_index = 1; argument_index < arguments.size(); ++argument_index)
{
const auto & argument_type_and_column = block.getByPosition(arguments[argument_index]);
const auto & argument_array_column = checkAndGetColumn<ColumnArray>(argument_type_and_column.column.get());
for (size_t row_index = 0; row_index < first_array_column->size(); ++row_index)
if (first_array_column->getOffsets()[row_index] != argument_array_column->getOffsets()[row_index])
throw Exception(
"The argument 1 and argument " + toString(argument_index + 1) + " of function have different array sizes",
ErrorCodes::SIZES_OF_ARRAYS_DOESNT_MATCH);
res_tuple_columns[argument_index] = argument_array_column->getDataPtr();
res_tuple_columns[index] = argument_array_column->getDataPtr();
}
block.getByPosition(result).column = ColumnArray::create(