Merge pull request #21837 from Jokser/disk-cache-cleanup-directory-before-move

Cleanup destination directory during DiskCacheWrapper::moveFile()

src/Disks/DiskCacheWrapper.cpp

@@ -209,7 +209,13 @@ void DiskCacheWrapper::clearDirectory(const String & path)
 void DiskCacheWrapper::moveDirectory(const String & from_path, const String & to_path)
 {
     if (cache_disk->exists(from_path))
+    {
+        /// Destination directory may not be empty if previous directory move attempt was failed.
+        if (cache_disk->exists(to_path) && cache_disk->isDirectory(to_path))
+            cache_disk->clearDirectory(to_path);
+
         cache_disk->moveDirectory(from_path, to_path);
+    }
     DiskDecorator::moveDirectory(from_path, to_path);
 }
 

src/Storages/MergeTree/IMergeTreeDataPart.cpp

@@ -1013,7 +1013,7 @@ void IMergeTreeDataPart::renameTo(const String & new_relative_path, bool remove_
     }
 
     volume->getDisk()->setLastModified(from, Poco::Timestamp::fromEpochTime(time(nullptr)));
-    volume->getDisk()->moveFile(from, to);
+    volume->getDisk()->moveDirectory(from, to);
     relative_path = new_relative_path;
 
     SyncGuardPtr sync_guard;
@@ -1065,7 +1065,7 @@ void IMergeTreeDataPart::remove(bool keep_s3) const
 
     try
     {
-        volume->getDisk()->moveFile(from, to);
+        volume->getDisk()->moveDirectory(from, to);
     }
     catch (const Poco::FileNotFoundException &)
     {