thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yandex/ClickHouse

Browse Source
This commit is contained in:
alesapin 2019-07-24 14:10:46 +03:00
commit ba988735cc
5 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dbms/src/Columns/ColumnLowCardinality.cpp
View File

@ -352,6 +352,11 @@ ColumnPtr ColumnLowCardinality::countKeys() const
return counter;
}
bool ColumnLowCardinality::containsNull() const
{
return getDictionary().nestedColumnIsNullable() && idx.containsDefault();
}
ColumnLowCardinality::Index::Index() : positions(ColumnUInt8::create()), size_of_type(sizeof(UInt8)) {}
@ -605,6 +610,28 @@ void ColumnLowCardinality::Index::countKeys(ColumnUInt64::Container & counts) co
callForType(std::move(counter), size_of_type);
}
bool ColumnLowCardinality::Index::containsDefault() const
{
bool contains = false;
auto check_contains_default = [&](auto x)
{
using CurIndexType = decltype(x);
auto & data = getPositionsData<CurIndexType>();
for (auto pos : data)
{
if (pos == 0)
{
contains = true;
break;
}
}
};
callForType(std::move(check_contains_default), size_of_type);
return contains;
}
ColumnLowCardinality::Dictionary::Dictionary(MutableColumnPtr && column_unique_, bool is_shared)
: column_unique(std::move(column_unique_)), shared(is_shared)

4
dbms/src/Columns/ColumnLowCardinality.h
View File

@ -194,6 +194,8 @@ public:
ColumnPtr countKeys() const;
bool containsNull() const;
class Index
{
public:
@ -224,6 +226,8 @@ public:
void countKeys(ColumnUInt64::Container & counts) const;
bool containsDefault() const;
private:
WrappedPtr positions;
size_t size_of_type = 0;

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

@ -1896,11 +1896,17 @@ private:
};
}
auto wrapper = prepareRemoveNullable(from_nested, to_nested);
bool skip_not_null_check = false;
if (from_low_cardinality && from_nested->isNullable() && !to_nested->isNullable())
/// Disable check for dictionary. Will check that column doesn't contain NULL in wrapper below.
skip_not_null_check = true;
auto wrapper = prepareRemoveNullable(from_nested, to_nested, skip_not_null_check);
if (!from_low_cardinality && !to_low_cardinality)
return wrapper;
return [wrapper, from_low_cardinality, to_low_cardinality]
return [wrapper, from_low_cardinality, to_low_cardinality, skip_not_null_check]
(Block & block, const ColumnNumbers & arguments, const size_t result, size_t input_rows_count)
{
auto & arg = block.getByPosition(arguments[0]);
@ -1925,6 +1931,11 @@ private:
if (from_low_cardinality)
{
auto * col_low_cardinality = typeid_cast<const ColumnLowCardinality *>(prev_arg_col.get());
if (skip_not_null_check && col_low_cardinality->containsNull())
throw Exception{"Cannot convert NULL value to non-Nullable type",
ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN};
arg.column = col_low_cardinality->getDictionary().getNestedColumn();
arg.type = from_low_cardinality->getDictionaryType();
@ -1966,7 +1977,7 @@ private:
};
}
WrapperType prepareRemoveNullable(const DataTypePtr & from_type, const DataTypePtr & to_type) const
WrapperType prepareRemoveNullable(const DataTypePtr & from_type, const DataTypePtr & to_type, bool skip_not_null_check) const
{
/// Determine whether pre-processing and/or post-processing must take place during conversion.
@ -2007,19 +2018,23 @@ private:
{
/// Conversion from Nullable to non-Nullable.
return [wrapper] (Block & block, const ColumnNumbers & arguments, const size_t result, size_t input_rows_count)
return [wrapper, skip_not_null_check] (Block & block, const ColumnNumbers & arguments, const size_t result, size_t input_rows_count)
{
Block tmp_block = createBlockWithNestedColumns(block, arguments, result);
/// Check that all values are not-NULL.
/// Check can be skipped in case if LowCardinality dictionary is transformed.
/// In that case, correctness will be checked beforehand.
if (!skip_not_null_check)
{
const auto & col = block.getByPosition(arguments[0]).column;
const auto & nullable_col = static_cast<const ColumnNullable &>(*col);
const auto & null_map = nullable_col.getNullMapData();
const auto & col = block.getByPosition(arguments[0]).column;
const auto & nullable_col = static_cast<const ColumnNullable &>(*col);
const auto & null_map = nullable_col.getNullMapData();
if (!memoryIsZero(null_map.data(), null_map.size()))
throw Exception{"Cannot convert NULL value to non-Nullable type",
ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN};
if (!memoryIsZero(null_map.data(), null_map.size()))
throw Exception{"Cannot convert NULL value to non-Nullable type",
ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN};
}
wrapper(tmp_block, arguments, result, input_rows_count);
block.getByPosition(result).column = tmp_block.getByPosition(result).column;

4
dbms/tests/queries/0_stateless/00974_low_cardinality_cast.reference Normal file
View File

@ -0,0 +1,4 @@
Hello
\N
Hello
Hello

6
dbms/tests/queries/0_stateless/00974_low_cardinality_cast.sql Normal file
View File

@ -0,0 +1,6 @@
SELECT CAST('Hello' AS LowCardinality(Nullable(String)));
SELECT CAST(Null AS LowCardinality(Nullable(String)));
SELECT CAST(CAST('Hello' AS LowCardinality(Nullable(String))) AS String);
SELECT CAST(CAST(Null AS LowCardinality(Nullable(String))) AS String); -- { serverError 349 }
SELECT CAST(CAST('Hello' AS Nullable(String)) AS String);
SELECT CAST(CAST(Null AS Nullable(String)) AS String); -- { serverError 349 }