added function arrayResize [#CLICKHOUSE-2998]

added test for arrayResize [#CLICKHOUSE-2998]
This commit is contained in:
Nikolai Kochetov 2018-01-19 21:47:17 +03:00
parent 4fb9ad3981
commit 677758edaa
10 changed files with 225 additions and 15 deletions

View File

@ -65,6 +65,7 @@ generate_function_register(Array
FunctionArrayHasAll
FunctionArrayHasAny
FunctionArrayIntersect
FunctionArrayResize
)

View File

@ -3297,4 +3297,115 @@ ColumnPtr FunctionArrayIntersect::execute(const UnpackedArrays & arrays, Mutable
return ColumnArray::create(result_column, std::move(result_offsets_ptr));
}
/// Implementation of FunctionArrayResize.
FunctionPtr FunctionArrayResize::create(const Context & context)
{
return std::make_shared<FunctionArrayResize>(context);
}
String FunctionArrayResize::getName() const
{
return name;
}
DataTypePtr FunctionArrayResize::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]->onlyNull())
return arguments[0];
auto array_type = typeid_cast<const DataTypeArray *>(arguments[0].get());
if (!array_type)
throw Exception("First argument for function " + getName() + " must be an array but it has type "
+ arguments[0]->getName() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
if (checkDataType<DataTypeNothing>(array_type->getNestedType().get()))
throw Exception("Function " + getName() + " cannot resize " + array_type->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
if (!removeNullable(arguments[1])->isInteger() && !arguments[1]->onlyNull())
throw Exception(
"Argument " + toString(1) + " for function " + getName() + " must be integer but it has type "
+ arguments[1]->getName() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
if (number_of_arguments)
return arguments[0];
else
return std::make_shared<DataTypeArray>(getLeastSupertype({array_type->getNestedType(), arguments[2]}));
}
void FunctionArrayResize::executeImpl(Block & block, const ColumnNumbers & arguments, size_t result)
{
const auto & return_type = block.getByPosition(result).type;
if (return_type->onlyNull())
{
block.getByPosition(result).column = return_type->createColumnConstWithDefaultValue(block.rows());
return;
}
auto result_column = return_type->createColumn();
auto array_column = block.getByPosition(arguments[0]).column;
auto size_column = block.getByPosition(arguments[1]).column;
if (!block.getByPosition(arguments[0]).type->equals(*return_type))
array_column = castColumn(block.getByPosition(arguments[0]), return_type, context);
const DataTypePtr & return_nested_type = typeid_cast<const DataTypeArray &>(*return_type).getNestedType();
size_t size = array_column->size();
ColumnPtr appended_column;
if (arguments.size() == 3)
{
appended_column = block.getByPosition(arguments[2]).column;
if (!block.getByPosition(arguments[2]).type->equals(*return_nested_type))
appended_column = castColumn(block.getByPosition(arguments[2]), return_nested_type, context);
}
else
appended_column = return_nested_type->createColumnConstWithDefaultValue(size);
std::unique_ptr<GatherUtils::IArraySource> array_source;
std::unique_ptr<GatherUtils::IValueSource> value_source;
bool is_const = false;
if (auto const_array_column = typeid_cast<const ColumnConst *>(array_column.get()))
{
is_const = true;
array_column = const_array_column->getDataColumnPtr();
}
if (auto argument_column_array = typeid_cast<const ColumnArray *>(array_column.get()))
array_source = GatherUtils::createArraySource(*argument_column_array, is_const, size);
else
throw Exception{"First arguments for function " + getName() + " must be array.", ErrorCodes::LOGICAL_ERROR};
bool is_appended_const = false;
if (auto const_appended_column = typeid_cast<const ColumnConst *>(appended_column.get()))
{
is_appended_const = true;
appended_column = const_appended_column->getDataColumnPtr();
}
value_source = GatherUtils::createValueSource(*appended_column, is_appended_const, size);
auto sink = GatherUtils::createArraySink(typeid_cast<ColumnArray &>(*result_column), size);
if (size_column->isColumnConst())
GatherUtils::resizeConstantSize(*array_source, *value_source, *sink, size_column->getInt(0));
else
GatherUtils::resizeDynamicSize(*array_source, *value_source, *sink, *size_column);
block.getByPosition(result).column = std::move(result_column);
}
}

View File

@ -1641,6 +1641,30 @@ public:
FunctionArrayHasAny(const Context & context) : FunctionArrayHasAllAny(context, false, name) {}
};
class FunctionArrayResize : public IFunction
{
public:
static constexpr auto name = "arrayResize";
static FunctionPtr create(const Context & context);
FunctionArrayResize(const Context & context) : context(context) {};
String getName() const override;
bool isVariadic() const override { return true; }
size_t getNumberOfArguments() const override { return 0; }
DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
void executeImpl(Block & block, const ColumnNumbers & arguments, size_t result) override;
bool useDefaultImplementationForConstants() const override { return true; }
bool useDefaultImplementationForNulls() const override { return false; }
private:
const Context & context;
};
struct NameHas { static constexpr auto name = "has"; };
struct NameIndexOf { static constexpr auto name = "indexOf"; };
struct NameCountEqual { static constexpr auto name = "countEqual"; };

View File

@ -532,25 +532,27 @@ void resizeDynamicSize(ArraySource && array_source, ValueSource && value_source,
if (size >= 0)
{
if (array_size <= size)
auto length = static_cast<size_t>(size);
if (array_size <= length)
{
writeSlice(array_source.getWhole(), sink);
for (auto i : ext::range(size, array_size))
for (size_t i = array_size; i < length; ++i)
writeSlice(value_source.getWhole(), sink);
}
else
writeSlice(array_source.getSliceFromLeft(0, size), sink);
writeSlice(array_source.getSliceFromLeft(0, length), sink);
}
else
{
if (array_size <= -size)
auto length = static_cast<size_t>(-size);
if (array_size <= length)
{
for (auto i : ext::range(-size, array_size))
for (size_t i = array_size; i < length; ++i)
writeSlice(value_source.getWhole(), sink);
writeSlice(array_source.getWhole(), sink);
}
else
writeSlice(array_source.getSliceFromLeft(0, -size), sink);
writeSlice(array_source.getSliceFromRight(length, length), sink);
}
}
else
@ -567,30 +569,31 @@ void resizeConstantSize(ArraySource && array_source, ValueSource && value_source
{
while (!sink.isEnd())
{
size_t row_num = array_source.rowNum();
auto array_size = array_source.getElementSize();
if (size >= 0)
{
if (array_size <= size)
auto length = static_cast<size_t>(size);
if (array_size <= length)
{
writeSlice(array_source.getWhole(), sink);
for (auto i : ext::range(size, array_size))
for (size_t i = array_size; i < length; ++i)
writeSlice(value_source.getWhole(), sink);
}
else
writeSlice(array_source.getSliceFromLeft(0, size), sink);
writeSlice(array_source.getSliceFromLeft(0, length), sink);
}
else
{
if (array_size <= -size)
auto length = static_cast<size_t>(-size);
if (array_size <= length)
{
for (auto i : ext::range(-size, array_size))
for (size_t i = array_size; i < length; ++i)
writeSlice(value_source.getWhole(), sink);
writeSlice(array_source.getWhole(), sink);
}
else
writeSlice(array_source.getSliceFromLeft(0, -size), sink);
writeSlice(array_source.getSliceFromRight(length, length), sink);
}
value_source.next();

View File

@ -54,6 +54,6 @@ void push(IArraySource & array_source, IValueSource & value_source, IArraySink &
void resizeDynamicSize(IArraySource & array_source, IValueSource & value_source, IArraySink & sink, const IColumn & size_column);
void resizeConstantSize(IArraySource & array_source, IValueSource & value_source, IArraySink && sink, ssize_t size);
void resizeConstantSize(IArraySource & array_source, IValueSource & value_source, IArraySink & sink, ssize_t size);
}

View File

@ -20,6 +20,6 @@ struct ArrayPush : public ArrayAndValueSourceSelectorBySink<ArrayPush>
void push(IArraySource & array_source, IValueSource & value_source, IArraySink & sink, bool push_front)
{
return ArrayPush::select(sink, array_source, value_source, push_front);
ArrayPush::select(sink, array_source, value_source, push_front);
}
}

View File

@ -0,0 +1,22 @@
#include <Functions/GatherUtils/Selectors.h>
#include <Functions/GatherUtils/Algorithms.h>
namespace DB::GatherUtils
{
struct ArrayResizeConstant : public ArrayAndValueSourceSelectorBySink<ArrayResizeConstant>
{
template <typename ArraySource, typename ValueSource, typename Sink>
static void selectArrayAndValueSourceBySink(
ArraySource && array_source, ValueSource && value_source, Sink && sink, ssize_t size)
{
resizeConstantSize(array_source, value_source, sink, size);
}
};
void resizeConstantSize(IArraySource & array_source, IValueSource & value_source, IArraySink & sink, ssize_t size)
{
ArrayResizeConstant::select(sink, array_source, value_source, size);
}
}

View File

@ -0,0 +1,22 @@
#include <Functions/GatherUtils/Selectors.h>
#include <Functions/GatherUtils/Algorithms.h>
namespace DB::GatherUtils
{
struct ArrayResizeDynamic : public ArrayAndValueSourceSelectorBySink<ArrayResizeDynamic>
{
template <typename ArraySource, typename ValueSource, typename Sink>
static void selectArrayAndValueSourceBySink(
ArraySource && array_source, ValueSource && value_source, Sink && sink, const IColumn & size_column)
{
resizeDynamicSize(array_source, value_source, sink, size_column);
}
};
void resizeDynamicSize(IArraySource & array_source, IValueSource & value_source, IArraySink & sink, const IColumn & size_column)
{
ArrayResizeDynamic::select(sink, array_source, value_source, size_column);
}
}

View File

@ -0,0 +1,13 @@
[1,2,3,0,0,0,0,0,0,0]
[0,0,0,0,0,0,0,1,2,3]
[1,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
[NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,3]
[1,2,3]
[4,5,6]
[1,2,3,42,42]
[42,42,1,2,3]
['a','b','c','','']
[[1,2],[3,4],[],[]]
[[],[],[1,2],[3,4]]
[[1,2],[3,4],[5,6],[5,6]]
[[5,6],[5,6],[1,2],[3,4]]

View File

@ -0,0 +1,14 @@
select arrayResize([1, 2, 3], 10);
select arrayResize([1, 2, 3], -10);
select arrayResize([1, Null, 3], 10);
select arrayResize([1, Null, 3], -10);
select arrayResize([1, 2, 3, 4, 5, 6], 3);
select arrayResize([1, 2, 3, 4, 5, 6], -3);
select arrayResize([1, 2, 3], 5, 42);
select arrayResize([1, 2, 3], -5, 42);
select arrayResize(['a', 'b', 'c'], 5);
select arrayResize([[1, 2], [3, 4]], 4);
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]);