thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage file - test db_dir_path [#add_table_function_file]

Browse Source
This commit is contained in:
decaseal 2018-04-06 13:24:12 +03:00
parent 7296bf2cb7
commit 8b96dc8c7e
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ static std::string getTablePath(const std::string & db_dir_path, const std::stri
return db_dir_path + escapeForFileName(table_name) + "/data." + escapeForFileName(format_name);
}
static void checkCreationIsAllowed(Context & context_global, const std::string & table_path)
static void checkCreationIsAllowed(Context & context_global, const std::string & table_path, const std::string & db_dir_path)
{
if (context_global.getApplicationType() != Context::ApplicationType::SERVER)
return;
@ -50,17 +50,19 @@ static void checkCreationIsAllowed(Context & context_global, const std::string &
if (table_path.empty())
throw Exception("Using file descriptor as source of storage isn't allowed for server daemons", ErrorCodes::DATABASE_ACCESS_DENIED);
Poco::Path clickhouse_data_poco_path = Poco::Path(context_global.getPath() + "data/").makeAbsolute();
std::string clickhouse_data_path = clickhouse_data_poco_path.toString();
throw Exception(db_dir_path, 9999);
Poco::Path table_poco_path = Poco::Path(table_path);
if (table_poco_path.isRelative())
table_poco_path = Poco::Path(clickhouse_data_poco_path, table_poco_path);
std::string table_absolute_path = table_poco_path.absolute().toString();
if (!startsWith(table_absolute_path, clickhouse_data_path))
throw Exception("Part path " + table_absolute_path + " is not inside " + clickhouse_data_path, ErrorCodes::DATABASE_ACCESS_DENIED);
// Poco::Path clickhouse_data_poco_path = Poco::Path(context_global.getPath() + "data/").makeAbsolute();
// std::string clickhouse_data_path = clickhouse_data_poco_path.toString();
//
// Poco::Path table_poco_path = Poco::Path(table_path);
// if (table_poco_path.isRelative())
// table_poco_path = Poco::Path(clickhouse_data_poco_path, table_poco_path);
//
// std::string table_absolute_path = table_poco_path.absolute().toString();
//
// if (!startsWith(table_absolute_path, clickhouse_data_path))
// throw Exception("Part path " + table_absolute_path + " is not inside " + clickhouse_data_path, ErrorCodes::DATABASE_ACCESS_DENIED);
}
@ -81,7 +83,7 @@ StorageFile::StorageFile(
if (!table_path_.empty()) /// Is user's file
{
checkCreationIsAllowed(context_global, table_path_);
checkCreationIsAllowed(context_global, table_path_, db_dir_path);
path = Poco::Path(table_path_).absolute().toString();
is_db_table = false;
}
@ -97,7 +99,7 @@ StorageFile::StorageFile(
}
else /// Will use FD
{
checkCreationIsAllowed(context_global, "");
checkCreationIsAllowed(context_global, "", db_dir_path);
is_db_table = false;
use_table_fd = true;