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

Fixed error #2863

Browse Source
This commit is contained in:
Alexey Milovidov 2018-10-23 11:19:47 +03:00
parent b8cfa77ea0
commit bac6b6f381
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
View File

@ -23,7 +23,7 @@ public:
* max_blocks_number_to_read - if not nullptr, do not read all the parts whose right border is greater than max_block in partition. * max_blocks_number_to_read - if not nullptr, do not read all the parts whose right border is greater than max_block in partition.
*/ */
using PartitionIdToMaxBlock = std::unordered_map<String, Int64>; using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
BlockInputStreams read( BlockInputStreams read(
const Names & column_names, const Names & column_names,
const SelectQueryInfo & query_info, const SelectQueryInfo & query_info,

4
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -2675,7 +2675,7 @@ void StorageReplicatedMergeTree::updateQuorum(const String & part_name)
Coordination::Requests ops; Coordination::Requests ops;
Coordination::Responses responses; Coordination::Responses responses;
Coordination::Stat added_parts_stat; Coordination::Stat added_parts_stat;
String old_added_parts = zookeeper->get(quorum_last_part_path, &added_parts_stat); String old_added_parts = zookeeper->get(quorum_last_part_path, &added_parts_stat);
@ -2686,7 +2686,7 @@ void StorageReplicatedMergeTree::updateQuorum(const String & part_name)
auto part_info = MergeTreePartInfo::fromPartName(part_name, data.format_version); auto part_info = MergeTreePartInfo::fromPartName(part_name, data.format_version);
parts_with_quorum.added_parts[part_info.partition_id] = part_name; parts_with_quorum.added_parts[part_info.partition_id] = part_name;
String new_added_parts = parts_with_quorum.toString(); String new_added_parts = parts_with_quorum.toString();
ops.emplace_back(zkutil::makeRemoveRequest(quorum_status_path, stat.version)); ops.emplace_back(zkutil::makeRemoveRequest(quorum_status_path, stat.version));