thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-24 02:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with return type

Browse Source
This commit is contained in:
alesapin 2020-05-22 13:09:24 +03:00
parent 59b3bc0c05
commit 98ffefd90c
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Interpreters/Context.cpp
View File

@ -1709,13 +1709,13 @@ StoragePolicyPtr Context::getStoragePolicy(const String & name) const
}
const std::map<String, DiskPtr> & Context::getDisksMap() const
std::map<String, DiskPtr> Context::getDisksMap() const
{
std::lock_guard lock(shared->storage_policies_mutex);
return getDiskSelector(lock)->getDisksMap();
}
const std::map<String, StoragePolicyPtr> & Context::getPoliciesMap() const
std::map<String, StoragePolicyPtr> Context::getPoliciesMap() const
{
std::lock_guard lock(shared->storage_policies_mutex);
return getStoragePolicySelector(lock)->getPoliciesMap();

4
src/Interpreters/Context.h
View File

@ -545,8 +545,8 @@ public:
/// Provides storage disks
DiskPtr getDisk(const String & name) const;
const std::map<String, StoragePolicyPtr> & getPoliciesMap() const;
const std::map<String, DiskPtr> & getDisksMap() const;
std::map<String, StoragePolicyPtr> getPoliciesMap() const;
std::map<String, DiskPtr> getDisksMap() const;
void updateStorageConfiguration(const Poco::Util::AbstractConfiguration & config);
/// Provides storage politics schemes

4
src/Storages/System/StorageSystemStoragePolicies.cpp
View File

@ -45,9 +45,7 @@ Pipes StorageSystemStoragePolicies::read(
MutableColumnPtr col_max_part_size = ColumnUInt64::create();
MutableColumnPtr col_move_factor = ColumnFloat32::create();
const auto & policies_map = context.getPoliciesMap();
for (const auto & [policy_name, policy_ptr] : policies_map)
for (const auto & [policy_name, policy_ptr] : context.getPoliciesMap())
{
const auto & volumes = policy_ptr->getVolumes();
for (size_t i = 0; i != volumes.size(); ++i)