From ce581bbf35379b24e9c5aedb9028e635b11941f0 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Tue, 23 May 2017 21:33:48 +0300
Subject: [PATCH] Preparations, part 3 [#CLICKHOUSE-31].

---
 dbms/src/Databases/DatabaseOrdinary.cpp          |  1 +
 dbms/src/Databases/DatabasesCommon.cpp           |  3 +++
 dbms/src/Databases/DatabasesCommon.h             |  3 +++
 dbms/src/Interpreters/InterpreterCreateQuery.cpp |  3 ++-
 dbms/src/Interpreters/InterpreterCreateQuery.h   | 12 +++++++-----
 dbms/src/Storages/StorageMaterializedView.cpp    |  1 +
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/dbms/src/Databases/DatabaseOrdinary.cpp b/dbms/src/Databases/DatabaseOrdinary.cpp
index be4ce9881e..e1c589434f 100644
--- a/dbms/src/Databases/DatabaseOrdinary.cpp
+++ b/dbms/src/Databases/DatabaseOrdinary.cpp
@@ -7,6 +7,7 @@
 #include <Common/escapeForFileName.h>
 #include <Common/StringUtils.h>
 #include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserCreateQuery.h>
diff --git a/dbms/src/Databases/DatabasesCommon.cpp b/dbms/src/Databases/DatabasesCommon.cpp
index ab8993b7c7..6e5945554d 100644
--- a/dbms/src/Databases/DatabasesCommon.cpp
+++ b/dbms/src/Databases/DatabasesCommon.cpp
@@ -1,7 +1,10 @@
+#include <sstream>
+
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/formatAST.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Storages/StorageFactory.h>
 #include <Databases/DatabasesCommon.h>
diff --git a/dbms/src/Databases/DatabasesCommon.h b/dbms/src/Databases/DatabasesCommon.h
index 3facfba351..84cc982889 100644
--- a/dbms/src/Databases/DatabasesCommon.h
+++ b/dbms/src/Databases/DatabasesCommon.h
@@ -5,11 +5,14 @@
 #include <Storages/IStorage.h>
 #include <Databases/IDatabase.h>
 
+
 /// General functionality for several different database engines.
 
 namespace DB
 {
 
+class Context;
+
 
 /** Get the row with the table definition based on the CREATE query.
   * It is an ATTACH query that you can execute to create a table from the correspondent database.
diff --git a/dbms/src/Interpreters/InterpreterCreateQuery.cpp b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
index de8477caff..c8c871df71 100644
--- a/dbms/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
@@ -27,6 +27,7 @@
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageLog.h>
 
+#include <Interpreters/Context.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/ExpressionAnalyzer.h>
@@ -56,7 +57,7 @@ namespace ErrorCodes
 }
 
 
-InterpreterCreateQuery::InterpreterCreateQuery(ASTPtr query_ptr_, Context & context_)
+InterpreterCreateQuery::InterpreterCreateQuery(const ASTPtr & query_ptr_, Context & context_)
     : query_ptr(query_ptr_), context(context_)
 {
 }
diff --git a/dbms/src/Interpreters/InterpreterCreateQuery.h b/dbms/src/Interpreters/InterpreterCreateQuery.h
index 01e8142489..130067dec7 100644
--- a/dbms/src/Interpreters/InterpreterCreateQuery.h
+++ b/dbms/src/Interpreters/InterpreterCreateQuery.h
@@ -1,16 +1,18 @@
 #pragma once
 
-#include <Storages/IStorage.h>
-#include <Interpreters/Context.h>
 #include <Interpreters/IInterpreter.h>
 #include <Storages/ColumnDefault.h>
-#include <Common/ThreadPool.h>
 
 
+class ThreadPool;
+
 namespace DB
 {
 
+class Context;
 class ASTCreateQuery;
+class IStorage;
+using StoragePtr = std::shared_ptr<IStorage>;
 
 
 /** Allows to create new table or database,
@@ -19,7 +21,7 @@ class ASTCreateQuery;
 class InterpreterCreateQuery : public IInterpreter
 {
 public:
-    InterpreterCreateQuery(ASTPtr query_ptr_, Context & context_);
+    InterpreterCreateQuery(const ASTPtr & query_ptr_, Context & context_);
 
     BlockIO execute() override;
 
@@ -61,7 +63,7 @@ private:
     String setEngine(ASTCreateQuery & create, const StoragePtr & as_storage) const;
 
     ASTPtr query_ptr;
-    Context context;
+    Context & context;
 
     /// Using while loading database.
     ThreadPool * thread_pool = nullptr;
diff --git a/dbms/src/Storages/StorageMaterializedView.cpp b/dbms/src/Storages/StorageMaterializedView.cpp
index 5e9846bb6a..7263cc19ed 100644
--- a/dbms/src/Storages/StorageMaterializedView.cpp
+++ b/dbms/src/Storages/StorageMaterializedView.cpp
@@ -1,6 +1,7 @@
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTDropQuery.h>
 
+#include <Interpreters/Context.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterDropQuery.h>
 
-- 
GitLab