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 user_files_path

Browse Source
This commit is contained in:
hcz 2019-11-05 17:48:49 +08:00 committed by GitHub
parent 6a871f579f
commit e0e5e812a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbms/src/Storages/StorageFile.cpp
View File

@ -134,6 +134,8 @@ StorageFile::StorageFile(
setColumns(columns_);
setConstraints(constraints_);
std::string db_dir_path_abs = Poco::Path(db_dir_path).makeAbsolute().makeDirectory().toString();
if (table_fd < 0) /// Will use file
{
use_table_fd = false;
@ -142,20 +144,20 @@ StorageFile::StorageFile(
{
Poco::Path poco_path = Poco::Path(table_path_);
if (poco_path.isRelative())
poco_path = Poco::Path(db_dir_path, poco_path);
poco_path = Poco::Path(db_dir_path_abs, poco_path);
const std::string path = poco_path.absolute().toString();
paths = listFilesWithRegexpMatching("/", path);
for (const auto & cur_path : paths)
checkCreationIsAllowed(context_global, db_dir_path, cur_path);
checkCreationIsAllowed(context_global, db_dir_path_abs, cur_path);
is_db_table = false;
}
else /// Is DB's file
{
if (db_dir_path.empty())
if (db_dir_path_abs.empty())
throw Exception("Storage " + getName() + " requires data path", ErrorCodes::INCORRECT_FILE_NAME);
paths = {getTablePath(db_dir_path, table_name, format_name)};
paths = {getTablePath(db_dir_path_abs, table_name, format_name)};
is_db_table = true;
Poco::File(Poco::Path(paths.back()).parent()).createDirectories();
}