Moved common code from Functions; fixed build after merge [#CLICKHOUSE-2].

dbms/CMakeLists.txt

@@ -67,8 +67,8 @@ add_headers_only(dbms src/Server)
 list (APPEND dbms_sources ${CONFIG_BUILD})
 list (APPEND dbms_headers ${CONFIG_VERSION} ${CONFIG_COMMON})
 
-list (APPEND dbms_sources src/Functions/IFunction.cpp src/Functions/FunctionFactory.cpp src/Functions/DataTypeTraits.cpp)
-list (APPEND dbms_headers src/Functions/IFunction.h   src/Functions/FunctionFactory.h   src/Functions/DataTypeTraits.h)
+list (APPEND dbms_sources src/Functions/IFunction.cpp src/Functions/FunctionFactory.cpp)
+list (APPEND dbms_headers src/Functions/IFunction.h   src/Functions/FunctionFactory.h)
 
 list (APPEND dbms_sources
     src/AggregateFunctions/AggregateFunctionFactory.cpp

dbms/src/Functions/DataTypeTraits.cpp → dbms/src/DataTypes/DataTypeTraits.cpp

-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 
 namespace DB { namespace DataTypeTraits {
 

dbms/src/Functions/DataTypeTraits.h → dbms/src/DataTypes/DataTypeTraits.h

 #pragma once
 
-#include <Functions/NumberTraits.h>
+#include <DataTypes/NumberTraits.h>
 #include <DataTypes/EnrichedDataTypePtr.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>

dbms/src/Dictionaries/TrieDictionary.cpp

@@ -8,10 +8,12 @@
 #include <Columns/ColumnFixedString.h>
 #include <Dictionaries/DictionaryBlockInputStream.h>
 #include <DataTypes/DataTypeFixedString.h>
-#include <Functions/FunctionsCoding.h>
 #include <IO/WriteIntText.h>
 #include <iostream>
 
+#include <Functions/FunctionsCoding.h>
+
+
 namespace DB
 {
 

dbms/src/Functions/Conditional/ArgsInfo.cpp

 #include <Functions/Conditional/ArgsInfo.h>
 #include <Functions/Conditional/CondException.h>
 #include <Functions/Conditional/common.h>
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeFixedString.h>

dbms/src/Functions/Conditional/ArrayEvaluator.h

@@ -9,7 +9,7 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
 #include <Common/memcpySmall.h>
-#include <Functions/NumberTraits.h>
+#include <DataTypes/NumberTraits.h>
 
 
 namespace DB

dbms/src/Functions/Conditional/NumericEvaluator.h

@@ -4,7 +4,7 @@
 #include <Functions/Conditional/common.h>
 #include <Functions/Conditional/NullMapBuilder.h>
 #include <Functions/Conditional/CondSource.h>
-#include <Functions/NumberTraits.h>
+#include <DataTypes/NumberTraits.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnConst.h>

dbms/src/Functions/Conditional/NumericPerformer.cpp

@@ -4,8 +4,8 @@
 #include <Functions/Conditional/ArgsInfo.h>
 #include <Functions/Conditional/NumericEvaluator.h>
 #include <Functions/Conditional/ArrayEvaluator.h>
-#include <Functions/NumberTraits.h>
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/NumberTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Columns/ColumnVector.h>

dbms/src/Functions/Conditional/getArrayType.cpp

 #include <Functions/Conditional/getArrayType.h>
 #include <Functions/Conditional/CondException.h>
 #include <Functions/Conditional/common.h>
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
 

dbms/src/Functions/FunctionsArithmetic.h

@@ -6,7 +6,7 @@
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnConst.h>
 #include <Functions/IFunction.h>
-#include <Functions/NumberTraits.h>
+#include <DataTypes/NumberTraits.h>
 #include <Core/AccurateComparison.h>
 #include <Core/FieldVisitors.h>
 

dbms/src/Functions/FunctionsArray.h

@@ -14,7 +14,7 @@
 #include <Columns/ColumnNullable.h>
 
 #include <Functions/IFunction.h>
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 #include <Functions/ObjectPool.h>
 #include <Common/StringUtils.h>
 

dbms/src/Functions/FunctionsConditional.h

@@ -13,8 +13,8 @@
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnNullable.h>
 #include <Functions/IFunction.h>
-#include <Functions/NumberTraits.h>
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/NumberTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 
 namespace DB
 {

dbms/src/Functions/FunctionsMiscellaneous.h

@@ -5,7 +5,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnTuple.h>
 #include <Functions/IFunction.h>
-#include <Functions/NumberTraits.h>
+#include <DataTypes/NumberTraits.h>
 #include <Interpreters/ExpressionActions.h>
 
 

dbms/src/Functions/FunctionsTransform.cpp

 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsTransform.h>
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 
 namespace DB
 {

dbms/src/Functions/tests/number_traits.cpp

 #include <iostream>
 
-#include <Functions/NumberTraits.h>
+#include <DataTypes/NumberTraits.h>
 
 
 void printType(DB::UInt8 x)        { std::cout << "UInt8"; }

dbms/src/Interpreters/DDLWorker.cpp

@@ -86,7 +86,7 @@ struct DDLLogEntry
         rb >> "version: " >> version >> "\n";
 
         if (version != CURRENT_VERSION)
-            throw Exception("Unknown DDLLogEntry format version: " + version, ErrorCodes::UNKNOWN_FORMAT_VERSION);
+            throw Exception("Unknown DDLLogEntry format version: " + DB::toString(version), ErrorCodes::UNKNOWN_FORMAT_VERSION);
 
         rb >> "query: " >> escape >> query >> "\n";
         rb >> "hosts: " >> hosts >> "\n";

dbms/src/Interpreters/DDLWorker.h

@@ -13,7 +13,7 @@
 namespace DB
 {
 
-struct ASTAlterQuery;
+class ASTAlterQuery;
 struct DDLLogEntry;
 
 

dbms/src/Interpreters/Set.cpp

@@ -9,7 +9,7 @@
 #include <DataStreams/OneBlockInputStream.h>
 
 #include <DataTypes/DataTypeArray.h>
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>

dbms/src/Interpreters/convertFieldToType.cpp

@@ -11,7 +11,7 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 
 #include <Core/AccurateComparison.h>
 #include <Core/FieldVisitors.h>