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

Fixed test [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-09-09 05:23:24 +03:00
parent 8497af1d7f
commit c7b1a40296
10 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,7 +317,7 @@ Columns Block::getColumns() const
}
MutableColumns Block::mutateColumns() const
MutableColumns Block::mutateColumns()
{
size_t num_columns = data.size();
MutableColumns columns(num_columns);

2
dbms/src/Core/Block.h
View File

@ -115,7 +115,7 @@ public:
MutableColumns cloneEmptyColumns() const;
/** Get columns from block for mutation. Columns in block will be nullptr. */
MutableColumns mutateColumns() const;
MutableColumns mutateColumns();
/** Replace columns in a block */
void setColumns(MutableColumns && columns);

8
dbms/src/DataStreams/SquashingBlockInputStream.cpp
View File

@ -4,9 +4,9 @@
namespace DB
{
SquashingBlockInputStream::SquashingBlockInputStream(const BlockInputStreamPtr & src,
size_t min_block_size_rows, size_t min_block_size_bytes)
: transform(min_block_size_rows, min_block_size_bytes)
SquashingBlockInputStream::SquashingBlockInputStream(
const BlockInputStreamPtr & src, size_t min_block_size_rows, size_t min_block_size_bytes)
: header(src->getHeader()), transform(min_block_size_rows, min_block_size_bytes)
{
children.emplace_back(src);
}
@ -25,7 +25,7 @@ Block SquashingBlockInputStream::readImpl()
SquashingTransform::Result result = transform.add(block.mutateColumns());
if (result.ready)
return block.cloneWithColumns(std::move(result.columns));
return header.cloneWithColumns(std::move(result.columns));
}
}

3
dbms/src/DataStreams/SquashingBlockInputStream.h
View File

@ -16,12 +16,13 @@ public:
String getName() const override { return "Squashing"; }
Block getHeader() const override { return children.at(0)->getHeader(); }
Block getHeader() const override { return header; }
protected:
Block readImpl() override;
private:
Block header;
SquashingTransform transform;
bool all_read = false;
};

2
dbms/src/DataStreams/SquashingBlockOutputStream.cpp
View File

@ -12,7 +12,7 @@ SquashingBlockOutputStream::SquashingBlockOutputStream(BlockOutputStreamPtr & ds
void SquashingBlockOutputStream::write(const Block & block)
{
SquashingTransform::Result result = transform.add(block.mutateColumns());
SquashingTransform::Result result = transform.add(Block(block).mutateColumns());
if (result.ready)
output->write(header.cloneWithColumns(std::move(result.columns)));
}

3
dbms/src/DataStreams/SquashingTransform.cpp
View File

@ -12,6 +12,7 @@ SquashingTransform::SquashingTransform(size_t min_block_size_rows, size_t min_bl
SquashingTransform::Result SquashingTransform::add(MutableColumns && columns)
{
/// End of input stream.
if (columns.empty())
return Result(std::move(accumulated_columns));
@ -22,7 +23,7 @@ SquashingTransform::Result SquashingTransform::add(MutableColumns && columns)
if (accumulated_columns.empty())
return Result(std::move(columns));
/// Return accumulated data (may be it has small size) and place new block to accumulated data.
/// Return accumulated data (maybe it has small size) and place new block to accumulated data.
columns.swap(accumulated_columns);
return Result(std::move(columns));
}

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

@ -289,7 +289,7 @@ void ComplexKeyHashedDictionary::updateData()
auto stream = source_ptr->loadUpdatedAll();
stream->readPrefix();
while (const auto block = stream->read())
while (Block block = stream->read())
{
const auto saved_key_column_ptrs = ext::map<Columns>(ext::range(0, keys_size), [&](const size_t key_idx)
{

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

@ -315,7 +315,7 @@ void FlatDictionary::updateData()
auto stream = source_ptr->loadUpdatedAll();
stream->readPrefix();
while (const auto block = stream->read())
while (Block 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/Dictionaries/HashedDictionary.cpp
View File

@ -307,7 +307,7 @@ void HashedDictionary::updateData()
auto stream = source_ptr->loadUpdatedAll();
stream->readPrefix();
while (const auto block = stream->read())
while (Block block = stream->read())
{
const auto &saved_id_column = *saved_block->safeGetByPosition(0).column;
const auto &update_id_column = *block.safeGetByPosition(0).column;

6
dbms/src/Interpreters/PartLog.cpp
View File

@ -18,14 +18,14 @@ namespace DB
Block PartLogElement::createBlock()
{
auto event_type_datatype = std::make_shared<DataTypeEnum8>(
DataTypeEnum8::Values{
DataTypeEnum8::Values
{
{"NEW_PART", static_cast<Int8>(NEW_PART)},
{"MERGE_PARTS", static_cast<Int8>(MERGE_PARTS)},
{"DOWNLOAD_PART", static_cast<Int8>(DOWNLOAD_PART)},
{"REMOVE_PART", static_cast<Int8>(REMOVE_PART)},
{"MUTATE_PART", static_cast<Int8>(MUTATE_PART)},
}
);
});
return
{