thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 17:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow relative path for renameat2 by using AT_FDCWD

Browse Source 
Otherwise this will trigger logical error on CREATE TABLE with default
config.d overrides (path=./).
This commit is contained in:
Azat Khuzhin 2020-05-17 17:01:10 +03:00
parent 6c49967395
commit 31035a3cd1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Common/renameat2.cpp
View File

@ -4,6 +4,7 @@
#if defined(linux) || defined(__linux) || defined(__linux__) #if defined(linux) || defined(__linux) || defined(__linux__)
#include <unistd.h> #include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <sys/utsname.h> #include <sys/utsname.h>
@ -51,13 +52,11 @@ static void renameat2(const std::string & old_path, const std::string & new_path
{ {
if (old_path.empty() || new_path.empty()) if (old_path.empty() || new_path.empty())
throw Exception("Cannot rename " + old_path + " to " + new_path + ": path is empty", ErrorCodes::LOGICAL_ERROR); throw Exception("Cannot rename " + old_path + " to " + new_path + ": path is empty", ErrorCodes::LOGICAL_ERROR);
if (old_path[0] != '/' || new_path[0] != '/')
throw Exception("Cannot rename " + old_path + " to " + new_path + ": path is relative", ErrorCodes::LOGICAL_ERROR);
/// int olddirfd (ignored for absolute oldpath), const char *oldpath, /// int olddirfd (ignored for absolute oldpath), const char *oldpath,
/// int newdirfd (ignored for absolute newpath), const char *newpath, /// int newdirfd (ignored for absolute newpath), const char *newpath,
/// unsigned int flags /// unsigned int flags
if (0 == syscall(__NR_renameat2, 0, old_path.c_str(), 0, new_path.c_str(), flags)) if (0 == syscall(__NR_renameat2, AT_FDCWD, old_path.c_str(), AT_FDCWD, new_path.c_str(), flags))
return; return;
if (errno == EEXIST) if (errno == EEXIST)