Try speedup build (#14809)

base/common/arithmeticOverflow.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <common/extended_types.h>
 
 namespace common
 {

base/common/extended_types.h

@@ -0,0 +1,108 @@
+#pragma once
+
+#include <type_traits>
+
+#include <common/types.h>
+#include <common/wide_integer.h>
+
+using Int128 = __int128;
+
+using wInt256 = wide::integer<256, signed>;
+using wUInt256 = wide::integer<256, unsigned>;
+
+static_assert(sizeof(wInt256) == 32);
+static_assert(sizeof(wUInt256) == 32);
+
+/// The standard library type traits, such as std::is_arithmetic, with one exception
+/// (std::common_type), are "set in stone". Attempting to specialize them causes undefined behavior.
+/// So instead of using the std type_traits, we use our own version which allows extension.
+template <typename T>
+struct is_signed
+{
+    static constexpr bool value = std::is_signed_v<T>;
+};
+
+template <> struct is_signed<Int128> { static constexpr bool value = true; };
+template <> struct is_signed<wInt256> { static constexpr bool value = true; };
+
+template <typename T>
+inline constexpr bool is_signed_v = is_signed<T>::value;
+
+template <typename T>
+struct is_unsigned
+{
+    static constexpr bool value = std::is_unsigned_v<T>;
+};
+
+template <> struct is_unsigned<wUInt256> { static constexpr bool value = true; };
+
+template <typename T>
+inline constexpr bool is_unsigned_v = is_unsigned<T>::value;
+
+
+/// TODO: is_integral includes char, char8_t and wchar_t.
+template <typename T>
+struct is_integer
+{
+    static constexpr bool value = std::is_integral_v<T>;
+};
+
+template <> struct is_integer<Int128> { static constexpr bool value = true; };
+template <> struct is_integer<wInt256> { static constexpr bool value = true; };
+template <> struct is_integer<wUInt256> { static constexpr bool value = true; };
+
+template <typename T>
+inline constexpr bool is_integer_v = is_integer<T>::value;
+
+
+template <typename T>
+struct is_arithmetic
+{
+    static constexpr bool value = std::is_arithmetic_v<T>;
+};
+
+template <> struct is_arithmetic<__int128> { static constexpr bool value = true; };
+
+template <typename T>
+inline constexpr bool is_arithmetic_v = is_arithmetic<T>::value;
+
+template <typename T>
+struct make_unsigned
+{
+    typedef std::make_unsigned_t<T> type;
+};
+
+template <> struct make_unsigned<Int128> { using type = unsigned __int128; };
+template <> struct make_unsigned<wInt256>  { using type = wUInt256; };
+template <> struct make_unsigned<wUInt256> { using type = wUInt256; };
+
+template <typename T> using make_unsigned_t = typename make_unsigned<T>::type;
+
+template <typename T>
+struct make_signed
+{
+    typedef std::make_signed_t<T> type;
+};
+
+template <> struct make_signed<wInt256>  { using type = wInt256; };
+template <> struct make_signed<wUInt256> { using type = wInt256; };
+
+template <typename T> using make_signed_t = typename make_signed<T>::type;
+
+template <typename T>
+struct is_big_int
+{
+    static constexpr bool value = false;
+};
+
+template <> struct is_big_int<wInt256> { static constexpr bool value = true; };
+template <> struct is_big_int<wUInt256> { static constexpr bool value = true; };
+
+template <typename T>
+inline constexpr bool is_big_int_v = is_big_int<T>::value;
+
+template <typename To, typename From>
+inline To bigint_cast(const From & x [[maybe_unused]])
+{
+    return static_cast<To>(x);
+}

base/common/types.h

@@ -2,9 +2,6 @@
 
 #include <cstdint>
 #include <string>
-#include <type_traits>
-
-#include <common/wide_integer.h>
 
 using Int8 = int8_t;
 using Int16 = int16_t;
@@ -21,106 +18,24 @@ using UInt16 = uint16_t;
 using UInt32 = uint32_t;
 using UInt64 = uint64_t;
 
-using Int128 = __int128;
+using String = std::string;
 
-using wInt256 = wide::integer<256, signed>;
+namespace DB
-using wUInt256 = wide::integer<256, unsigned>;
+{
 
-static_assert(sizeof(wInt256) == 32);
+using UInt8 = ::UInt8;
-static_assert(sizeof(wUInt256) == 32);
+using UInt16 = ::UInt16;
+using UInt32 = ::UInt32;
+using UInt64 = ::UInt64;
+
+using Int8 = ::Int8;
+using Int16 = ::Int16;
+using Int32 = ::Int32;
+using Int64 = ::Int64;
+
+using Float32 = float;
+using Float64 = double;
 
 using String = std::string;
 
-/// The standard library type traits, such as std::is_arithmetic, with one exception
-/// (std::common_type), are "set in stone". Attempting to specialize them causes undefined behavior.
-/// So instead of using the std type_traits, we use our own version which allows extension.
-template <typename T>
-struct is_signed
-{
-    static constexpr bool value = std::is_signed_v<T>;
-};
-
-template <> struct is_signed<Int128> { static constexpr bool value = true; };
-template <> struct is_signed<wInt256> { static constexpr bool value = true; };
-
-template <typename T>
-inline constexpr bool is_signed_v = is_signed<T>::value;
-
-template <typename T>
-struct is_unsigned
-{
-    static constexpr bool value = std::is_unsigned_v<T>;
-};
-
-template <> struct is_unsigned<wUInt256> { static constexpr bool value = true; };
-
-template <typename T>
-inline constexpr bool is_unsigned_v = is_unsigned<T>::value;
-
-
-/// TODO: is_integral includes char, char8_t and wchar_t.
-template <typename T>
-struct is_integer
-{
-    static constexpr bool value = std::is_integral_v<T>;
-};
-
-template <> struct is_integer<Int128> { static constexpr bool value = true; };
-template <> struct is_integer<wInt256> { static constexpr bool value = true; };
-template <> struct is_integer<wUInt256> { static constexpr bool value = true; };
-
-template <typename T>
-inline constexpr bool is_integer_v = is_integer<T>::value;
-
-
-template <typename T>
-struct is_arithmetic
-{
-    static constexpr bool value = std::is_arithmetic_v<T>;
-};
-
-template <> struct is_arithmetic<__int128> { static constexpr bool value = true; };
-
-template <typename T>
-inline constexpr bool is_arithmetic_v = is_arithmetic<T>::value;
-
-template <typename T>
-struct make_unsigned
-{
-    typedef std::make_unsigned_t<T> type;
-};
-
-template <> struct make_unsigned<Int128> { using type = unsigned __int128; };
-template <> struct make_unsigned<wInt256>  { using type = wUInt256; };
-template <> struct make_unsigned<wUInt256> { using type = wUInt256; };
-
-template <typename T> using make_unsigned_t = typename make_unsigned<T>::type;
-
-template <typename T>
-struct make_signed
-{
-    typedef std::make_signed_t<T> type;
-};
-
-template <> struct make_signed<wInt256>  { using type = wInt256; };
-template <> struct make_signed<wUInt256> { using type = wInt256; };
-
-template <typename T> using make_signed_t = typename make_signed<T>::type;
-
-template <typename T>
-struct is_big_int
-{
-    static constexpr bool value = false;
-};
-
-template <> struct is_big_int<wInt256> { static constexpr bool value = true; };
-template <> struct is_big_int<wUInt256> { static constexpr bool value = true; };
-
-template <typename T>
-inline constexpr bool is_big_int_v = is_big_int<T>::value;
-
-template <typename To, typename From>
-inline To bigint_cast(const From & x [[maybe_unused]])
-{
-    return static_cast<To>(x);
 }

src/Access/AccessFlags.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/AccessType.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/Exception.h>
 #include <ext/range.h>
 #include <ext/push_back.h>

src/Access/AccessRights.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Access/AccessRightsElement.h>
 #include <memory>
 #include <vector>

src/Access/AccessType.h

@@ -1,13 +1,17 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <array>
+#include <vector>
 
 
 namespace DB
 {
+
+using Strings = std::vector<String>;
+
 /// Represents an access type which can be granted on databases, tables, columns, etc.
 enum class AccessType
 {

src/Access/AllowedClientHosts.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Poco/Net/IPAddress.h>
 #include <memory>
 #include <vector>
@@ -11,6 +11,9 @@
 
 namespace DB
 {
+
+using Strings = std::vector<String>;
+
 /// Represents lists of hosts an user is allowed to connect to server from.
 class AllowedClientHosts
 {

src/Access/Authentication.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/Exception.h>
 #include <Common/OpenSSLHelpers.h>
 #include <Poco/SHA1Engine.h>

src/Access/EnabledRowPolicies.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/RowPolicy.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/UUID.h>
 #include <boost/smart_ptr/atomic_shared_ptr.hpp>
 #include <unordered_map>

src/Access/EnabledSettings.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/UUID.h>
 #include <Access/SettingsConstraints.h>
 #include <Access/SettingsProfileElement.h>

src/Access/ExternalAuthenticators.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/LDAPParams.h>
-#include <Core/Types.h>
+#include <common/types.h>
 
 #include <map>
 #include <memory>

src/Access/IAccessEntity.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/typeid_cast.h>
 #include <Common/quoteString.h>
 #include <boost/algorithm/string.hpp>

src/Access/IAccessStorage.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/IAccessEntity.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/UUID.h>
 #include <ext/scope_guard.h>
 #include <functional>

src/Access/LDAPClient.h

@@ -5,7 +5,7 @@
 #endif
 
 #include <Access/LDAPParams.h>
-#include <Core/Types.h>
+#include <common/types.h>
 
 #if USE_LDAP
 #   include <ldap.h>

src/Access/LDAPParams.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 #include <chrono>
 

src/Access/SettingsProfilesCache.h

@@ -2,7 +2,7 @@
 
 #include <Access/EnabledSettings.h>
 #include <Core/UUID.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <ext/scope_guard.h>
 #include <map>
 #include <unordered_map>

src/AggregateFunctions/AggregateFunctionRankCorrelation.h

@@ -6,7 +6,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitors.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>

src/AggregateFunctions/IAggregateFunction.h

@@ -5,7 +5,7 @@
 #include <vector>
 #include <type_traits>
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/ColumnNumbers.h>
 #include <Core/Block.h>
 #include <Common/Exception.h>

src/AggregateFunctions/QuantileExact.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <algorithm>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/VarInt.h>
 #include <IO/WriteBuffer.h>

src/Columns/ColumnsNumber.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Columns/ColumnVector.h>
 
 

src/Common/BitonicSort.h

@@ -12,7 +12,7 @@
 #endif
 
 #include <ext/bit_cast.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/Defines.h>
 #include <Common/PODArray.h>
 #include <Columns/ColumnsCommon.h>

src/Common/Config/AbstractConfigurationComparison.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 namespace Poco::Util
 {

src/Common/CpuId.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 #if defined(__x86_64__) || defined(__i386__)
 #include <cpuid.h>

src/Common/CurrentMetrics.h

@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <utility>
 #include <atomic>
-#include <Core/Types.h>
+#include <common/types.h>
 
 /** Allows to count number of simultaneously happening processes or current value of some metric.
   *  - for high-level profiling.

src/Common/DNSResolver.cpp

@@ -3,7 +3,7 @@
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
 #include <Core/Names.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Poco/Net/IPAddress.h>
 #include <Poco/Net/DNS.h>
 #include <Poco/Net/NetException.h>

src/Common/DNSResolver.h

@@ -2,7 +2,7 @@
 #include <Poco/Net/IPAddress.h>
 #include <Poco/Net/SocketAddress.h>
 #include <memory>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/Names.h>
 #include <boost/noncopyable.hpp>
 #include <common/logger_useful.h>

src/Common/ExternalLoaderStatus.h

@@ -3,7 +3,7 @@
 #include <vector>
 #include <utility>
 #include <ostream>
-#include <Core/Types.h>
+#include <common/types.h>
 
 namespace DB
 {

src/Common/HashTable/Hash.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/BigInt.h>
 #include <Common/UInt128.h>
 #include <common/unaligned.h>

src/Common/HashTable/HashTable.h

@@ -9,7 +9,7 @@
 #include <boost/noncopyable.hpp>
 
 #include <Core/Defines.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/Exception.h>
 
 #include <IO/WriteBuffer.h>

src/Common/IFactoryWithAliases.h

@@ -2,7 +2,7 @@
 
 #include <Common/Exception.h>
 #include <Common/NamePrompter.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Poco/String.h>
 
 #include <unordered_map>

src/Common/IntervalKind.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 
 namespace DB

src/Common/Macros.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/Names.h>
 #include <Interpreters/StorageID.h>
 

src/Common/NaNUtils.h

@@ -4,7 +4,7 @@
 #include <limits>
 #include <type_traits>
 
-#include <common/types.h>
+#include <common/extended_types.h>
 
 
 /// To be sure, that this function is zero-cost for non-floating point types.

src/Common/NamePrompter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/PODArray.h>
 
 #include <algorithm>

src/Common/OpenSSLHelpers.h

@@ -5,7 +5,7 @@
 #endif
 
 #if USE_SSL
-#    include <Core/Types.h>
+#    include <common/types.h>
 
 
 namespace DB

src/Common/PoolWithFailoverBase.h

@@ -7,7 +7,6 @@
 #include <functional>
 #include <common/types.h>
 #include <ext/scope_guard.h>
-#include <Core/Types.h>
 #include <Common/PoolBase.h>
 #include <Common/ProfileEvents.h>
 #include <Common/NetException.h>

src/Common/QueryProfiler.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <signal.h>
 #include <time.h>
 

src/Common/RWLock.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 #include <chrono>
 #include <list>

src/Common/RadixSort.h

@@ -13,7 +13,7 @@
 #include <type_traits>
 
 #include <ext/bit_cast.h>
-#include <Core/Types.h>
+#include <common/extended_types.h>
 #include <Core/Defines.h>
 
 

src/Common/StatusInfo.h

@@ -4,7 +4,8 @@
 #include <cstdint>
 #include <utility>
 #include <atomic>
-#include <Core/Types.h>
+#include <vector>
+#include <common/types.h>
 #include <mutex>
 #include <unordered_map>
 

src/Common/TaskStatsInfoGetter.cpp

@@ -1,6 +1,6 @@
 #include "TaskStatsInfoGetter.h"
 #include <Common/Exception.h>
-#include <Core/Types.h>
+#include <common/types.h>
 
 #include <unistd.h>
 

src/Common/TaskStatsInfoGetter.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <sys/types.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <boost/noncopyable.hpp>
 
 struct taskstats;

src/Common/ThreadProfileEvents.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/ProfileEvents.h>
 #include <sys/time.h>
 #include <sys/resource.h>

src/Common/UTF8Helpers.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/BitHelpers.h>
 #include <Poco/UTF8Encoding.h>
 

src/Common/UnicodeBar.h

@@ -3,7 +3,7 @@
 #include <cstring>
 #include <cmath>
 #include <string>
-#include <Core/Types.h>
+#include <common/types.h>
 
 #define UNICODE_BAR_CHAR_SIZE (strlen("█"))
 

src/Common/Volnitsky.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <stdint.h>
 #include <string.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Poco/Unicode.h>
 #include <Common/StringSearcher.h>
 #include <Common/StringUtils/StringUtils.h>

src/Common/ZooKeeper/IKeeper.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/Exception.h>
 
 #include <vector>

src/Common/ZooKeeper/TestKeeper.cpp

@@ -1,7 +1,7 @@
 #include <Common/ZooKeeper/TestKeeper.h>
 #include <Common/setThreadName.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <Core/Types.h>
+#include <common/types.h>
 
 #include <sstream>
 #include <iomanip>

src/Common/ZooKeeper/ZooKeeperImpl.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ThreadPool.h>

src/Common/createHardLink.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 namespace DB
 {

src/Common/filesystemHelpers.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/Exception.h>
 
 #include <filesystem>

src/Common/intExp.h

@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <limits>
 
-#include <common/types.h>
+#include <common/extended_types.h>
 
 // Also defined in Core/Defines.h
 #if !defined(NO_SANITIZE_UNDEFINED)

src/Common/isLocalAddress.cpp

@@ -1,7 +1,7 @@
 #include <Common/isLocalAddress.h>
 
 #include <cstring>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Poco/Util/Application.h>
 #include <Poco/Net/NetworkInterface.h>
 #include <Poco/Net/SocketAddress.h>

src/Common/oclBasics.h

@@ -14,7 +14,7 @@
 #endif
 
 #include <algorithm>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/Exception.h>
 
 

src/Common/parseRemoteDescription.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <Core/Types.h>
+#include <common/types.h>
 #include <vector>
 namespace DB
 {

src/Common/quoteString.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <common/StringRef.h>
 
 

src/Common/randomSeed.cpp

@@ -4,7 +4,7 @@
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
 #include <Common/SipHash.h>
-#include <Core/Types.h>
+#include <common/types.h>
 
 
 namespace DB

src/Common/randomSeed.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Core/Types.h>
+#include <common/types.h>
 
 /** Returns a number suitable as seed for PRNG. Use clock_gettime, pid and so on. */
 DB::UInt64 randomSeed();

src/Common/tests/average.cpp

@@ -3,7 +3,7 @@
 
 #include <fmt/format.h>
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/PODArray.h>
 #include <Common/HashTable/FixedHashMap.h>
 #include <Common/Arena.h>

src/Common/tests/gtest_shell_command.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/ShellCommand.h>
 #include <IO/copyData.h>
 #include <IO/WriteBufferFromFileDescriptor.h>

src/Common/tests/integer_hash_tables_and_hashes.cpp

@@ -12,7 +12,7 @@
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 //#define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/HashMap.h>

src/Common/tests/pod_array.cpp

@@ -1,5 +1,5 @@
 #include <Common/PODArray.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <iostream>
 
 #define ASSERT_CHECK(cond, res)                        \

src/Compression/CompressedWriteBuffer.cpp

@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include <common/unaligned.h>
-#include <Core/Types.h>
+#include <common/types.h>
 
 #include "CompressedWriteBuffer.h"
 #include <Compression/CompressionFactory.h>

src/Compression/CompressionCodecT64.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Compression/ICompressionCodec.h>
 
 

src/Compression/ICompressionCodec.h

@@ -3,7 +3,7 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <Compression/CompressionInfo.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Parsers/IAST.h>
 #include <Common/SipHash.h>
 

src/Compression/tests/gtest_compressionCodec.cpp

@@ -2,7 +2,7 @@
 
 #include <Common/PODArray.h>
 #include <Common/Stopwatch.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/IDataType.h>
 #include <IO/ReadBufferFromMemory.h>

src/Core/BlockInfo.cpp

@@ -1,4 +1,4 @@
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/Exception.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>

src/Core/BlockInfo.h

@@ -2,7 +2,7 @@
 
 #include <unordered_map>
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 
 namespace DB

src/Core/DecimalFunctions.h

@@ -1,5 +1,4 @@
 #pragma once
-// Moved Decimal-related functions out from Core/Types.h to reduce compilation time.
 
 #include <Core/Types.h>
 #include <Common/Exception.h>

src/Core/MySQL/Authentication.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Interpreters/Context.h>
 #include <Core/MySQL/PacketEndpoint.h>
 

src/Core/MySQL/MySQLClient.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/MySQL/MySQLReplication.h>
 #include <IO/ReadBufferFromPocoSocket.h>
 #include <IO/ReadHelpers.h>

src/Core/MySQL/MySQLReplication.h

@@ -2,7 +2,7 @@
 #include <Core/Field.h>
 #include <Core/MySQL/PacketsReplication.h>
 #include <Core/MySQL/MySQLGtid.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 

src/Core/Protocol.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 
 namespace DB

src/Core/QueryProcessingStage.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 
 namespace DB

src/Core/SettingsFields.h

@@ -2,7 +2,7 @@
 
 #include <Poco/Timespan.h>
 #include <Poco/URI.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/Field.h>
 #include <Core/MultiEnum.h>
 #include <boost/range/adaptor/map.hpp>

src/Core/Types.h

@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <string>
 #include <vector>
-#include <common/types.h>
+#include <common/extended_types.h>
 
 
 namespace DB
@@ -13,6 +13,11 @@ namespace DB
 
 struct Null {};
 
+/// Ignore strange gcc warning https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55776
+#if !__clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
 /// @note Except explicitly described you should not assume on TypeIndex numbers and/or their orders in this enum.
 enum class TypeIndex
 {
@@ -52,27 +57,15 @@ enum class TypeIndex
     AggregateFunction,
     LowCardinality,
 };
+#if !__clang__
+#pragma GCC diagnostic pop
+#endif
 
-/// defined in common/types.h
+/// Other int defines are in common/types.h
-using UInt8 = ::UInt8;
-using UInt16 = ::UInt16;
-using UInt32 = ::UInt32;
-using UInt64 = ::UInt64;
 using UInt256 = ::wUInt256;
-
-using Int8 = ::Int8;
-using Int16 = ::Int16;
-using Int32 = ::Int32;
-using Int64 = ::Int64;
 using Int128 = ::Int128;
 using Int256 = ::wInt256;
 
-using Float32 = float;
-using Float64 = double;
-
-using String = std::string;
-
-
 /** Note that for types not used in DB, IsNumber is false.
   */
 template <typename T> constexpr bool IsNumber = false;

src/Core/tests/gtest_multienum.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <type_traits>
 #include <Core/MultiEnum.h>
 

src/DataStreams/BlockStreamProfileInfo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <DataStreams/IBlockStream_fwd.h>
 #include <Common/Stopwatch.h>
 

src/DataStreams/ExecutionSpeedLimits.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Poco/Timespan.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <DataStreams/SizeLimits.h>
 
 namespace DB

src/DataStreams/MarkInCompressedFile.h

@@ -2,7 +2,7 @@
 
 #include <tuple>
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <IO/WriteHelpers.h>
 #include <Common/PODArray.h>
 

src/DataStreams/NativeBlockOutputStream.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <DataStreams/IBlockOutputStream.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <DataTypes/IDataType.h>
 
 namespace DB

src/DataTypes/convertMySQLDataType.cpp

@@ -1,7 +1,7 @@
 #include "convertMySQLDataType.h"
 
 #include <Core/Field.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/MultiEnum.h>
 #include <Core/SettingsEnums.h>
 #include <Parsers/ASTFunction.h>

src/Databases/DatabasesCommon.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/IAST.h>
 #include <Storages/IStorage_fwd.h>

src/Databases/IDatabase.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/StorageInMemoryMetadata.h>

src/Databases/MySQL/MaterializeMetadata.h

@@ -6,7 +6,7 @@
 
 #if USE_MYSQL
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/MySQL/MySQLReplication.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/PoolWithFailover.h>

src/Dictionaries/PolygonDictionaryUtils.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/ThreadPool.h>
 #include <Poco/Logger.h>
 
@@ -25,8 +25,8 @@ using Ring = IPolygonDictionary::Ring;
 using Box = bg::model::box<IPolygonDictionary::Point>;
 
 /** SlabsPolygonIndex builds index based on shooting ray down from point.
-  * When this ray crosses odd number of edges in single polygon, point is considered inside. 
+  * When this ray crosses odd number of edges in single polygon, point is considered inside.
-  * 
+  *
   * SlabsPolygonIndex divides plane into vertical slabs, separated by vertical lines going through all points.
   * For each slab, all edges falling in that slab are effectively stored.
   * For each find query, required slab is found with binary search, and result is computed

src/Dictionaries/tests/gtest_dictionary_configuration.cpp

@@ -1,4 +1,4 @@
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/DumpASTNode.h>

src/Disks/DiskFactory.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Disks/IDisk.h>
 
 #include <functional>

src/Disks/IDisk.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Defines.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
 #include <Disks/Executor.h>

src/Disks/S3/ProxyConfiguration.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <utility>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <aws/core/client/ClientConfiguration.h>
 #include <Poco/URI.h>
 

src/Formats/FormatFactory.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Columns/IColumn.h>
 #include <DataStreams/IBlockStream_fwd.h>
 #include <IO/BufferWithOwnMemory.h>

src/Formats/FormatSchemaInfo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 namespace DB
 {

src/Formats/FormatSettings.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 
 
 namespace DB

src/Formats/IRowOutputStream.h

@@ -3,7 +3,7 @@
 #include <memory>
 #include <cstdint>
 #include <boost/noncopyable.hpp>
-#include <Core/Types.h>
+#include <common/types.h>
 
 
 namespace DB

src/Formats/ParsedTemplateFormatString.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <Core/Types.h>
+#include <common/types.h>
 #include <functional>
 #include <optional>
+#include <vector>
 #include <Formats/FormatSchemaInfo.h>
 #include <Formats/FormatSettings.h>
 
@@ -10,6 +11,7 @@ namespace DB
 {
 
 class Block;
+using Strings = std::vector<String>;
 
 struct ParsedTemplateFormatString
 {

src/Formats/ProtobufColumnMatcher.h

@@ -8,7 +8,7 @@
 #    include <memory>
 #    include <unordered_map>
 #    include <vector>
-#    include <Core/Types.h>
+#    include <common/types.h>
 #    include <boost/blank.hpp>
 #    include <google/protobuf/descriptor.h>
 #    include <google/protobuf/descriptor.pb.h>

src/Formats/ProtobufSchemas.h

@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <unordered_map>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <boost/noncopyable.hpp>
 
 

src/Functions/CustomWeekTransforms.h

@@ -2,7 +2,7 @@
 #include <regex>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsNumber.h>
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/DecimalFunctions.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>

src/Functions/DateTimeTransforms.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <Core/Types.h>
+#include <common/types.h>
 #include <Core/DecimalFunctions.h>
 #include <Common/Exception.h>
 #include <common/DateLUTImpl.h>

src/Functions/DummyJSONParser.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Exception.h>
-#include <Core/Types.h>
+#include <common/types.h>
 
 namespace DB
 {