thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-13 09:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Nikolai Kochetov 2018-03-19 21:54:15 +03:00
parent 2fbe3d3749
commit 1f51f57ac3
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Dictionaries/ComplexKeyHashedDictionary.cpp
View File

@ -289,7 +289,7 @@ void ComplexKeyHashedDictionary::updateData()
for (const auto attribute_idx : ext::range(0, keys_size + attributes_size))
{
const IColumn & update_column = *block.getByPosition(attribute_idx).column.get();
MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->mutate();
MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->assumeMutable();
saved_column->insertRangeFrom(update_column, 0, update_column.size());
}
}
@ -300,7 +300,7 @@ void ComplexKeyHashedDictionary::updateData()
auto stream = source_ptr->loadUpdatedAll();
stream->readPrefix();
while (const auto block = stream->read())
while (auto block = stream->read())
{
const auto saved_key_column_ptrs = ext::map<Columns>(ext::range(0, keys_size), [&](const size_t key_idx)
{

4
dbms/src/Dictionaries/FlatDictionary.cpp
View File

@ -316,7 +316,7 @@ void FlatDictionary::updateData()
for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
{
const IColumn & update_column = *block.getByPosition(attribute_idx).column.get();
MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->mutate();
MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->assumeMutable();
saved_column->insertRangeFrom(update_column, 0, update_column.size());
}
}
@ -327,7 +327,7 @@ void FlatDictionary::updateData()
auto stream = source_ptr->loadUpdatedAll();
stream->readPrefix();
while (const auto block = stream->read())
while (auto block = stream->read())
{
const auto &saved_id_column = *saved_block->safeGetByPosition(0).column;
const auto &update_id_column = *block.safeGetByPosition(0).column;

4
dbms/src/Dictionaries/HashedDictionary.cpp
View File

@ -310,7 +310,7 @@ void HashedDictionary::updateData()
for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
{
const IColumn & update_column = *block.getByPosition(attribute_idx).column.get();
MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->mutate();
MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->assumeMutable();
saved_column->insertRangeFrom(update_column, 0, update_column.size());
}
}
@ -321,7 +321,7 @@ void HashedDictionary::updateData()
auto stream = source_ptr->loadUpdatedAll();
stream->readPrefix();
while (const auto block = stream->read())
while (auto block = stream->read())
{
const auto &saved_id_column = *saved_block->safeGetByPosition(0).column;
const auto &update_id_column = *block.safeGetByPosition(0).column;

2
dbms/src/Functions/IFunction.cpp
View File

@ -85,7 +85,7 @@ MutableColumnPtr wrapInNullable(MutableColumnPtr && src, Block & block, const Co
if (src_not_nullable->isColumnConst())
return ColumnNullable::create(src_not_nullable->convertToFullColumnIfConst(), std::move(result_null_map_column));
else
return ColumnNullable::create(src_not_nullable, std::move(result_null_map_column));
return ColumnNullable::create(std::move(src_not_nullable), std::move(result_null_map_column));
}

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

@ -245,7 +245,7 @@ static void convertColumnToNullable(ColumnWithTypeAndName & column)
{
column.type = makeNullable(column.type);
if (column.column)
column.column = makeNullable(column.column);
column.column = makeNullable(column.column->assumeMutable());
}

4
dbms/src/Storages/MergeTree/MergeTreeReader.cpp
View File

@ -481,9 +481,9 @@ void MergeTreeReader::fillMissingColumns(Block & res, const Names & ordered_name
size_t nested_rows = offsets_column->empty() ? 0
: typeid_cast<const ColumnUInt64 &>(*offsets_column).getData().back();
ColumnPtr nested_column = nested_type->createColumnConstWithDefaultValue(nested_rows)->convertToFullColumnIfConst();
auto nested_column = nested_type->createColumnConstWithDefaultValue(nested_rows)->convertToFullColumnIfConst();
column_to_add.column = ColumnArray::create(nested_column, offsets_column);
column_to_add.column = ColumnArray::create(std::move(nested_column), offsets_column);
}
else
{

2
dbms/src/Storages/StorageBuffer.cpp
View File

@ -183,7 +183,7 @@ static void appendBlock(const Block & from, Block & to)
{
ColumnPtr & col_to = to.getByPosition(column_no).column;
if (col_to->size() != old_rows)
col_to = col_to->mutate()->cut(0, old_rows);
col_to = (*std::move(col_to)).mutate()->cut(0, old_rows);
}
}
catch (...)