File movement

programs/client/Client.cpp

@@ -87,7 +87,7 @@
 #include <Common/UTF8Helpers.h>
 #include <Common/ProgressBar.h>
 #include <filesystem>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config_version.h>

src/Common/Config/ConfigReloader.cpp

@@ -5,7 +5,7 @@
 #include <Common/setThreadName.h>
 #include "ConfigProcessor.h"
 #include <filesystem>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 
 
 namespace fs = std::filesystem;

src/Common/FileSystemHelpers.cpp

@@ -1,87 +0,0 @@
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <utime.h>
-#include <Common/ErrorCodes.h>
-#include <Common/Exception.h>
-#include <Poco/Timestamp.h>
-#include <Common/FileSystemHelpers.h>
-
-namespace DB
-{
-namespace ErrorCodes
-{
-extern const int PATH_ACCESS_DENIED;
-extern const int CANNOT_CREATE_FILE;
-}
-}
-
-namespace FS
-{
-
-/// Copy from Poco::createFile
-bool createFile(const std::string & path)
-{
-    int n = open(path.c_str(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-    if (n != -1)
-    {
-        close(n);
-        return true;
-    }
-    DB::throwFromErrnoWithPath("Cannot create file: " + path, path, DB::ErrorCodes::CANNOT_CREATE_FILE);
-}
-
-bool canRead(const std::string & path)
-{
-    struct stat st;
-    if (stat(path.c_str(), &st) == 0)
-    {
-        if (st.st_uid == geteuid())
-            return (st.st_mode & S_IRUSR) != 0;
-        else if (st.st_gid == getegid())
-            return (st.st_mode & S_IRGRP) != 0;
-        else
-            return (st.st_mode & S_IROTH) != 0 || geteuid() == 0;
-    }
-    DB::throwFromErrnoWithPath("Cannot check read access to file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
-}
-
-
-bool canWrite(const std::string & path)
-{
-    struct stat st;
-    if (stat(path.c_str(), &st) == 0)
-    {
-        if (st.st_uid == geteuid())
-            return (st.st_mode & S_IWUSR) != 0;
-        else if (st.st_gid == getegid())
-            return (st.st_mode & S_IWGRP) != 0;
-        else
-            return (st.st_mode & S_IWOTH) != 0 || geteuid() == 0;
-    }
-    DB::throwFromErrnoWithPath("Cannot check write access to file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
-}
-
-time_t getModificationTime(const std::string & path)
-{
-    struct stat st;
-    if (stat(path.c_str(), &st) == 0)
-        return st.st_mtime;
-    DB::throwFromErrnoWithPath("Cannot check modification time for file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
-}
-
-Poco::Timestamp getModificationTimestamp(const std::string & path)
-{
-    return Poco::Timestamp::fromEpochTime(getModificationTime(path));
-}
-
-void setModificationTime(const std::string & path, time_t time)
-{
-    struct utimbuf tb;
-    tb.actime  = time;
-    tb.modtime = time;
-    if (utime(path.c_str(), &tb) != 0)
-        DB::throwFromErrnoWithPath("Cannot set modification time for file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
-}
-}

src/Common/FileSystemHelpers.h

@@ -1,14 +0,0 @@
-#pragma once
-#include <string>
-
-namespace FS
-{
-bool createFile(const std::string & path);
-
-bool canRead(const std::string & path);
-bool canWrite(const std::string & path);
-
-time_t getModificationTime(const std::string & path);
-Poco::Timestamp getModificationTimestamp(const std::string & path);
-void setModificationTime(const std::string & path, time_t time);
-}

src/Common/FileUpdatesTracker.h

@@ -3,7 +3,7 @@
 #include <Poco/Timestamp.h>
 #include <string>
 #include <filesystem>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 
 namespace fs = std::filesystem;
 

src/Common/filesystemHelpers.cpp

@@ -7,7 +7,13 @@
 #endif
 #include <cerrno>
 #include <Poco/Version.h>
+#include <Poco/Timestamp.h>
 #include <filesystem>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <utime.h>
 
 namespace fs = std::filesystem;
 
@@ -21,6 +27,7 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
     extern const int CANNOT_STATVFS;
     extern const int PATH_ACCESS_DENIED;
+    extern const int CANNOT_CREATE_FILE;
 }
 
 
@@ -125,3 +132,73 @@ bool pathStartsWith(const String & path, const String & prefix_path)
 }
 
 }
+
+
+/// Copied from Poco::File
+namespace FS
+{
+
+bool createFile(const std::string & path)
+{
+    int n = open(path.c_str(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+    if (n != -1)
+    {
+        close(n);
+        return true;
+    }
+    DB::throwFromErrnoWithPath("Cannot create file: " + path, path, DB::ErrorCodes::CANNOT_CREATE_FILE);
+}
+
+bool canRead(const std::string & path)
+{
+    struct stat st;
+    if (stat(path.c_str(), &st) == 0)
+    {
+        if (st.st_uid == geteuid())
+            return (st.st_mode & S_IRUSR) != 0;
+        else if (st.st_gid == getegid())
+            return (st.st_mode & S_IRGRP) != 0;
+        else
+            return (st.st_mode & S_IROTH) != 0 || geteuid() == 0;
+    }
+    DB::throwFromErrnoWithPath("Cannot check read access to file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
+}
+
+
+bool canWrite(const std::string & path)
+{
+    struct stat st;
+    if (stat(path.c_str(), &st) == 0)
+    {
+        if (st.st_uid == geteuid())
+            return (st.st_mode & S_IWUSR) != 0;
+        else if (st.st_gid == getegid())
+            return (st.st_mode & S_IWGRP) != 0;
+        else
+            return (st.st_mode & S_IWOTH) != 0 || geteuid() == 0;
+    }
+    DB::throwFromErrnoWithPath("Cannot check write access to file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
+}
+
+time_t getModificationTime(const std::string & path)
+{
+    struct stat st;
+    if (stat(path.c_str(), &st) == 0)
+        return st.st_mtime;
+    DB::throwFromErrnoWithPath("Cannot check modification time for file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
+}
+
+Poco::Timestamp getModificationTimestamp(const std::string & path)
+{
+    return Poco::Timestamp::fromEpochTime(getModificationTime(path));
+}
+
+void setModificationTime(const std::string & path, time_t time)
+{
+    struct utimbuf tb;
+    tb.actime  = time;
+    tb.modtime = time;
+    if (utime(path.c_str(), &tb) != 0)
+        DB::throwFromErrnoWithPath("Cannot set modification time for file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
+}
+}

src/Common/filesystemHelpers.h

@@ -36,3 +36,15 @@ bool pathStartsWith(const std::filesystem::path & path, const std::filesystem::p
 bool pathStartsWith(const String & path, const String & prefix_path);
 
 }
+
+namespace FS
+{
+bool createFile(const std::string & path);
+
+bool canRead(const std::string & path);
+bool canWrite(const std::string & path);
+
+time_t getModificationTime(const std::string & path);
+Poco::Timestamp getModificationTimestamp(const std::string & path);
+void setModificationTime(const std::string & path, time_t time);
+}

src/Databases/DatabaseOnDisk.cpp

@@ -19,7 +19,7 @@
 #include <Databases/DatabaseAtomic.h>
 #include <Common/assert_cast.h>
 #include <filesystem>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 
 namespace fs = std::filesystem;
 

src/Databases/MySQL/DatabaseConnectionMySQL.cpp

@@ -25,7 +25,7 @@
 #    include <Common/parseAddress.h>
 #    include <Common/setThreadName.h>
 #    include <filesystem>
-#    include <Common/FileSystemHelpers.h>
+#    include <Common/filesystemHelpers.h>
 
 namespace fs = std::filesystem;
 

src/Databases/PostgreSQL/DatabasePostgreSQL.cpp

@@ -14,7 +14,7 @@
 #include <Common/escapeForFileName.h>
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 #include <Common/quoteString.h>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;

src/Dictionaries/FileDictionarySource.cpp

@@ -10,7 +10,7 @@
 #include "DictionaryStructure.h"
 #include "registerDictionaries.h"
 #include "DictionarySourceHelpers.h"
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 
 
 namespace fs = std::filesystem;

src/Disks/DiskLocal.cpp

@@ -7,7 +7,7 @@
 #include <Common/filesystemHelpers.h>
 #include <Common/quoteString.h>
 #include <IO/createReadBufferFromFileBase.h>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 
 #include <fstream>
 #include <unistd.h>

src/Disks/IDiskRemote.cpp

@@ -11,7 +11,7 @@
 #include <common/logger_useful.h>
 #include <Common/checkStackSize.h>
 #include <boost/algorithm/string.hpp>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 
 
 namespace DB

src/Interpreters/DatabaseCatalog.cpp

@@ -17,7 +17,7 @@
 #include <common/logger_useful.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <filesystem>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"

src/Interpreters/ExternalLoaderXMLConfigRepository.cpp

@@ -4,7 +4,7 @@
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/getMultipleKeysFromConfig.h>
 #include <Poco/Glob.h>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 #include <filesystem>
 
 

src/Storages/examples/remove_symlink_directory.cpp

@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <Common/Exception.h>
-#include <Common/FileSystemHelpers.h>
+#include <Common/filesystemHelpers.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;