thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 13:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Less changes

Browse Source
This commit is contained in:
alesapin 2020-02-17 16:41:53 +03:00
parent 7d7fdb389d
commit 55192a652f
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,6 +463,7 @@ void MergeTreeDataPart::remove() const
LOG_ERROR(storage.log, "Cannot quickly remove directory " << to << " by removing files; fallback to recursive removal. Reason: "
<< getCurrentExceptionMessage(false));
to_dir.remove(true);
}
}

5
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
View File

@ -592,11 +592,6 @@ Names getPartNamesToMutate(
}
Names ReplicatedMergeTreeQueue::getCurrentPartNamesToMutate(ReplicatedMergeTreeMutationEntry & entry) const
{
return getPartNamesToMutate(entry, current_parts);
}
void ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, Coordination::WatchCallback watch_callback)
{
std::lock_guard lock(update_mutations_mutex);

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

@ -352,8 +352,6 @@ public:
/// Adds a subscriber
SubscriberHandler addSubscriber(SubscriberCallBack && callback);
Names getCurrentPartNamesToMutate(ReplicatedMergeTreeMutationEntry & entry) const;
struct Status
{
UInt32 future_parts;

2
dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
View File

@ -199,7 +199,6 @@ bool ReplicatedMergeTreeRestartingThread::tryStartup()
storage.mutations_updating_task->activateAndSchedule();
storage.mutations_finalizing_task->activateAndSchedule();
storage.cleanup_thread.start();
//storage.alter_thread.start();
storage.part_check_thread.start();
return true;
@ -346,7 +345,6 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown()
storage.mutations_finalizing_task->deactivate();
storage.cleanup_thread.stop();
//storage.alter_thread.stop();
storage.part_check_thread.stop();
LOG_TRACE(log, "Threads finished");