From a782f81f8f44453dd68ce973427f0a1936374f28 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Tue, 13 Jun 2017 07:45:30 +0300
Subject: [PATCH] Moved common code from Functions; fixed build after merge
 [#CLICKHOUSE-2].

---
 dbms/CMakeLists.txt                                  | 4 ++--
 dbms/src/{Functions => DataTypes}/DataTypeTraits.cpp | 2 +-
 dbms/src/{Functions => DataTypes}/DataTypeTraits.h   | 2 +-
 dbms/src/{Functions => DataTypes}/NumberTraits.h     | 0
 dbms/src/Dictionaries/TrieDictionary.cpp             | 4 +++-
 dbms/src/Functions/Conditional/ArgsInfo.cpp          | 2 +-
 dbms/src/Functions/Conditional/ArrayEvaluator.h      | 2 +-
 dbms/src/Functions/Conditional/NumericEvaluator.h    | 2 +-
 dbms/src/Functions/Conditional/NumericPerformer.cpp  | 4 ++--
 dbms/src/Functions/Conditional/getArrayType.cpp      | 2 +-
 dbms/src/Functions/FunctionsArithmetic.h             | 2 +-
 dbms/src/Functions/FunctionsArray.h                  | 2 +-
 dbms/src/Functions/FunctionsConditional.h            | 4 ++--
 dbms/src/Functions/FunctionsMiscellaneous.h          | 2 +-
 dbms/src/Functions/FunctionsTransform.cpp            | 2 +-
 dbms/src/Functions/tests/number_traits.cpp           | 2 +-
 dbms/src/Interpreters/DDLWorker.cpp                  | 2 +-
 dbms/src/Interpreters/DDLWorker.h                    | 2 +-
 dbms/src/Interpreters/Set.cpp                        | 2 +-
 dbms/src/Interpreters/convertFieldToType.cpp         | 2 +-
 20 files changed, 24 insertions(+), 22 deletions(-)
 rename dbms/src/{Functions => DataTypes}/DataTypeTraits.cpp (89%)
 rename dbms/src/{Functions => DataTypes}/DataTypeTraits.h (99%)
 rename dbms/src/{Functions => DataTypes}/NumberTraits.h (100%)

diff --git a/dbms/CMakeLists.txt b/dbms/CMakeLists.txt
index c178dac5c0..658ea74def 100644
--- a/dbms/CMakeLists.txt
+++ b/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
diff --git a/dbms/src/Functions/DataTypeTraits.cpp b/dbms/src/DataTypes/DataTypeTraits.cpp
similarity index 89%
rename from dbms/src/Functions/DataTypeTraits.cpp
rename to dbms/src/DataTypes/DataTypeTraits.cpp
index f22a49e270..fd1b179fb3 100644
--- a/dbms/src/Functions/DataTypeTraits.cpp
+++ b/dbms/src/DataTypes/DataTypeTraits.cpp
@@ -1,4 +1,4 @@
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 
 namespace DB { namespace DataTypeTraits {
 
diff --git a/dbms/src/Functions/DataTypeTraits.h b/dbms/src/DataTypes/DataTypeTraits.h
similarity index 99%
rename from dbms/src/Functions/DataTypeTraits.h
rename to dbms/src/DataTypes/DataTypeTraits.h
index 5c12d57fa4..d083e67793 100644
--- a/dbms/src/Functions/DataTypeTraits.h
+++ b/dbms/src/DataTypes/DataTypeTraits.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Functions/NumberTraits.h>
+#include <DataTypes/NumberTraits.h>
 #include <DataTypes/EnrichedDataTypePtr.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
diff --git a/dbms/src/Functions/NumberTraits.h b/dbms/src/DataTypes/NumberTraits.h
similarity index 100%
rename from dbms/src/Functions/NumberTraits.h
rename to dbms/src/DataTypes/NumberTraits.h
diff --git a/dbms/src/Dictionaries/TrieDictionary.cpp b/dbms/src/Dictionaries/TrieDictionary.cpp
index ab9b1fa392..c63a88f32d 100644
--- a/dbms/src/Dictionaries/TrieDictionary.cpp
+++ b/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
 {
 
diff --git a/dbms/src/Functions/Conditional/ArgsInfo.cpp b/dbms/src/Functions/Conditional/ArgsInfo.cpp
index f3b9df0a5c..fdc55f96f7 100644
--- a/dbms/src/Functions/Conditional/ArgsInfo.cpp
+++ b/dbms/src/Functions/Conditional/ArgsInfo.cpp
@@ -1,7 +1,7 @@
 #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>
diff --git a/dbms/src/Functions/Conditional/ArrayEvaluator.h b/dbms/src/Functions/Conditional/ArrayEvaluator.h
index ef226f0160..c81eb0034f 100644
--- a/dbms/src/Functions/Conditional/ArrayEvaluator.h
+++ b/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
diff --git a/dbms/src/Functions/Conditional/NumericEvaluator.h b/dbms/src/Functions/Conditional/NumericEvaluator.h
index 2c01a4c945..7ceb241115 100644
--- a/dbms/src/Functions/Conditional/NumericEvaluator.h
+++ b/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>
diff --git a/dbms/src/Functions/Conditional/NumericPerformer.cpp b/dbms/src/Functions/Conditional/NumericPerformer.cpp
index 61d9e0a14f..fe4210b79e 100644
--- a/dbms/src/Functions/Conditional/NumericPerformer.cpp
+++ b/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>
diff --git a/dbms/src/Functions/Conditional/getArrayType.cpp b/dbms/src/Functions/Conditional/getArrayType.cpp
index 53ed9c18ea..1b3f42580a 100644
--- a/dbms/src/Functions/Conditional/getArrayType.cpp
+++ b/dbms/src/Functions/Conditional/getArrayType.cpp
@@ -1,7 +1,7 @@
 #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>
 
diff --git a/dbms/src/Functions/FunctionsArithmetic.h b/dbms/src/Functions/FunctionsArithmetic.h
index 2e78fc3fd3..92933585b8 100644
--- a/dbms/src/Functions/FunctionsArithmetic.h
+++ b/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>
 
diff --git a/dbms/src/Functions/FunctionsArray.h b/dbms/src/Functions/FunctionsArray.h
index 956afb0be3..28a01fbdf7 100644
--- a/dbms/src/Functions/FunctionsArray.h
+++ b/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>
 
diff --git a/dbms/src/Functions/FunctionsConditional.h b/dbms/src/Functions/FunctionsConditional.h
index afa2b53bc9..4ea26ac537 100644
--- a/dbms/src/Functions/FunctionsConditional.h
+++ b/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
 {
diff --git a/dbms/src/Functions/FunctionsMiscellaneous.h b/dbms/src/Functions/FunctionsMiscellaneous.h
index 951b3d3663..cecb35507f 100644
--- a/dbms/src/Functions/FunctionsMiscellaneous.h
+++ b/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>
 
 
diff --git a/dbms/src/Functions/FunctionsTransform.cpp b/dbms/src/Functions/FunctionsTransform.cpp
index dbd7c487cb..6166e9a7f7 100644
--- a/dbms/src/Functions/FunctionsTransform.cpp
+++ b/dbms/src/Functions/FunctionsTransform.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsTransform.h>
-#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeTraits.h>
 
 namespace DB
 {
diff --git a/dbms/src/Functions/tests/number_traits.cpp b/dbms/src/Functions/tests/number_traits.cpp
index 22fab20c18..efe957f764 100644
--- a/dbms/src/Functions/tests/number_traits.cpp
+++ b/dbms/src/Functions/tests/number_traits.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include <Functions/NumberTraits.h>
+#include <DataTypes/NumberTraits.h>
 
 
 void printType(DB::UInt8 x)        { std::cout << "UInt8"; }
diff --git a/dbms/src/Interpreters/DDLWorker.cpp b/dbms/src/Interpreters/DDLWorker.cpp
index 268c9b8664..bf0fd5c082 100644
--- a/dbms/src/Interpreters/DDLWorker.cpp
+++ b/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";
diff --git a/dbms/src/Interpreters/DDLWorker.h b/dbms/src/Interpreters/DDLWorker.h
index d2fe5edbdd..52ec7fabbc 100644
--- a/dbms/src/Interpreters/DDLWorker.h
+++ b/dbms/src/Interpreters/DDLWorker.h
@@ -13,7 +13,7 @@
 namespace DB
 {
 
-struct ASTAlterQuery;
+class ASTAlterQuery;
 struct DDLLogEntry;
 
 
diff --git a/dbms/src/Interpreters/Set.cpp b/dbms/src/Interpreters/Set.cpp
index 8445050a03..777da5dfbd 100644
--- a/dbms/src/Interpreters/Set.cpp
+++ b/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>
diff --git a/dbms/src/Interpreters/convertFieldToType.cpp b/dbms/src/Interpreters/convertFieldToType.cpp
index 05c68f1c62..8b039c3d85 100644
--- a/dbms/src/Interpreters/convertFieldToType.cpp
+++ b/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>
-- 
GitLab