thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-05 08:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

polymorphic parts (development)

Browse Source
This commit is contained in:
CurtizJ 2019-11-22 16:58:18 +03:00
parent 49982ad18c
commit 921d32485b
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/src/Storages/MergeTree/IMergeTreeReader.h
View File

@ -76,7 +76,6 @@ protected:
const MergeTreeData & storage;
MarkRanges all_mark_ranges;
friend class MergeTreeRangeReader::DelayedStream;
};

17
dbms/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
View File

@ -564,20 +564,15 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
all_columns, data.sorting_key_expr, data.skip_indices,
data.merging_params, gathering_columns, gathering_column_names, merging_columns, merging_column_names);
size_t total_bytes = 0;
size_t total_rows = 0;
for (const auto & part : future_part.parts)
{
total_bytes += part->bytes_on_disk;
total_rows += part->rows_count;
}
MergeTreeData::MutableDataPartPtr new_data_part = data.createPart(
future_part.name, future_part.part_info,
future_part.name,
future_part.part_info,
space_reservation->getDisk(),
total_bytes, total_rows,
merge_entry->total_size_bytes_compressed,
merge_entry->total_rows_count,
TMP_PREFIX + future_part.name);
new_data_part->setColumns(all_columns);
new_data_part->partition.assign(future_part.getPartition());
new_data_part->is_temp = true;
@ -964,7 +959,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
future_part.name, source_part->getType(),
future_part.part_info, space_reservation->getDisk(),
"tmp_mut_" + future_part.name);
new_data_part->is_temp = true;
new_data_part->ttl_infos = source_part->ttl_infos;
new_data_part->index_granularity_info = source_part->index_granularity_info;

1
dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp
View File

@ -265,6 +265,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
auto compression_codec = data.global_context.chooseCompressionCodec(0, 0);
NamesAndTypesList columns = data.getColumns().getAllPhysical().filter(block.getNames());
new_data_part->setColumns(columns);
MergedBlockOutputStream out(new_data_part, columns, compression_codec);