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

Fixed bug found by PVS-Studio; added test [#CLICKHOUSE-3]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-06-04 22:37:58 +03:00
parent 47c24bb2ad
commit f467fb38c7
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2585,7 +2585,7 @@ String FunctionArraySlice::getName() const
DataTypePtr FunctionArraySlice::getReturnTypeImpl(const DataTypes & arguments) const DataTypePtr FunctionArraySlice::getReturnTypeImpl(const DataTypes & arguments) const
{ {
size_t number_of_arguments = arguments.size(); const size_t number_of_arguments = arguments.size();
if (number_of_arguments < 2 || number_of_arguments > 3) if (number_of_arguments < 2 || number_of_arguments > 3)
throw Exception("Number of arguments for function " + getName() + " doesn't match: passed " throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
@ -3320,7 +3320,7 @@ String FunctionArrayResize::getName() const
DataTypePtr FunctionArrayResize::getReturnTypeImpl(const DataTypes & arguments) const DataTypePtr FunctionArrayResize::getReturnTypeImpl(const DataTypes & arguments) const
{ {
size_t number_of_arguments = arguments.size(); const size_t number_of_arguments = arguments.size();
if (number_of_arguments < 2 || number_of_arguments > 3) if (number_of_arguments < 2 || number_of_arguments > 3)
throw Exception("Number of arguments for function " + getName() + " doesn't match: passed " throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
@ -3343,9 +3343,9 @@ DataTypePtr FunctionArrayResize::getReturnTypeImpl(const DataTypes & arguments)
"Argument " + toString(1) + " for function " + getName() + " must be integer but it has type " "Argument " + toString(1) + " for function " + getName() + " must be integer but it has type "
+ arguments[1]->getName() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT); + arguments[1]->getName() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
if (number_of_arguments) if (number_of_arguments == 2)
return arguments[0]; return arguments[0];
else else /* if (number_of_arguments == 3) */
return std::make_shared<DataTypeArray>(getLeastSupertype({array_type->getNestedType(), arguments[2]})); return std::make_shared<DataTypeArray>(getLeastSupertype({array_type->getNestedType(), arguments[2]}));
} }

1
dbms/tests/queries/0_stateless/00557_array_resize.reference
View File

@ -11,3 +11,4 @@
[[],[],[1,2],[3,4]] [[],[],[1,2],[3,4]]
[[1,2],[3,4],[5,6],[5,6]] [[1,2],[3,4],[5,6],[5,6]]
[[5,6],[5,6],[1,2],[3,4]] [[5,6],[5,6],[1,2],[3,4]]
[1,2,3,423.56,423.56]

2
dbms/tests/queries/0_stateless/00557_array_resize.sql
View File

@ -12,3 +12,5 @@ select arrayResize([[1, 2], [3, 4]], -4);
select arrayResize([[1, 2], [3, 4]], 4, [5, 6]); select arrayResize([[1, 2], [3, 4]], 4, [5, 6]);
select arrayResize([[1, 2], [3, 4]], -4, [5, 6]); select arrayResize([[1, 2], [3, 4]], -4, [5, 6]);
-- different types of array elements and default value to fill
select arrayResize([1, 2, 3], 5, 423.56);