From cf7b16d3336d59df8373acea03c4b54b214bdb6c Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Sat, 4 Jan 2020 21:05:42 +0300
Subject: [PATCH] Support reading from DirectoryMonitor.

---
 dbms/src/Storages/StorageFile.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/dbms/src/Storages/StorageFile.cpp b/dbms/src/Storages/StorageFile.cpp
index 4fd905ae742..d5c789bb6fd 100644
--- a/dbms/src/Storages/StorageFile.cpp
+++ b/dbms/src/Storages/StorageFile.cpp
@@ -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);
 }