Moved headers and sources to same place (part 2) [#CLICKHOUSE-3].

cmake/dbms_include.cmake

@@ -1,7 +1,7 @@
 
-include_directories (${ClickHouse_SOURCE_DIR}/dbms/include)
+include_directories (${ClickHouse_SOURCE_DIR}/dbms/src)
 # for generated config_version.h and config.h:
-include_directories (${ClickHouse_BINARY_DIR}/dbms/include)
+include_directories (${ClickHouse_BINARY_DIR}/dbms/src)
 
 # TODO:
 # move code with incldes from .h to .cpp and clean this list:

dbms/src/Dictionaries/MongoDBDictionarySource.cpp

@@ -11,7 +11,7 @@
 // only after poco
 // naming conflict:
 // Poco/MongoDB/BSONWriter.h:54: void writeCString(const std::string& value);
-// dbms/include/DB/IO/WriteHelpers.h:146 #define writeCString(s, buf)
+// dbms/src/IO/WriteHelpers.h:146 #define writeCString(s, buf)
 #include <Dictionaries/MongoDBDictionarySource.h>
 #include <Dictionaries/MongoDBBlockInputStream.h>
 #include <Core/FieldVisitors.h>

dbms/src/Dictionaries/writeParenthesisedString.cpp

@@ -1,4 +1,4 @@
-#include "DB/Dictionaries/writeParenthesisedString.h"
+#include <Dictionaries/writeParenthesisedString.h>
 
 namespace DB
 {

dbms/src/Interpreters/Aggregator.cpp

@@ -354,7 +354,7 @@ void Aggregator::compileIfPossible(AggregatedDataVariants::Type type)
       *  по окончании которой вызывается колбэк on_ready.
       */
     SharedLibraryPtr lib = params.compiler->getOrCount(key, params.min_count_to_compile,
-        "-include " INTERNAL_COMPILER_HEADERS "/dbms/include/DB/Interpreters/SpecializedAggregator.h",
+        "-include " INTERNAL_COMPILER_HEADERS "/dbms/src/Interpreters/SpecializedAggregator.h",
         get_code, on_ready);
 
     /// Если результат уже готов.