fix

fix

fix
This commit is contained in:
fenglv 2019-09-20 00:50:21 +08:00
parent 2062bedaf0
commit 4465fdb8bf
3 changed files with 257 additions and 223 deletions

View File

@ -10,227 +10,200 @@
namespace DB namespace DB
{ {
namespace ErrorCodes namespace ErrorCodes
{ {
extern const int ILLEGAL_COLUMN; extern const int ILLEGAL_COLUMN;
extern const int ILLEGAL_TYPE_OF_ARGUMENT; extern const int ILLEGAL_TYPE_OF_ARGUMENT;
} }
struct RepeatImpl struct RepeatImpl
{ {
static void vectorNonConstStr( static void vectorNonConstStr(
const ColumnString::Chars & data, const ColumnString::Chars & data,
const ColumnString::Offsets & offsets, const ColumnString::Offsets & offsets,
ColumnString::Chars & res_data, ColumnString::Chars & res_data,
ColumnString::Offsets & res_offsets, ColumnString::Offsets & res_offsets,
const UInt64 repeatTime) const UInt64 & repeat_time)
{ {
UInt64 data_size = 0; UInt64 data_size = 0;
res_offsets.assign(offsets); res_offsets.assign(offsets);
for (UInt64 i = 0; i < offsets.size(); ++i) for (UInt64 i = 0; i < offsets.size(); ++i)
{ {
data_size += (offsets[i] - offsets[i - 1] - 1) * repeatTime + 1; data_size += (offsets[i] - offsets[i - 1] - 1) * repeat_time + 1;
res_offsets[i] = data_size; res_offsets[i] = data_size;
} }
res_data.resize(data_size); res_data.resize(data_size);
for (UInt64 i = 0; i < res_offsets.size(); ++i) for (UInt64 i = 0; i < res_offsets.size(); ++i)
{ {
array(data.data() + offsets[i - 1], res_data.data() + res_offsets[i - 1], offsets[i] - offsets[i - 1], repeatTime); array(data.data() + offsets[i - 1], res_data.data() + res_offsets[i - 1], offsets[i] - offsets[i - 1], repeat_time);
} }
} }
static void static void
vectorConst(const String & copy_str, const UInt64 repeatTime, ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets) vectorConst(const String & copy_str, const UInt64 & repeat_time, ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
{ {
UInt64 data_size = copy_str.size() * repeatTime + 1; UInt64 data_size = copy_str.size() * repeat_time + 1;
res_data.resize(data_size); res_data.resize(data_size);
res_offsets.resize_fill(1, data_size); res_offsets.resize_fill(1, data_size);
array((UInt8 *)copy_str.data(), res_data.data(), copy_str.size() + 1, repeatTime); array(reinterpret_cast<UInt8 *>(const_cast<char *>(copy_str.data())), res_data.data(), copy_str.size() + 1, repeat_time);
} }
template <typename T> template <typename T>
static void vectorNonConst( static void vectorNonConst(
const ColumnString::Chars & data, const ColumnString::Chars & data,
const ColumnString::Offsets & offsets, const ColumnString::Offsets & offsets,
ColumnString::Chars & res_data, ColumnString::Chars & res_data,
ColumnString::Offsets & res_offsets, ColumnString::Offsets & res_offsets,
const PaddedPODArray<T> & col_num) const PaddedPODArray<T> & col_num)
{ {
UInt64 data_size = 0; UInt64 data_size = 0;
res_offsets.assign(offsets); res_offsets.assign(offsets);
for (UInt64 i = 0; i < col_num.size(); ++i) for (UInt64 i = 0; i < col_num.size(); ++i)
{ {
data_size += (offsets[i] - offsets[i - 1] - 1) * col_num[i] + 1; data_size += (offsets[i] - offsets[i - 1] - 1) * col_num[i] + 1;
res_offsets[i] = data_size; res_offsets[i] = data_size;
} }
res_data.resize(data_size); res_data.resize(data_size);
for (UInt64 i = 0; i < col_num.size(); ++i) for (UInt64 i = 0; i < col_num.size(); ++i)
{ {
array(data.data() + offsets[i - 1], res_data.data() + res_offsets[i - 1], offsets[i] - offsets[i - 1], col_num[i]); array(data.data() + offsets[i - 1], res_data.data() + res_offsets[i - 1], offsets[i] - offsets[i - 1], col_num[i]);
} }
} }
template <typename T>
template <typename T> static void vectorNonConstInteger(
static void vectorNonConstInteger( const String & copy_str, ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets, const PaddedPODArray<T> & col_num)
const String & copy_str, ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets, const PaddedPODArray<T> & col_num) {
{ UInt64 data_size = 0;
UInt64 data_size = 0; res_offsets.resize(col_num.size());
res_offsets.resize(col_num.size()); UInt64 str_size = copy_str.size();
UInt64 str_size = copy_str.size(); UInt64 col_size = col_num.size();
for (UInt64 i = 0; i < col_num.size(); ++i) for (UInt64 i = 0; i < col_size; ++i)
{ {
data_size += str_size * col_num[i] + 1; data_size += str_size * col_num[i] + 1;
res_offsets[i] = data_size; res_offsets[i] = data_size;
} }
res_data.resize(data_size); res_data.resize(data_size);
for (UInt64 i = 0; i < col_num.size(); ++i) for (UInt64 i = 0; i < col_size; ++i)
{ {
array((UInt8 *)copy_str.data(), res_data.data() + res_offsets[i - 1], str_size + 1, col_num[i]); array(
} reinterpret_cast<UInt8 *>(const_cast<char *>(copy_str.data())),
} res_data.data() + res_offsets[i - 1],
str_size + 1,
private: col_num[i]);
template <typename T> }
static void array(const UInt8 * src, UInt8 * dst, const UInt64 size, T repeatTime) }
{
UInt64 i = 0; private:
do static void array(const UInt8 * src, UInt8 * dst, const UInt64 & size, const UInt64 & repeat_time)
{ {
memcpy(dst, src, size - 1); for (UInt64 i = 0; i < repeat_time; ++i)
dst += size - 1; {
++i; memcpy(dst, src, size - 1);
} while (i < repeatTime); dst += size - 1;
*dst = 0; }
} *dst = 0;
}; }
};
template <typename Impl> template <typename Impl>
class FunctionRepeatImpl : public IFunction class FunctionRepeatImpl : public IFunction
{ {
template <typename F> template <typename F>
static bool castType(const IDataType * type, F && f) static bool castType(const IDataType * type, F && f)
{ {
return castTypeToEither< return castTypeToEither<DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64>(type, std::forward<F>(f));
DataTypeUInt8, }
DataTypeUInt16,
DataTypeUInt32, public:
DataTypeUInt64>(type, std::forward<F>(f)); static constexpr auto name = "repeat";
} static FunctionPtr create(const Context &) { return std::make_shared<FunctionRepeatImpl>(); }
public: String getName() const override { return name; }
static constexpr auto name = "repeat";
static FunctionPtr create(const Context &) { return std::make_shared<FunctionRepeatImpl>(); } size_t getNumberOfArguments() const override { return 2; }
String getName() const override { return name; } DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
{
size_t getNumberOfArguments() const override { return 2; } if (!isString(arguments[0]))
throw Exception(
DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override "Illegal type " + arguments[0]->getName() + " of argument of function " + getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
{ if (!isUnsignedInteger(arguments[1]))
if (!isString(arguments[0])) throw Exception(
throw Exception( "Illegal type " + arguments[1]->getName() + " of argument of function " + getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
"Illegal type " + arguments[0]->getName() + " of argument of function " + getName(), return arguments[0];
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT); }
if (!isUnsignedInteger(arguments[1]))
throw Exception( bool useDefaultImplementationForConstants() const override { return true; }
"Illegal type " + arguments[1]->getName() + " of argument of function 1" + getName(),
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT); void executeImpl(Block & block, const ColumnNumbers & arguments, size_t result, size_t) override
return arguments[0]; {
} auto & strcolumn = block.getByPosition(arguments[0]).column;
auto & numcolumn = block.getByPosition(arguments[1]).column;
bool useDefaultImplementationForConstants() const override { return true; }
if (const ColumnString * col = checkAndGetColumn<ColumnString>(strcolumn.get()))
void executeImpl(Block & block, const ColumnNumbers & arguments, size_t result, size_t) override {
{ if (const ColumnConst * scale_column_num = checkAndGetColumn<ColumnConst>(numcolumn.get()))
const ColumnPtr strcolumn = block.getByPosition(arguments[0]).column; {
const ColumnPtr numcolumn = block.getByPosition(arguments[1]).column; Field scale_field_num = scale_column_num->getField();
UInt64 repeat_time = scale_field_num.get<UInt64>();
if (const ColumnString * col = checkAndGetColumn<ColumnString>(strcolumn.get())) auto col_res = ColumnString::create();
{ Impl::vectorNonConstStr(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), repeat_time);
if (const ColumnConst * scale_column_num = checkAndGetColumn<ColumnConst>(numcolumn.get())) block.getByPosition(result).column = std::move(col_res);
{ }
Field scale_field_num = scale_column_num->getField(); else if (!castType(block.getByPosition(arguments[1]).type.get(), [&](const auto & type)
UInt64 repeat_time = scale_field_num.get<UInt64>(); {
auto col_res = ColumnString::create(); using DataType = std::decay_t<decltype(type)>;
Impl::vectorNonConstStr( using T0 = typename DataType::FieldType;
col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), repeat_time); const ColumnVector<T0> * colnum = checkAndGetColumn<ColumnVector<T0>>(numcolumn.get());
block.getByPosition(result).column = std::move(col_res); auto col_res = ColumnString::create();
} Impl::vectorNonConst(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), colnum->getData());
else if (!castType( block.getByPosition(result).column = std::move(col_res);
block.getByPosition(arguments[1]).type.get(), [&](const auto & type) { return 0;
using DataType = std::decay_t<decltype(type)>; }));
using T0 = typename DataType::FieldType; else
const ColumnVector<T0> * colnum = checkAndGetColumn<ColumnVector<T0>>(numcolumn.get()); throw Exception(
if (col->size() > 1 && colnum->size() > 1 && col->size() != colnum->size()) "Illegal column " + block.getByPosition(arguments[1]).column->getName() + " of argument of function " + getName(),
throw Exception( ErrorCodes::ILLEGAL_COLUMN);
"Column size doesn't match of argument of function " + getName(), ErrorCodes::ILLEGAL_COLUMN); }
auto col_res = ColumnString::create(); else if (const ColumnConst * scale_column_str = checkAndGetColumn<ColumnConst>(strcolumn.get()))
if (colnum->size() == 1 && col->size() >= 1) {
{ Field scale_field_str = scale_column_str->getField();
UInt64 repeat_time = colnum->get64(0); String copy_str = scale_field_str.get<String>();
Impl::vectorNonConstStr( if (const ColumnConst * scale_column_num = checkAndGetColumn<ColumnConst>(numcolumn.get()))
col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), repeat_time); {
} Field scale_field_num = scale_column_num->getField();
else UInt64 repeat_time = scale_field_num.get<UInt64>();
{ auto col_res = ColumnString::create();
Impl::vectorNonConst( Impl::vectorConst(copy_str, repeat_time, col_res->getChars(), col_res->getOffsets());
col->getChars(), block.getByPosition(result).column = std::move(col_res);
col->getOffsets(), }
col_res->getChars(), else if (!castType(block.getByPosition(arguments[1]).type.get(), [&](const auto & type)
col_res->getOffsets(), {
colnum->getData()); using DataType = std::decay_t<decltype(type)>;
} using T0 = typename DataType::FieldType;
block.getByPosition(result).column = std::move(col_res); const ColumnVector<T0> * colnum = checkAndGetColumn<ColumnVector<T0>>(numcolumn.get());
return 0; auto col_res = ColumnString::create();
})) Impl::vectorNonConstInteger(copy_str, col_res->getChars(), col_res->getOffsets(), colnum->getData());
; block.getByPosition(result).column = std::move(col_res);
else return 0;
throw Exception( }));
"Illegal column " + block.getByPosition(arguments[1]).column->getName() + " of argument of function2 " else
+ getName(), throw Exception(
ErrorCodes::ILLEGAL_COLUMN); "Illegal column " + block.getByPosition(arguments[1]).column->getName() + " of argument of function " + getName(),
} ErrorCodes::ILLEGAL_COLUMN);
else if (const ColumnConst * scale_column_str = checkAndGetColumn<ColumnConst>(strcolumn.get())) }
{ else
Field scale_field_str = scale_column_str->getField(); throw Exception(
String copy_str = scale_field_str.get<String>(); "Illegal column " + block.getByPosition(arguments[0]).column->getName() + " of argument of function " + getName(),
if (const ColumnConst * scale_column_num = checkAndGetColumn<ColumnConst>(numcolumn.get())) ErrorCodes::ILLEGAL_COLUMN);
{ }
Field scale_field_num = scale_column_num->getField(); };
UInt64 repeat_time = scale_field_num.get<UInt64>();
auto col_res = ColumnString::create(); using FunctionRepeat = FunctionRepeatImpl<RepeatImpl>;
Impl::vectorConst(copy_str, repeat_time, col_res->getChars(), col_res->getOffsets());
block.getByPosition(result).column = std::move(col_res); void registerFunctionRepeat(FunctionFactory & factory)
} {
else if (!castType(block.getByPosition(arguments[1]).type.get(), [&](const auto & type) { factory.registerFunction<FunctionRepeat>();
using DataType = std::decay_t<decltype(type)>; }
using T0 = typename DataType::FieldType;
const ColumnVector<T0> * colnum = checkAndGetColumn<ColumnVector<T0>>(numcolumn.get());
auto col_res = ColumnString::create();
Impl::vectorNonConstInteger(copy_str, col_res->getChars(), col_res->getOffsets(), colnum->getData());
block.getByPosition(result).column = std::move(col_res);
return 0;
}))
;
else
throw Exception(
"Illegal column " + block.getByPosition(arguments[1]).column->getName() + " of argument of function2 "
+ getName(),
ErrorCodes::ILLEGAL_COLUMN);
}
else
throw Exception(
"Illegal column " + block.getByPosition(arguments[0]).column->getName() + " of argument of function " + getName(),
ErrorCodes::ILLEGAL_COLUMN);
}
};
using FunctionRepeat = FunctionRepeatImpl<RepeatImpl>;
void registerFunctionRepeat(FunctionFactory & factory)
{
factory.registerFunction<FunctionRepeat>();
}
} }

View File

@ -0,0 +1,37 @@
abcabcabcabcabcabcabcabcabcabc
abcabcabc
sdfggsdfgg
xywq
abcabcabcabcabcabcabcabcabcabcabcabc
sdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfgg
xywqxywqxywqxywq
plkfplkfplkfplkfplkf
abcabcabcabc
sdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfgg
xywqxywqxywqxywqxywqxywqxywqxywqxywq
plkfplkfplkfplkfplkfplkfplkf
abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc
sdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfgg
xywqxywqxywqxywqxywq
plkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkfplkf
abcabcabcabcabcabcabcabcabcabc
sdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfggsdfgg
xywqxywqxywqxywqxywqxywqxywqxywqxywqxywq
plkfplkfplkfplkfplkfplkfplkfplkfplkfplkf
abcabcabc
abcabc
abc
abcabcabcabcabcabcabcabcabcabcabcabc
abcabcabcabcabcabcabcabcabcabc
abcabcabcabc
abcabcabcabcabc
abcabcabcabc
abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc
abcabcabcabcabcabcabcabcabc
abcabcabcabcabcabcabc
abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc
abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc
abcabcabcabcabc
abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc

View File

@ -0,0 +1,24 @@
SELECT repeat('abc', 10);
DROP TABLE IF EXISTS defaults;
CREATE TABLE defaults
(
strings String,
u8 UInt8,
u16 UInt16,
u32 UInt32,
u64 UInt64
)ENGINE = Memory();
INSERT INTO defaults values ('abc', 3, 12, 4, 56) ('sdfgg', 2, 10, 21, 200) ('xywq', 1, 4, 9, 5) ('plkf', 0, 5, 7,77);
SELECT repeat(strings, u8) FROM defaults;
SELECT repeat(strings, u16) FROM defaults;
SELECT repeat(strings, u32) from defaults;
SELECT repeat(strings, u64) FROM defaults;
SELECT repeat(strings, 10) FROM defaults;
SELECT repeat('abc', u8) FROM defaults;
SELECT repeat('abc', u16) FROM defaults;
SELECT repeat('abc', u32) FROM defaults;
SELECT repeat('abc', u64) FROM defaults;
DROP TABLE defaults;