From e3ed311273f8c9905a658148f852b3c2188c4795 Mon Sep 17 00:00:00 2001 From: Vladimir Chebotarev Date: Sun, 1 Dec 2019 08:52:53 +0300 Subject: [PATCH] Fixed Clang build. --- dbms/src/Storages/MergeTree/MergeTreeData.cpp | 12 ++++++------ dbms/src/Storages/MergeTree/MergeTreeData.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dbms/src/Storages/MergeTree/MergeTreeData.cpp b/dbms/src/Storages/MergeTree/MergeTreeData.cpp index 4d659acc15a..fa3e9112297 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeData.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeData.cpp @@ -3214,26 +3214,26 @@ DiskSpace::ReservationPtr MergeTreeData::tryReserveSpaceInSpecificSpace(UInt64 e return space->reserve(expected_size); } -DiskSpace::SpacePtr MergeTreeData::TTLEntry::getDestination(const DiskSpace::StoragePolicyPtr & storage_policy) const +DiskSpace::SpacePtr MergeTreeData::TTLEntry::getDestination(const DiskSpace::StoragePolicyPtr & policy) const { if (destination_type == PartDestinationType::VOLUME) - return storage_policy->getVolumeByName(destination_name); + return policy->getVolumeByName(destination_name); else if (destination_type == PartDestinationType::DISK) - return storage_policy->getDiskByName(destination_name); + return policy->getDiskByName(destination_name); else return {}; } -bool MergeTreeData::TTLEntry::isPartInDestination(const DiskSpace::StoragePolicyPtr & storage_policy, const MergeTreeDataPart & part) const +bool MergeTreeData::TTLEntry::isPartInDestination(const DiskSpace::StoragePolicyPtr & policy, const MergeTreeDataPart & part) const { if (destination_type == PartDestinationType::VOLUME) { - for (const auto & disk : storage_policy->getVolumeByName(destination_name)->disks) + for (const auto & disk : policy->getVolumeByName(destination_name)->disks) if (disk->getName() == part.disk->getName()) return true; } else if (destination_type == PartDestinationType::DISK) - return storage_policy->getDiskByName(destination_name)->getName() == part.disk->getName(); + return policy->getDiskByName(destination_name)->getName() == part.disk->getName(); return false; } diff --git a/dbms/src/Storages/MergeTree/MergeTreeData.h b/dbms/src/Storages/MergeTree/MergeTreeData.h index 47093da2ccc..3525e38d2bc 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeData.h +++ b/dbms/src/Storages/MergeTree/MergeTreeData.h @@ -735,8 +735,8 @@ public: ASTPtr entry_ast; - DiskSpace::SpacePtr getDestination(const DiskSpace::StoragePolicyPtr & storage_policy) const; - bool isPartInDestination(const DiskSpace::StoragePolicyPtr & storage_policy, const MergeTreeDataPart & part) const; + DiskSpace::SpacePtr getDestination(const DiskSpace::StoragePolicyPtr & policy) const; + bool isPartInDestination(const DiskSpace::StoragePolicyPtr & policy, const MergeTreeDataPart & part) const; }; const TTLEntry * selectMoveDestination(const MergeTreeDataPart::TTLInfos & ttl_infos, time_t time_of_move) const;