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

dbms: Cleanup [#METR-19266]

Browse Source
This commit is contained in:
Alexey Arno 2016-08-05 02:17:58 +03:00
parent 0bcda15bb5
commit 4500376dc8
2 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/Core/Block.h
View File

@ -80,7 +80,6 @@ public:
bool has(const std::string & name) const;
bool hasNullColumns(const ColumnNumbers & arguments) const;
bool hasNullableColumns(const ColumnNumbers & arguments) const;
bool supportsNullValues(const ColumnNumbers & arguments) const;
size_t getPositionByName(const std::string & name) const;
@ -119,7 +118,6 @@ public:
/// Returns a block in which all the nullable columns are replaced by
/// their non-nullable counterparts.
Block extractNonNullableBlock(const ColumnNumbers & arguments) const;
Block extractBlockWithoutNullValues(const ColumnNumbers & arguments) const;
/** Заменяет столбцы смещений внутри вложенных таблиц на один общий для таблицы.
* Кидает исключение, если эти смещения вдруг оказались неодинаковы.

53
dbms/src/Core/Block.cpp
View File

@ -273,19 +273,6 @@ bool Block::hasNullableColumns(const ColumnNumbers & arguments) const
}
bool Block::supportsNullValues(const ColumnNumbers & arguments) const
{
for (const auto & arg : arguments)
{
const auto & elem = unsafeGetByPosition(arg);
if (elem.column &&
(elem.column.get()->isNullable() || elem.column.get()->isNull()))
return true;
}
return false;
}
size_t Block::getPositionByName(const std::string & name) const
{
IndexByName_t::const_iterator it = index_by_name.find(name);
@ -428,46 +415,6 @@ Block Block::extractNonNullableBlock(const ColumnNumbers & arguments) const
}
Block Block::extractBlockWithoutNullValues(const ColumnNumbers & arguments) const
{
Block non_nullable_block;
non_nullable_block.reserve(columns());
ColumnNumbers args2 = arguments;
std::sort(args2.begin(), args2.end());
size_t pos = 0;
for (const auto & col_it : index_by_position)
{
const auto & col = *col_it;
bool found = std::binary_search(args2.begin(), args2.end(), pos) && col.column && col.type;
if (found && col.column.get()->isNullable())
{
auto nullable_col = static_cast<const ColumnNullable *>(col.column.get());
ColumnPtr nested_col = nullable_col->getNestedColumn();
auto nullable_type = static_cast<const DataTypeNullable *>(col.type.get());
DataTypePtr nested_type = nullable_type->getNestedType();
non_nullable_block.insert(pos, {nested_col, nested_type, col.name});
}
else if (found && col.column.get()->isNull())
{
ColumnPtr new_col = std::make_shared<ColumnConstUInt8>(rowsInFirstColumn(), UInt8());
DataTypePtr new_type = std::make_shared<DataTypeUInt8>();
non_nullable_block.insert(pos, {new_col, new_type, col.name});
}
else
non_nullable_block.insert(pos, col);
++pos;
}
return non_nullable_block;
}
ColumnsWithTypeAndName Block::getColumns() const
{
return ColumnsWithTypeAndName(data.begin(), data.end());