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

supported arraySlice with 2 arguments, added comments [#CLICKHOUSE-2090]

Browse Source
This commit is contained in:
Nikolai Kochetov 2017-08-25 16:54:08 +03:00
parent 1ec04d1024
commit 24e135fbe6
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3051,6 +3051,13 @@ 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();
if (number_of_arguments < 2 || number_of_arguments > 3)
throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
+ toString(number_of_arguments) + ", should be 2 or 3",
ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
if (arguments[0]->isNull()) if (arguments[0]->isNull())
return arguments[0]; return arguments[0];
@ -3059,7 +3066,7 @@ DataTypePtr FunctionArraySlice::getReturnTypeImpl(const DataTypes & arguments) c
throw Exception("First argument for function " + getName() + " must be an array but it has type " throw Exception("First argument for function " + getName() + " must be an array but it has type "
+ arguments[0]->getName() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT); + arguments[0]->getName() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
for (size_t i = 1; i < arguments.size(); ++i) for (size_t i = 1; i < number_of_arguments; ++i)
{ {
if (!arguments[i]->isNumeric() && !arguments[i]->isNull()) if (!arguments[i]->isNumeric() && !arguments[i]->isNull())
throw Exception( throw Exception(
@ -3079,7 +3086,7 @@ void FunctionArraySlice::executeImpl(Block & block, const ColumnNumbers & argume
auto array_column = block.getByPosition(arguments[0]).column; auto array_column = block.getByPosition(arguments[0]).column;
auto offset_column = block.getByPosition(arguments[1]).column; auto offset_column = block.getByPosition(arguments[1]).column;
auto length_column = block.getByPosition(arguments[2]).column; auto length_column = arguments.size() > 2 ? block.getByPosition(arguments[2]).column : nullptr;
if (return_type->isNull()) if (return_type->isNull())
{ {
@ -3107,7 +3114,7 @@ void FunctionArraySlice::executeImpl(Block & block, const ColumnNumbers & argume
if (offset_column->isNull()) if (offset_column->isNull())
{ {
if (length_column->isNull()) if (!length_column || length_column->isNull())
result_column = array_column->clone(); result_column = array_column->clone();
else if (length_column->isConst()) else if (length_column->isConst())
sliceFromLeftConstantOffsetBounded(*source, *sink, 0, length_column->getInt(0)); sliceFromLeftConstantOffsetBounded(*source, *sink, 0, length_column->getInt(0));
@ -3121,7 +3128,7 @@ void FunctionArraySlice::executeImpl(Block & block, const ColumnNumbers & argume
{ {
ssize_t offset = offset_column->getUInt(0); ssize_t offset = offset_column->getUInt(0);
if (length_column->isNull()) if (!length_column || length_column->isNull())
{ {
if (offset > 0) if (offset > 0)
sliceFromLeftConstantOffsetUnbounded(*source, *sink, static_cast<size_t>(offset - 1)); sliceFromLeftConstantOffsetUnbounded(*source, *sink, static_cast<size_t>(offset - 1));
@ -3141,7 +3148,7 @@ void FunctionArraySlice::executeImpl(Block & block, const ColumnNumbers & argume
} }
else else
{ {
if (length_column->isNull()) if (!length_column || length_column->isNull())
sliceDynamicOffsetUnbounded(*source, *sink, *offset_column); sliceDynamicOffsetUnbounded(*source, *sink, *offset_column);
else else
sliceDynamicOffsetBounded(*source, *sink, *offset_column, *length_column); sliceDynamicOffsetBounded(*source, *sink, *offset_column, *length_column);

20
dbms/src/Functions/FunctionsArray.h
View File

@ -61,6 +61,22 @@ namespace ErrorCodes
* *
* arrayReduce('agg', arr1, ...) - apply the aggregate function `agg` to arrays `arr1...` * arrayReduce('agg', arr1, ...) - apply the aggregate function `agg` to arrays `arr1...`
* If multiple arrays passed, then elements on corresponding positions are passed as multiple arguments to the aggregate function. * If multiple arrays passed, then elements on corresponding positions are passed as multiple arguments to the aggregate function.
*
* arrayConcat(arr1, ...) - concatenate arrays.
*
* arraySlice(arr, offset, length) - make slice of array. Offsets and length may be < 0 or Null
* - if offset <= 0, indexation from right element
* - if length < 0, length = len(array) - (positive_index(offset) - 1) + length
* indexation:
* [ 1, 2, 3, 4, 5, 6]
* [-5, -4, -3, -2, -1, 0]
* examples:
* arraySlice([1, 2, 3, 4, 5, 6], -4, 2) -> [2, 3]
* arraySlice([1, 2, 3, 4, 5, 6], 2, -1) -> [2, 3, 4, 5] (6 - (2 - 1) + (-1) = 4)
* arraySlice([1, 2, 3, 4, 5, 6], -4, -1) = arraySlice([1, 2, 3, 4, 5, 6], -4, -1) -> [2, 3, 4, 5]
*
* arrayPushBack(arr, x), arrayPushFront(arr, x)
* arrayPopBack(arr), arrayPopFront(arr)
*/ */
@ -1433,8 +1449,8 @@ public:
String getName() const override; String getName() const override;
bool isVariadic() const override { return false; } bool isVariadic() const override { return true; }
size_t getNumberOfArguments() const override { return 3; } size_t getNumberOfArguments() const override { return 0; }
DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override; DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;