From ee21fde3fe270792b9e1aa725e41cf5b31461385 Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Thu, 23 Jul 2020 01:05:45 +0300
Subject: [PATCH] Review fixes.

---
 src/Disks/IVolume.cpp     | 4 ++--
 src/Disks/IVolume.h       | 2 +-
 src/Disks/VolumeJBOD.cpp  | 3 ++-
 src/Disks/VolumeRAID1.cpp | 3 ++-
 src/Disks/VolumeRAID1.h   | 1 -
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Disks/IVolume.cpp b/src/Disks/IVolume.cpp
index 48e6fbac936..e67ac9963e9 100644
--- a/src/Disks/IVolume.cpp
+++ b/src/Disks/IVolume.cpp
@@ -81,9 +81,9 @@ Disks MultiDiskReservation::getDisks() const
 {
     Disks res;
     res.reserve(reservations.size());
-    for (const auto &r: reservations)
+    for (const auto & reservation : reservations)
     {
-        res.push_back(r->getDisk());
+        res.push_back(reservation->getDisk());
     }
     return res;
 }
diff --git a/src/Disks/IVolume.h b/src/Disks/IVolume.h
index 88f3e5226b2..4033ba1e543 100644
--- a/src/Disks/IVolume.h
+++ b/src/Disks/IVolume.h
@@ -67,7 +67,7 @@ protected:
 class MultiDiskReservation : public IReservation
 {
 public:
-    MultiDiskReservation(Reservations &reservations, UInt64 size);
+    MultiDiskReservation(Reservations & reservations, UInt64 size);
 
     UInt64 getSize() const override { return size; }
 
diff --git a/src/Disks/VolumeJBOD.cpp b/src/Disks/VolumeJBOD.cpp
index 7312f3d2365..6c0d9ec0a89 100644
--- a/src/Disks/VolumeJBOD.cpp
+++ b/src/Disks/VolumeJBOD.cpp
@@ -64,7 +64,8 @@ DiskPtr VolumeJBOD::getNextDisk()
 
 ReservationPtr VolumeJBOD::reserve(UInt64 bytes)
 {
-    /// This volume can not store files which size greater than max_data_part_size
+    /// This volume can not store data which size is greater than `max_data_part_size`
+    /// to ensure that parts of size greater than that go to another volume(s).
 
     if (max_data_part_size != 0 && bytes > max_data_part_size)
         return {};
diff --git a/src/Disks/VolumeRAID1.cpp b/src/Disks/VolumeRAID1.cpp
index 764bea8e68a..6d30c6bb0bd 100644
--- a/src/Disks/VolumeRAID1.cpp
+++ b/src/Disks/VolumeRAID1.cpp
@@ -8,7 +8,8 @@ namespace DB
 
 ReservationPtr VolumeRAID1::reserve(UInt64 bytes)
 {
-    /// This volume can not store files which size greater than max_data_part_size
+    /// This volume can not store data which size is greater than `max_data_part_size`
+    /// to ensure that parts of size greater than that go to another volume(s).
 
     if (max_data_part_size != 0 && bytes > max_data_part_size)
         return {};
diff --git a/src/Disks/VolumeRAID1.h b/src/Disks/VolumeRAID1.h
index 4452928445a..92d2b0267bf 100644
--- a/src/Disks/VolumeRAID1.h
+++ b/src/Disks/VolumeRAID1.h
@@ -8,7 +8,6 @@ namespace DB
 
 class VolumeRAID1 : public VolumeJBOD
 {
-    friend VolumePtr createVolumeFromReservation(const ReservationPtr & reservation, VolumePtr other_volume);
 public:
     VolumeRAID1(String name_, Disks disks_, UInt64 max_data_part_size_)
         : VolumeJBOD(name_, disks_, max_data_part_size_)