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

Fixed typo [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-04-06 22:48:54 +03:00 committed by proller
parent 62ccbba0b7
commit a786e92a0f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3671,7 +3671,7 @@ void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
void StorageReplicatedMergeTree::removePartsFromZooKeeper(zkutil::ZooKeeperPtr & zookeeper, const Strings & part_names, void StorageReplicatedMergeTree::removePartsFromZooKeeper(zkutil::ZooKeeperPtr & zookeeper, const Strings & part_names,
NameSet * parts_should_be_retied) NameSet * parts_should_be_retried)
{ {
zkutil::Requests ops; zkutil::Requests ops;
auto it_first_node_in_batch = part_names.cbegin(); auto it_first_node_in_batch = part_names.cbegin();
@ -3702,9 +3702,9 @@ void StorageReplicatedMergeTree::removePartsFromZooKeeper(zkutil::ZooKeeperPtr &
{ {
LOG_DEBUG(log, "There is no part " << *it_in_batch << " in ZooKeeper, it was only in filesystem"); LOG_DEBUG(log, "There is no part " << *it_in_batch << " in ZooKeeper, it was only in filesystem");
} }
else if (parts_should_be_retied && zkutil::isHardwareError(cur_code)) else if (parts_should_be_retried && zkutil::isHardwareError(cur_code))
{ {
parts_should_be_retied->emplace(*it_in_batch); parts_should_be_retried->emplace(*it_in_batch);
} }
else if (cur_code) else if (cur_code)
{ {
@ -3712,10 +3712,10 @@ void StorageReplicatedMergeTree::removePartsFromZooKeeper(zkutil::ZooKeeperPtr &
} }
} }
} }
else if (parts_should_be_retied && zkutil::isHardwareError(code)) else if (parts_should_be_retried && zkutil::isHardwareError(code))
{ {
for (auto it_in_batch = it_first_node_in_batch; it_in_batch != it_next; ++it_in_batch) for (auto it_in_batch = it_first_node_in_batch; it_in_batch != it_next; ++it_in_batch)
parts_should_be_retied->emplace(*it_in_batch); parts_should_be_retried->emplace(*it_in_batch);
} }
else if (code) else if (code)
{ {

2
dbms/src/Storages/StorageReplicatedMergeTree.h
View File

@ -333,7 +333,7 @@ private:
/// Quickly removes big set of parts from ZooKeeper (using async multi queries) /// Quickly removes big set of parts from ZooKeeper (using async multi queries)
void removePartsFromZooKeeper(zkutil::ZooKeeperPtr & zookeeper, const Strings & part_names, void removePartsFromZooKeeper(zkutil::ZooKeeperPtr & zookeeper, const Strings & part_names,
NameSet * parts_should_be_retied = nullptr); NameSet * parts_should_be_retried = nullptr);
/// Removes a part from ZooKeeper and adds a task to the queue to download it. It is supposed to do this with broken parts. /// Removes a part from ZooKeeper and adds a task to the queue to download it. It is supposed to do this with broken parts.
void removePartAndEnqueueFetch(const String & part_name); void removePartAndEnqueueFetch(const String & part_name);