diff --git a/dbms/src/Storages/MergeTree/MergeTreeData.cpp b/dbms/src/Storages/MergeTree/MergeTreeData.cpp index 15f8d4102d1ff6cf190eefd2549e1fd0626ed14d..71ad956a9cb57f7c1bf6eddc2ac1f17c73a3b7ea 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeData.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeData.cpp @@ -3124,7 +3124,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const namespace { -inline DiskSpace::ReservationPtr checkAndReturnReservation(UInt64 expected_size, ReservationPtr reservation) +inline ReservationPtr checkAndReturnReservation(UInt64 expected_size, ReservationPtr reservation) { if (reservation) return reservation; @@ -3135,7 +3135,7 @@ inline DiskSpace::ReservationPtr checkAndReturnReservation(UInt64 expected_size, } -DiskSpace::ReservationPtr MergeTreeData::reserveSpace(UInt64 expected_size) const +ReservationPtr MergeTreeData::reserveSpace(UInt64 expected_size) const { expected_size = std::max(RESERVATION_MIN_ESTIMATION_SIZE, expected_size); @@ -3144,7 +3144,7 @@ DiskSpace::ReservationPtr MergeTreeData::reserveSpace(UInt64 expected_size) cons return checkAndReturnReservation(expected_size, std::move(reservation)); } -DiskSpace::ReservationPtr MergeTreeData::reserveSpace(UInt64 expected_size, DiskSpace::SpacePtr space) const +ReservationPtr MergeTreeData::reserveSpace(UInt64 expected_size, SpacePtr space) const { expected_size = std::max(RESERVATION_MIN_ESTIMATION_SIZE, expected_size); @@ -3153,36 +3153,36 @@ DiskSpace::ReservationPtr MergeTreeData::reserveSpace(UInt64 expected_size, Disk return checkAndReturnReservation(expected_size, std::move(reservation)); } -DiskSpace::ReservationPtr MergeTreeData::tryReserveSpace(UInt64 expected_size, DiskSpace::SpacePtr space) const +ReservationPtr MergeTreeData::tryReserveSpace(UInt64 expected_size, SpacePtr space) const { expected_size = std::max(RESERVATION_MIN_ESTIMATION_SIZE, expected_size); return space->reserve(expected_size); } -DiskSpace::ReservationPtr MergeTreeData::reserveSpacePreferringTTLRules(UInt64 expected_size, +ReservationPtr MergeTreeData::reserveSpacePreferringTTLRules(UInt64 expected_size, const MergeTreeDataPart::TTLInfos & ttl_infos, time_t time_of_move) const { expected_size = std::max(RESERVATION_MIN_ESTIMATION_SIZE, expected_size); - DiskSpace::ReservationPtr reservation = tryReserveSpacePreferringTTLRules(expected_size, ttl_infos, time_of_move); + ReservationPtr reservation = tryReserveSpacePreferringTTLRules(expected_size, ttl_infos, time_of_move); return checkAndReturnReservation(expected_size, std::move(reservation)); } -DiskSpace::ReservationPtr MergeTreeData::tryReserveSpacePreferringTTLRules(UInt64 expected_size, +ReservationPtr MergeTreeData::tryReserveSpacePreferringTTLRules(UInt64 expected_size, const MergeTreeDataPart::TTLInfos & ttl_infos, time_t time_of_move) const { expected_size = std::max(RESERVATION_MIN_ESTIMATION_SIZE, expected_size); - DiskSpace::ReservationPtr reservation; + ReservationPtr reservation; auto ttl_entry = selectTTLEntryForTTLInfos(ttl_infos, time_of_move); if (ttl_entry != nullptr) { - DiskSpace::SpacePtr destination_ptr = ttl_entry->getDestination(storage_policy); + SpacePtr destination_ptr = ttl_entry->getDestination(storage_policy); if (!destination_ptr) { if (ttl_entry->destination_type == PartDestinationType::VOLUME) @@ -3207,7 +3207,7 @@ DiskSpace::ReservationPtr MergeTreeData::tryReserveSpacePreferringTTLRules(UInt6 return reservation; } -DiskSpace::SpacePtr MergeTreeData::TTLEntry::getDestination(const DiskSpace::StoragePolicyPtr & policy) const +SpacePtr MergeTreeData::TTLEntry::getDestination(const StoragePolicyPtr & policy) const { if (destination_type == PartDestinationType::VOLUME) return policy->getVolumeByName(destination_name); @@ -3217,7 +3217,7 @@ DiskSpace::SpacePtr MergeTreeData::TTLEntry::getDestination(const DiskSpace::Sto return {}; } -bool MergeTreeData::TTLEntry::isPartInDestination(const DiskSpace::StoragePolicyPtr & policy, const MergeTreeDataPart & part) const +bool MergeTreeData::TTLEntry::isPartInDestination(const StoragePolicyPtr & policy, const MergeTreeDataPart & part) const { if (destination_type == PartDestinationType::VOLUME) { diff --git a/dbms/src/Storages/MergeTree/MergeTreeData.h b/dbms/src/Storages/MergeTree/MergeTreeData.h index c6ab01da72e95f2a979b0bb8bc9aebeb2a0d0a27..248be299fa3389d46a489a74e3498b40c088b50c 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeData.h +++ b/dbms/src/Storages/MergeTree/MergeTreeData.h @@ -1,7 +1,6 @@ #pragma once #include -#include #include #include #include @@ -679,14 +678,14 @@ public: ReservationPtr reserveSpace(UInt64 expected_size) const; /// Reserves space at least 1MB on specific disk or volume. - DiskSpace::ReservationPtr reserveSpace(UInt64 expected_size, DiskSpace::SpacePtr space) const; - DiskSpace::ReservationPtr tryReserveSpace(UInt64 expected_size, DiskSpace::SpacePtr space) const; + ReservationPtr reserveSpace(UInt64 expected_size, SpacePtr space) const; + ReservationPtr tryReserveSpace(UInt64 expected_size, SpacePtr space) const; /// Reserves space at least 1MB preferring best destination according to `ttl_infos`. - DiskSpace::ReservationPtr reserveSpacePreferringTTLRules(UInt64 expected_size, + ReservationPtr reserveSpacePreferringTTLRules(UInt64 expected_size, const MergeTreeDataPart::TTLInfos & ttl_infos, time_t time_of_move) const; - DiskSpace::ReservationPtr tryReserveSpacePreferringTTLRules(UInt64 expected_size, + ReservationPtr tryReserveSpacePreferringTTLRules(UInt64 expected_size, const MergeTreeDataPart::TTLInfos & ttl_infos, time_t time_of_move) const; /// Choose disk with max available free space @@ -740,10 +739,10 @@ public: ASTPtr entry_ast; /// Returns destination disk or volume for this rule. - DiskSpace::SpacePtr getDestination(const DiskSpace::StoragePolicyPtr & policy) const; + SpacePtr getDestination(const StoragePolicyPtr & policy) const; /// Checks if given part already belongs destination disk or volume for this rule. - bool isPartInDestination(const DiskSpace::StoragePolicyPtr & policy, const MergeTreeDataPart & part) const; + bool isPartInDestination(const StoragePolicyPtr & policy, const MergeTreeDataPart & part) const; }; const TTLEntry * selectTTLEntryForTTLInfos(const MergeTreeDataPart::TTLInfos & ttl_infos, time_t time_of_move) const; diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp index 155e77a9d3149308e5e66c8edef2c6db14454e64..1c8e2e5621abdcc7b5ad175581d8aafe6a3d0f08 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp @@ -228,7 +228,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa for (const auto & ttl_entry : data.move_ttl_entries) updateTTL(ttl_entry, move_ttl_infos, move_ttl_infos.moves_ttl[ttl_entry.result_column], block, false); - DiskSpace::ReservationPtr reservation = data.reserveSpacePreferringTTLRules(expected_size, move_ttl_infos, time(nullptr)); + ReservationPtr reservation = data.reserveSpacePreferringTTLRules(expected_size, move_ttl_infos, time(nullptr)); MergeTreeData::MutableDataPartPtr new_data_part = std::make_shared(data, reservation->getDisk(), part_name, new_part_info); diff --git a/dbms/src/Storages/MergeTree/MergeTreePartsMover.cpp b/dbms/src/Storages/MergeTree/MergeTreePartsMover.cpp index 7e07a1e45797c373bf531bc84cbe030eafbadc99..7fe7b01cd922fb9ae855c781fec6de9ea649577d 100644 --- a/dbms/src/Storages/MergeTree/MergeTreePartsMover.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreePartsMover.cpp @@ -125,7 +125,7 @@ bool MergeTreePartsMover::selectPartsForMove( const MergeTreeData::TTLEntry * ttl_entry_ptr = part->storage.selectTTLEntryForTTLInfos(part->ttl_infos, time_of_move); auto to_insert = need_to_move.find(part->disk); - DiskSpace::ReservationPtr reservation; + ReservationPtr reservation; if (ttl_entry_ptr) { auto destination = ttl_entry_ptr->getDestination(policy);