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

Remove obsolete code. [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Vitaliy Lyudvichenko 2017-11-02 17:34:22 +03:00
parent 8aafa3b042
commit 9cf14d2c61
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/src/Storages/MergeTree/MergeTreeData.h
View File

@ -541,12 +541,7 @@ private:
/// Current set of data parts.
DataParts data_parts;
mutable std::mutex data_parts_mutex;
/// The set of all data parts including already merged but not yet deleted. Usually it is small (tens of elements).
/// The part is referenced from here, from the list of current parts and from each thread reading from it.
/// This means that if reference count is 1 - the part is not used right now and can be deleted.
// DataParts all_data_parts;
// mutable std::mutex all_data_parts_mutex;
// TODO: this mutex could be a bottleneck. If so, make it shared, and split parts onto partitions
/// Used to serialize calls to grabOldParts.
std::mutex grab_old_parts_mutex;

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

@ -538,10 +538,9 @@ void MergeTreeDataPart::remove() const
}
catch (const Poco::FileNotFoundException & e)
{
LOG_WARNING(storage.log, "Directory " << from << " (part to remove) doesn't exist or one of nested files has gone."
LOG_ERROR(storage.log, "Directory " << from << " (part to remove) doesn't exist or one of nested files has gone."
" Most likely this is due to manual removing. This should be discouraged. Ignoring.");
std::terminate();
return;
}