From 3386dc32d3a4d42adfe177dc79ef38a9ee868e5f Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Wed, 28 Apr 2021 23:48:34 +0300
Subject: [PATCH] Change in Functions/*

---
 src/Functions/FunctionFile.cpp | 32 ++++++++++++++++----------------
 src/Interpreters/Context.cpp   | 15 +++++++++------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/Functions/FunctionFile.cpp b/src/Functions/FunctionFile.cpp
index 9247152367b..7c87f27c731 100644
--- a/src/Functions/FunctionFile.cpp
+++ b/src/Functions/FunctionFile.cpp
@@ -3,10 +3,11 @@
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <IO/ReadBufferFromFile.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 #include <Interpreters/Context.h>
 #include <unistd.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -68,21 +69,20 @@ public:
         {
             const char * filename = reinterpret_cast<const char *>(&chars[source_offset]);
 
-            const String user_files_path = getContext()->getUserFilesPath();
-            String user_files_absolute_path = Poco::Path(user_files_path).makeAbsolute().makeDirectory().toString();
-            Poco::Path poco_filepath = Poco::Path(filename);
-            if (poco_filepath.isRelative())
-                poco_filepath = Poco::Path(user_files_absolute_path, poco_filepath);
-            const String file_absolute_path = poco_filepath.absolute().toString();
-            checkReadIsAllowedOrThrow(user_files_absolute_path, file_absolute_path);
+            fs::path user_files_absolute_path = fs::canonical(fs::path(getContext()->getUserFilesPath()));
+            fs::path file_path(filename);
+            if (file_path.is_relative())
+                file_path = user_files_absolute_path / file_path;
 
-            checked_filenames[row] = file_absolute_path;
-            auto file = Poco::File(file_absolute_path);
+            fs::path file_absolute_path = fs::absolute(file_path);
+            checkReadIsAllowedOrThrow(user_files_absolute_path.string(), file_absolute_path);
 
-            if (!file.exists())
-                throw Exception(fmt::format("File {} doesn't exist.", file_absolute_path), ErrorCodes::FILE_DOESNT_EXIST);
+            checked_filenames[row] = file_absolute_path.string();
 
-            const auto current_file_size = Poco::File(file_absolute_path).getSize();
+            if (!fs::exists(file_absolute_path))
+                throw Exception(fmt::format("File {} doesn't exist.", file_absolute_path.string()), ErrorCodes::FILE_DOESNT_EXIST);
+
+            const auto current_file_size = fs::file_size(file_absolute_path);
 
             result_offset += current_file_size + 1;
             res_offsets[row] = result_offset;
@@ -117,8 +117,8 @@ private:
             if (file_absolute_path.find(user_files_absolute_path) != 0)
                 throw Exception("File is not inside " + user_files_absolute_path, ErrorCodes::DATABASE_ACCESS_DENIED);
 
-        Poco::File path_poco_file = Poco::File(file_absolute_path);
-        if (path_poco_file.exists() && path_poco_file.isDirectory())
+        fs::path fs_path(file_absolute_path);
+        if (fs::exists(fs_path) && fs::is_directory(fs_path))
             throw Exception("File can't be a directory", ErrorCodes::INCORRECT_FILE_NAME);
     }
 };
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 8c0d8f9d48b..0a0c6f9638d 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -74,8 +74,11 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <Storages/MergeTree/BackgroundJobsExecutor.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
+#include <filesystem>
 
 
+namespace fs = std::filesystem;
+
 namespace ProfileEvents
 {
     extern const Event ContextLock;
@@ -2186,14 +2189,14 @@ void Context::checkCanBeDropped(const String & database, const String & table, c
     if (!max_size_to_drop || size <= max_size_to_drop)
         return;
 
-    Poco::File force_file(getFlagsPath() + "force_drop_table");
-    bool force_file_exists = force_file.exists();
+    fs::path force_file(getFlagsPath() + "force_drop_table");
+    bool force_file_exists = fs::exists(force_file);
 
     if (force_file_exists)
     {
         try
         {
-            force_file.remove();
+            fs::remove(force_file);
             return;
         }
         catch (...)
@@ -2215,9 +2218,9 @@ void Context::checkCanBeDropped(const String & database, const String & table, c
                     "Example:\nsudo touch '{}' && sudo chmod 666 '{}'",
                     backQuoteIfNeed(database), backQuoteIfNeed(table),
                     size_str, max_size_to_drop_str,
-                    force_file.path(), force_file_exists ? "exists but not writeable (could not be removed)" : "doesn't exist",
-                    force_file.path(),
-                    force_file.path(), force_file.path());
+                    force_file.string(), force_file_exists ? "exists but not writeable (could not be removed)" : "doesn't exist",
+                    force_file.string(),
+                    force_file.string(), force_file.string());
 }