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

Fix LowCardinality conversions for defaults.

Browse Source
This commit is contained in:
Nikolai Kochetov 2018-08-08 19:05:50 +03:00
parent f1c05a2192
commit c339313d8b
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dbms/src/Functions/FunctionsConversion.h
View File

@ -730,6 +730,7 @@ public:
bool useDefaultImplementationForConstants() const override { return true; }
ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
bool canBeExecutedOnDefaultArguments() const override { return false; }
void executeImpl(Block & block, const ColumnNumbers & arguments, size_t result, size_t input_rows_count) override
{
@ -1610,6 +1611,8 @@ private:
auto & res = block.getByPosition(result);
ColumnPtr res_indexes;
/// For some types default can't be casted (for example, String to Int). In that case convert column to full.
bool src_converted_to_full_column = false;
{
/// Replace argument and result columns (and types) to dictionary key columns (and types).
@ -1620,18 +1623,24 @@ private:
auto tmp_rows_count = input_rows_count;
if (to_with_dict)
res.type = to_with_dict->getDictionaryType();
if (from_with_dict)
{
auto * col_with_dict = typeid_cast<const ColumnWithDictionary *>(prev_arg_col.get());
arg.column = col_with_dict->getDictionary().getNestedColumn();
arg.type = from_with_dict->getDictionaryType();
tmp_rows_count = arg.column->size();
res_indexes = col_with_dict->getIndexesPtr();
}
/// TODO: Make map with defaults conversion.
src_converted_to_full_column = !removeNullable(arg.type)->equals(*removeNullable(res.type));
if (src_converted_to_full_column)
arg.column = arg.column->index(col_with_dict->getIndexes(), 0);
else
res_indexes = col_with_dict->getIndexesPtr();
if (to_with_dict)
res.type = to_with_dict->getDictionaryType();
tmp_rows_count = arg.column->size();
}
/// Perform the requested conversion.
wrapper(block, arguments, result, tmp_rows_count);
@ -1646,7 +1655,7 @@ private:
auto res_column = to_with_dict->createColumn();
auto * col_with_dict = typeid_cast<ColumnWithDictionary *>(res_column.get());
if (from_with_dict)
if (from_with_dict && !src_converted_to_full_column)
{
auto res_keys = std::move(res.column);
col_with_dict->insertRangeFromDictionaryEncodedColumn(*res_keys, *res_indexes);
@ -1656,7 +1665,7 @@ private:
res.column = std::move(res_column);
}
else
else if (!src_converted_to_full_column)
res.column = res.column->index(*res_indexes, 0);
};
}

2
dbms/src/Interpreters/ExpressionJIT.cpp
View File

@ -476,7 +476,7 @@ public:
PreparedFunctionPtr prepare(const Block &) const override { return std::make_shared<LLVMPreparedFunction>(name, context); }
bool isDeterministic() override
bool isDeterministic() const override
{
for (const auto & f : originals)
if (!f->isDeterministic())