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

Support reading from DirectoryMonitor.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-01-04 21:05:42 +03:00
parent 253c6cd59a
commit cf7b16d333
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,17 @@ StorageFile::StorageFile(const std::string & table_path_, const std::string & us
paths = listFilesWithRegexpMatching("/", path);
for (const auto & cur_path : paths)
checkCreationIsAllowed(args.context, user_files_absolute_path, cur_path);
if (args.format_name == "Distributed")
{
if (!paths.empty())
{
auto & first_path = paths[0];
Block header = StorageDistributedDirectoryMonitor::createStreamFromFile(first_path)->getHeader();
setColumns(ColumnsDescription(header.getNamesAndTypesList()));
}
}
}
StorageFile::StorageFile(const std::string & relative_table_dir_path, CommonArguments args)
@ -170,19 +181,7 @@ StorageFile::StorageFile(CommonArguments args)
: table_name(args.table_name), database_name(args.database_name), format_name(args.format_name)
, compression_method(args.compression_method), base_path(args.context.getPath())
{
if (args.format_name == "Distributed")
{
if (!paths.empty())
{
auto & first_path = paths[0];
Block header = StorageDistributedDirectoryMonitor::createStreamFromFile(first_path)->getHeader();
setColumns(ColumnsDescription(header.getNamesAndTypesList()));
}
}
else
setColumns(args.columns);
setColumns(args.columns);
setConstraints(args.constraints);
}