From 51ba12c2c3106d9277bbc223adfe41fdb3e45439 Mon Sep 17 00:00:00 2001 From: Artem Zuikov Date: Tue, 15 Sep 2020 12:55:57 +0300 Subject: [PATCH] Try speedup build (#14809) --- base/common/arithmeticOverflow.h | 2 +- base/common/extended_types.h | 108 ++++++++++++++++ base/common/types.h | 115 +++--------------- src/Access/AccessFlags.h | 2 +- src/Access/AccessRights.h | 2 +- src/Access/AccessType.h | 6 +- src/Access/AllowedClientHosts.h | 5 +- src/Access/Authentication.h | 2 +- src/Access/EnabledRowPolicies.h | 2 +- src/Access/EnabledSettings.h | 2 +- src/Access/ExternalAuthenticators.h | 2 +- src/Access/IAccessEntity.h | 2 +- src/Access/IAccessStorage.h | 2 +- src/Access/LDAPClient.h | 2 +- src/Access/LDAPParams.h | 2 +- src/Access/SettingsProfilesCache.h | 2 +- .../AggregateFunctionRankCorrelation.h | 2 +- src/AggregateFunctions/IAggregateFunction.h | 2 +- src/AggregateFunctions/QuantileExact.h | 2 +- src/Columns/ColumnsNumber.h | 2 +- src/Common/BitonicSort.h | 2 +- .../Config/AbstractConfigurationComparison.h | 2 +- src/Common/CpuId.h | 2 +- src/Common/CurrentMetrics.h | 2 +- src/Common/DNSResolver.cpp | 2 +- src/Common/DNSResolver.h | 2 +- src/Common/ExternalLoaderStatus.h | 2 +- src/Common/HashTable/Hash.h | 2 +- src/Common/HashTable/HashTable.h | 2 +- src/Common/IFactoryWithAliases.h | 2 +- src/Common/IntervalKind.h | 2 +- src/Common/Macros.h | 2 +- src/Common/NaNUtils.h | 2 +- src/Common/NamePrompter.h | 2 +- src/Common/OpenSSLHelpers.h | 2 +- src/Common/PoolWithFailoverBase.h | 1 - src/Common/QueryProfiler.h | 2 +- src/Common/RWLock.h | 2 +- src/Common/RadixSort.h | 2 +- src/Common/StatusInfo.h | 3 +- src/Common/TaskStatsInfoGetter.cpp | 2 +- src/Common/TaskStatsInfoGetter.h | 2 +- src/Common/ThreadProfileEvents.h | 2 +- src/Common/UTF8Helpers.h | 2 +- src/Common/UnicodeBar.h | 2 +- src/Common/Volnitsky.h | 2 +- src/Common/ZooKeeper/IKeeper.h | 2 +- src/Common/ZooKeeper/TestKeeper.cpp | 2 +- src/Common/ZooKeeper/ZooKeeperImpl.h | 2 +- src/Common/createHardLink.h | 2 +- src/Common/filesystemHelpers.h | 2 +- src/Common/intExp.h | 2 +- src/Common/isLocalAddress.cpp | 2 +- src/Common/oclBasics.h | 2 +- src/Common/parseRemoteDescription.h | 2 +- src/Common/quoteString.h | 2 +- src/Common/randomSeed.cpp | 2 +- src/Common/randomSeed.h | 2 +- src/Common/tests/average.cpp | 2 +- src/Common/tests/gtest_shell_command.cpp | 2 +- .../tests/integer_hash_tables_and_hashes.cpp | 2 +- src/Common/tests/pod_array.cpp | 2 +- src/Compression/CompressedWriteBuffer.cpp | 2 +- src/Compression/CompressionCodecT64.h | 2 +- src/Compression/ICompressionCodec.h | 2 +- .../tests/gtest_compressionCodec.cpp | 2 +- src/Core/BlockInfo.cpp | 2 +- src/Core/BlockInfo.h | 2 +- src/Core/DecimalFunctions.h | 1 - src/Core/MySQL/Authentication.h | 2 +- src/Core/MySQL/MySQLClient.h | 2 +- src/Core/MySQL/MySQLReplication.h | 2 +- src/Core/Protocol.h | 2 +- src/Core/QueryProcessingStage.h | 2 +- src/Core/SettingsFields.h | 2 +- src/Core/Types.h | 27 ++-- src/Core/tests/gtest_multienum.cpp | 2 +- src/DataStreams/BlockStreamProfileInfo.h | 2 +- src/DataStreams/ExecutionSpeedLimits.h | 2 +- src/DataStreams/MarkInCompressedFile.h | 2 +- src/DataStreams/NativeBlockOutputStream.h | 2 +- src/DataTypes/convertMySQLDataType.cpp | 2 +- src/Databases/DatabasesCommon.h | 2 +- src/Databases/IDatabase.h | 2 +- src/Databases/MySQL/MaterializeMetadata.h | 2 +- src/Dictionaries/PolygonDictionaryUtils.h | 6 +- .../tests/gtest_dictionary_configuration.cpp | 2 +- src/Disks/DiskFactory.h | 2 +- src/Disks/IDisk.h | 2 +- src/Disks/S3/ProxyConfiguration.h | 2 +- src/Formats/FormatFactory.h | 2 +- src/Formats/FormatSchemaInfo.h | 2 +- src/Formats/FormatSettings.h | 2 +- src/Formats/IRowOutputStream.h | 2 +- src/Formats/ParsedTemplateFormatString.h | 4 +- src/Formats/ProtobufColumnMatcher.h | 2 +- src/Formats/ProtobufSchemas.h | 2 +- src/Functions/CustomWeekTransforms.h | 2 +- src/Functions/DateTimeTransforms.h | 2 +- src/Functions/DummyJSONParser.h | 2 +- src/Functions/FunctionsLogical.h | 2 +- src/Functions/GatherUtils/Algorithms.h | 2 +- src/Functions/GeoHash.h | 2 +- src/Functions/PolygonUtils.h | 2 +- src/Functions/RapidJSONParser.h | 2 +- src/Functions/SimdJSONParser.h | 2 +- src/Functions/TargetSpecific.h | 2 +- src/Functions/VectorExtension.h | 2 +- src/Functions/abtesting.h | 2 +- src/Functions/formatString.h | 2 +- src/Functions/likePatternToRegexp.h | 2 +- src/IO/BitHelpers.h | 2 +- src/IO/HexWriteBuffer.cpp | 2 +- src/IO/LimitReadBuffer.h | 2 +- src/IO/ReadWriteBufferFromHTTP.h | 2 +- src/IO/S3Common.h | 2 +- src/IO/VarInt.h | 2 +- src/IO/WriteBufferFromS3.h | 2 +- src/IO/WriteBufferValidUTF8.cpp | 2 +- src/IO/tests/gtest_bit_io.cpp | 2 +- src/IO/tests/gtest_peekable_read_buffer.cpp | 2 +- src/IO/tests/o_direct_and_dirty_pages.cpp | 2 +- src/IO/tests/read_buffer.cpp | 2 +- src/IO/tests/read_buffer_perf.cpp | 2 +- src/IO/tests/read_float_perf.cpp | 2 +- src/IO/tests/read_write_int.cpp | 2 +- src/IO/tests/write_buffer.cpp | 2 +- src/IO/tests/write_buffer_perf.cpp | 2 +- src/Interpreters/ActionLocksManager.h | 2 +- src/Interpreters/Aliases.h | 2 +- src/Interpreters/BloomFilter.h | 2 +- src/Interpreters/ClientInfo.h | 2 +- src/Interpreters/Context.h | 2 +- src/Interpreters/DatabaseAndTableWithAlias.h | 2 +- src/Interpreters/ExternalLoader.h | 2 +- .../ExternalLoaderTempConfigRepository.h | 2 +- .../ExternalLoaderXMLConfigRepository.h | 2 +- src/Interpreters/IExternalLoadable.h | 2 +- .../InJoinSubqueriesPreprocessor.h | 2 +- src/Interpreters/InterpreterSelectQuery.cpp | 2 +- src/Interpreters/InterserverIOHandler.h | 2 +- src/Interpreters/RequiredSourceColumnsData.h | 2 +- src/Interpreters/RowRefs.cpp | 2 +- src/Interpreters/StorageID.h | 2 +- src/Interpreters/SystemLog.h | 2 +- src/Interpreters/TablesStatus.h | 2 +- src/Interpreters/addTypeConversionToAST.h | 2 +- src/Interpreters/tests/hash_map.cpp | 2 +- src/Interpreters/tests/hash_map3.cpp | 2 +- src/Interpreters/tests/hash_map_lookup.cpp | 2 +- src/Interpreters/tests/hash_map_string.cpp | 2 +- src/Interpreters/tests/hash_map_string_2.cpp | 2 +- src/Interpreters/tests/hash_map_string_3.cpp | 2 +- .../tests/hash_map_string_small.cpp | 2 +- src/Interpreters/tests/string_hash_map.cpp | 2 +- src/Interpreters/tests/two_level_hash_map.cpp | 2 +- .../ASTFunctionWithKeyValueArguments.h | 2 +- src/Parsers/ASTRolesOrUsersSet.h | 3 + src/Parsers/ASTShowCreateAccessEntityQuery.h | 2 + src/Parsers/IAST.h | 2 +- src/Parsers/IParser.h | 2 +- src/Parsers/StringRange.h | 2 +- src/Parsers/formatSettingName.h | 2 +- src/Parsers/tests/gtest_dictionary_parser.cpp | 2 +- src/Parsers/tests/lexer.cpp | 2 +- src/Parsers/tests/lexer_fuzzer.cpp | 2 +- .../Formats/Impl/ArrowColumnToCHColumn.cpp | 2 +- src/Server/StaticRequestHandler.h | 2 +- src/Storages/CheckResults.h | 2 +- src/Storages/ColumnDependency.h | 2 +- src/Storages/IStorage_fwd.h | 2 +- src/Storages/IndicesDescription.h | 2 +- .../Kafka/ReadBufferFromKafkaConsumer.h | 2 +- src/Storages/MergeTree/ActiveDataPartSet.h | 5 +- .../MergeTree/BackgroundProcessingPool.h | 2 +- src/Storages/MergeTree/IMergeTreeDataPart.h | 2 +- src/Storages/MergeTree/MergeAlgorithm.h | 2 +- .../MergeTree/MergeTreeDataFormatVersion.h | 2 +- .../MergeTree/MergeTreeDataPartChecksum.h | 2 +- .../MergeTree/MergeTreeDataPartType.h | 2 +- .../MergeTree/MergeTreeIndexBloomFilter.cpp | 2 +- .../MergeTree/MergeTreeIndexGranularityInfo.h | 2 +- .../MergeTree/MergeTreeMutationEntry.h | 2 +- .../MergeTree/MergeTreeMutationStatus.h | 2 +- src/Storages/MergeTree/MergeTreePartInfo.h | 2 +- src/Storages/MergeTree/MergeTreePartition.h | 2 +- src/Storages/MergeTree/MergeType.h | 2 +- .../MergeTree/ReplicatedMergeTreeAddress.h | 2 +- .../ReplicatedMergeTreeBlockOutputStream.h | 2 +- .../ReplicatedMergeTreeCleanupThread.h | 2 +- .../MergeTree/ReplicatedMergeTreeLogEntry.h | 2 +- .../ReplicatedMergeTreeMutationEntry.h | 2 +- .../ReplicatedMergeTreePartCheckThread.h | 2 +- .../MergeTree/ReplicatedMergeTreePartHeader.h | 2 +- .../ReplicatedMergeTreeQuorumEntry.h | 2 +- .../ReplicatedMergeTreeRestartingThread.h | 2 +- .../ReplicatedMergeTreeTableMetadata.h | 2 +- src/Storages/MergeTree/TTLMergeSelector.h | 2 +- src/Storages/MergeTree/localBackup.h | 2 +- src/Storages/PartitionCommands.h | 2 +- .../RabbitMQ/ReadBufferFromRabbitMQConsumer.h | 2 +- src/Storages/StorageLogSettings.h | 2 +- src/Storages/StorageS3Settings.h | 3 +- .../transformQueryForExternalDatabase.h | 2 +- src/TableFunctions/TableFunctionNumbers.h | 2 +- src/TableFunctions/TableFunctionView.h | 2 +- src/TableFunctions/TableFunctionZeros.h | 2 +- 207 files changed, 354 insertions(+), 321 deletions(-) create mode 100644 base/common/extended_types.h diff --git a/base/common/arithmeticOverflow.h b/base/common/arithmeticOverflow.h index e228af287e2..c20fd635924 100644 --- a/base/common/arithmeticOverflow.h +++ b/base/common/arithmeticOverflow.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace common { diff --git a/base/common/extended_types.h b/base/common/extended_types.h new file mode 100644 index 00000000000..fe5f7184954 --- /dev/null +++ b/base/common/extended_types.h @@ -0,0 +1,108 @@ +#pragma once + +#include + +#include +#include + +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 +struct is_signed +{ + static constexpr bool value = std::is_signed_v; +}; + +template <> struct is_signed { static constexpr bool value = true; }; +template <> struct is_signed { static constexpr bool value = true; }; + +template +inline constexpr bool is_signed_v = is_signed::value; + +template +struct is_unsigned +{ + static constexpr bool value = std::is_unsigned_v; +}; + +template <> struct is_unsigned { static constexpr bool value = true; }; + +template +inline constexpr bool is_unsigned_v = is_unsigned::value; + + +/// TODO: is_integral includes char, char8_t and wchar_t. +template +struct is_integer +{ + static constexpr bool value = std::is_integral_v; +}; + +template <> struct is_integer { static constexpr bool value = true; }; +template <> struct is_integer { static constexpr bool value = true; }; +template <> struct is_integer { static constexpr bool value = true; }; + +template +inline constexpr bool is_integer_v = is_integer::value; + + +template +struct is_arithmetic +{ + static constexpr bool value = std::is_arithmetic_v; +}; + +template <> struct is_arithmetic<__int128> { static constexpr bool value = true; }; + +template +inline constexpr bool is_arithmetic_v = is_arithmetic::value; + +template +struct make_unsigned +{ + typedef std::make_unsigned_t type; +}; + +template <> struct make_unsigned { using type = unsigned __int128; }; +template <> struct make_unsigned { using type = wUInt256; }; +template <> struct make_unsigned { using type = wUInt256; }; + +template using make_unsigned_t = typename make_unsigned::type; + +template +struct make_signed +{ + typedef std::make_signed_t type; +}; + +template <> struct make_signed { using type = wInt256; }; +template <> struct make_signed { using type = wInt256; }; + +template using make_signed_t = typename make_signed::type; + +template +struct is_big_int +{ + static constexpr bool value = false; +}; + +template <> struct is_big_int { static constexpr bool value = true; }; +template <> struct is_big_int { static constexpr bool value = true; }; + +template +inline constexpr bool is_big_int_v = is_big_int::value; + +template +inline To bigint_cast(const From & x [[maybe_unused]]) +{ + return static_cast(x); +} diff --git a/base/common/types.h b/base/common/types.h index 2982781ce1f..f3572da2972 100644 --- a/base/common/types.h +++ b/base/common/types.h @@ -2,9 +2,6 @@ #include #include -#include - -#include 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>; -using wUInt256 = wide::integer<256, unsigned>; +namespace DB +{ -static_assert(sizeof(wInt256) == 32); -static_assert(sizeof(wUInt256) == 32); +using UInt8 = ::UInt8; +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 -struct is_signed -{ - static constexpr bool value = std::is_signed_v; -}; - -template <> struct is_signed { static constexpr bool value = true; }; -template <> struct is_signed { static constexpr bool value = true; }; - -template -inline constexpr bool is_signed_v = is_signed::value; - -template -struct is_unsigned -{ - static constexpr bool value = std::is_unsigned_v; -}; - -template <> struct is_unsigned { static constexpr bool value = true; }; - -template -inline constexpr bool is_unsigned_v = is_unsigned::value; - - -/// TODO: is_integral includes char, char8_t and wchar_t. -template -struct is_integer -{ - static constexpr bool value = std::is_integral_v; -}; - -template <> struct is_integer { static constexpr bool value = true; }; -template <> struct is_integer { static constexpr bool value = true; }; -template <> struct is_integer { static constexpr bool value = true; }; - -template -inline constexpr bool is_integer_v = is_integer::value; - - -template -struct is_arithmetic -{ - static constexpr bool value = std::is_arithmetic_v; -}; - -template <> struct is_arithmetic<__int128> { static constexpr bool value = true; }; - -template -inline constexpr bool is_arithmetic_v = is_arithmetic::value; - -template -struct make_unsigned -{ - typedef std::make_unsigned_t type; -}; - -template <> struct make_unsigned { using type = unsigned __int128; }; -template <> struct make_unsigned { using type = wUInt256; }; -template <> struct make_unsigned { using type = wUInt256; }; - -template using make_unsigned_t = typename make_unsigned::type; - -template -struct make_signed -{ - typedef std::make_signed_t type; -}; - -template <> struct make_signed { using type = wInt256; }; -template <> struct make_signed { using type = wInt256; }; - -template using make_signed_t = typename make_signed::type; - -template -struct is_big_int -{ - static constexpr bool value = false; -}; - -template <> struct is_big_int { static constexpr bool value = true; }; -template <> struct is_big_int { static constexpr bool value = true; }; - -template -inline constexpr bool is_big_int_v = is_big_int::value; - -template -inline To bigint_cast(const From & x [[maybe_unused]]) -{ - return static_cast(x); } diff --git a/src/Access/AccessFlags.h b/src/Access/AccessFlags.h index 3cb92b6b855..049140586ea 100644 --- a/src/Access/AccessFlags.h +++ b/src/Access/AccessFlags.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Access/AccessRights.h b/src/Access/AccessRights.h index 8e150070f53..c610795ab45 100644 --- a/src/Access/AccessRights.h +++ b/src/Access/AccessRights.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Access/AccessType.h b/src/Access/AccessType.h index dae86e62434..11896f628d9 100644 --- a/src/Access/AccessType.h +++ b/src/Access/AccessType.h @@ -1,13 +1,17 @@ #pragma once -#include +#include #include #include #include +#include namespace DB { + +using Strings = std::vector; + /// Represents an access type which can be granted on databases, tables, columns, etc. enum class AccessType { diff --git a/src/Access/AllowedClientHosts.h b/src/Access/AllowedClientHosts.h index 2baafb2e04a..615782d75a2 100644 --- a/src/Access/AllowedClientHosts.h +++ b/src/Access/AllowedClientHosts.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include @@ -11,6 +11,9 @@ namespace DB { + +using Strings = std::vector; + /// Represents lists of hosts an user is allowed to connect to server from. class AllowedClientHosts { diff --git a/src/Access/Authentication.h b/src/Access/Authentication.h index 35ff0fa1d32..38714339221 100644 --- a/src/Access/Authentication.h +++ b/src/Access/Authentication.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Access/EnabledRowPolicies.h b/src/Access/EnabledRowPolicies.h index b92939afb03..0ca4f16fcf1 100644 --- a/src/Access/EnabledRowPolicies.h +++ b/src/Access/EnabledRowPolicies.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Access/EnabledSettings.h b/src/Access/EnabledSettings.h index cc30e4481fc..80635ca4542 100644 --- a/src/Access/EnabledSettings.h +++ b/src/Access/EnabledSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Access/ExternalAuthenticators.h b/src/Access/ExternalAuthenticators.h index 54af87604a6..7484996c472 100644 --- a/src/Access/ExternalAuthenticators.h +++ b/src/Access/ExternalAuthenticators.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/Access/IAccessEntity.h b/src/Access/IAccessEntity.h index 68e14c99982..18b450bff5c 100644 --- a/src/Access/IAccessEntity.h +++ b/src/Access/IAccessEntity.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Access/IAccessStorage.h b/src/Access/IAccessStorage.h index 7851f8c9b6b..d91927e79d9 100644 --- a/src/Access/IAccessStorage.h +++ b/src/Access/IAccessStorage.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Access/LDAPClient.h b/src/Access/LDAPClient.h index 5aad2ed3061..b117ed9a026 100644 --- a/src/Access/LDAPClient.h +++ b/src/Access/LDAPClient.h @@ -5,7 +5,7 @@ #endif #include -#include +#include #if USE_LDAP # include diff --git a/src/Access/LDAPParams.h b/src/Access/LDAPParams.h index 0d7c7dd17cd..2168ce45203 100644 --- a/src/Access/LDAPParams.h +++ b/src/Access/LDAPParams.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/Access/SettingsProfilesCache.h b/src/Access/SettingsProfilesCache.h index 42dd05df351..ef3cfa51665 100644 --- a/src/Access/SettingsProfilesCache.h +++ b/src/Access/SettingsProfilesCache.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h index 379a8332f09..15057940ebd 100644 --- a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h +++ b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h index 7e6b7abbd28..b9656c31fa3 100644 --- a/src/AggregateFunctions/IAggregateFunction.h +++ b/src/AggregateFunctions/IAggregateFunction.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/AggregateFunctions/QuantileExact.h b/src/AggregateFunctions/QuantileExact.h index da0f644721b..3f5a0907126 100644 --- a/src/AggregateFunctions/QuantileExact.h +++ b/src/AggregateFunctions/QuantileExact.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Columns/ColumnsNumber.h b/src/Columns/ColumnsNumber.h index c206b37a588..96ce2bd6d6f 100644 --- a/src/Columns/ColumnsNumber.h +++ b/src/Columns/ColumnsNumber.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/Common/BitonicSort.h b/src/Common/BitonicSort.h index 6bf10ebe835..8140687c040 100644 --- a/src/Common/BitonicSort.h +++ b/src/Common/BitonicSort.h @@ -12,7 +12,7 @@ #endif #include -#include +#include #include #include #include diff --git a/src/Common/Config/AbstractConfigurationComparison.h b/src/Common/Config/AbstractConfigurationComparison.h index f0d126a578a..f825ad4e53d 100644 --- a/src/Common/Config/AbstractConfigurationComparison.h +++ b/src/Common/Config/AbstractConfigurationComparison.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace Poco::Util { diff --git a/src/Common/CpuId.h b/src/Common/CpuId.h index 1548ff6cc40..2db247173a6 100644 --- a/src/Common/CpuId.h +++ b/src/Common/CpuId.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #if defined(__x86_64__) || defined(__i386__) #include diff --git a/src/Common/CurrentMetrics.h b/src/Common/CurrentMetrics.h index 09accf96010..eabeca7a0e9 100644 --- a/src/Common/CurrentMetrics.h +++ b/src/Common/CurrentMetrics.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include /** Allows to count number of simultaneously happening processes or current value of some metric. * - for high-level profiling. diff --git a/src/Common/DNSResolver.cpp b/src/Common/DNSResolver.cpp index d61982f3406..9059d2838bb 100644 --- a/src/Common/DNSResolver.cpp +++ b/src/Common/DNSResolver.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Common/DNSResolver.h b/src/Common/DNSResolver.h index 7dbc2852d43..57c28188f58 100644 --- a/src/Common/DNSResolver.h +++ b/src/Common/DNSResolver.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Common/ExternalLoaderStatus.h b/src/Common/ExternalLoaderStatus.h index 44536198b82..d8852eb6152 100644 --- a/src/Common/ExternalLoaderStatus.h +++ b/src/Common/ExternalLoaderStatus.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace DB { diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h index c561933ab80..abd1a69545f 100644 --- a/src/Common/HashTable/Hash.h +++ b/src/Common/HashTable/Hash.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Common/HashTable/HashTable.h b/src/Common/HashTable/HashTable.h index 5c8e7917eb0..baad5d40764 100644 --- a/src/Common/HashTable/HashTable.h +++ b/src/Common/HashTable/HashTable.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/src/Common/IFactoryWithAliases.h b/src/Common/IFactoryWithAliases.h index 994b2c1a02c..11ebf31db33 100644 --- a/src/Common/IFactoryWithAliases.h +++ b/src/Common/IFactoryWithAliases.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/src/Common/IntervalKind.h b/src/Common/IntervalKind.h index 91c3eb14043..a086d0d2b0c 100644 --- a/src/Common/IntervalKind.h +++ b/src/Common/IntervalKind.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB diff --git a/src/Common/Macros.h b/src/Common/Macros.h index cee133b0ccb..bcd6075782e 100644 --- a/src/Common/Macros.h +++ b/src/Common/Macros.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Common/NaNUtils.h b/src/Common/NaNUtils.h index 7d727fb7793..3b393fad41e 100644 --- a/src/Common/NaNUtils.h +++ b/src/Common/NaNUtils.h @@ -4,7 +4,7 @@ #include #include -#include +#include /// To be sure, that this function is zero-cost for non-floating point types. diff --git a/src/Common/NamePrompter.h b/src/Common/NamePrompter.h index a52a5f3775e..5f7832c4423 100644 --- a/src/Common/NamePrompter.h +++ b/src/Common/NamePrompter.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Common/OpenSSLHelpers.h b/src/Common/OpenSSLHelpers.h index e77fc3037c1..2560664de9e 100644 --- a/src/Common/OpenSSLHelpers.h +++ b/src/Common/OpenSSLHelpers.h @@ -5,7 +5,7 @@ #endif #if USE_SSL -# include +# include namespace DB diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h index f206278fbda..a328e15e4e5 100644 --- a/src/Common/PoolWithFailoverBase.h +++ b/src/Common/PoolWithFailoverBase.h @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Common/QueryProfiler.h b/src/Common/QueryProfiler.h index 44eeebbf10a..8e2d09e0be2 100644 --- a/src/Common/QueryProfiler.h +++ b/src/Common/QueryProfiler.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Common/RWLock.h b/src/Common/RWLock.h index ad0a3f139fc..952c8049a0f 100644 --- a/src/Common/RWLock.h +++ b/src/Common/RWLock.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Common/RadixSort.h b/src/Common/RadixSort.h index cbb8badab4a..22e93a2c324 100644 --- a/src/Common/RadixSort.h +++ b/src/Common/RadixSort.h @@ -13,7 +13,7 @@ #include #include -#include +#include #include diff --git a/src/Common/StatusInfo.h b/src/Common/StatusInfo.h index 89365f0634f..de92bb838ba 100644 --- a/src/Common/StatusInfo.h +++ b/src/Common/StatusInfo.h @@ -4,7 +4,8 @@ #include #include #include -#include +#include +#include #include #include diff --git a/src/Common/TaskStatsInfoGetter.cpp b/src/Common/TaskStatsInfoGetter.cpp index 40b92917343..92978a0ad8c 100644 --- a/src/Common/TaskStatsInfoGetter.cpp +++ b/src/Common/TaskStatsInfoGetter.cpp @@ -1,6 +1,6 @@ #include "TaskStatsInfoGetter.h" #include -#include +#include #include diff --git a/src/Common/TaskStatsInfoGetter.h b/src/Common/TaskStatsInfoGetter.h index 6865c64dc38..00ecf91c475 100644 --- a/src/Common/TaskStatsInfoGetter.h +++ b/src/Common/TaskStatsInfoGetter.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include struct taskstats; diff --git a/src/Common/ThreadProfileEvents.h b/src/Common/ThreadProfileEvents.h index 6bec7b38db5..69db595b426 100644 --- a/src/Common/ThreadProfileEvents.h +++ b/src/Common/ThreadProfileEvents.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Common/UTF8Helpers.h b/src/Common/UTF8Helpers.h index 129a745afe2..e795b6846b2 100644 --- a/src/Common/UTF8Helpers.h +++ b/src/Common/UTF8Helpers.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Common/UnicodeBar.h b/src/Common/UnicodeBar.h index 13c39f680aa..9a5bcecbd62 100644 --- a/src/Common/UnicodeBar.h +++ b/src/Common/UnicodeBar.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #define UNICODE_BAR_CHAR_SIZE (strlen("█")) diff --git a/src/Common/Volnitsky.h b/src/Common/Volnitsky.h index af97dbdae13..a1fa83b4f33 100644 --- a/src/Common/Volnitsky.h +++ b/src/Common/Volnitsky.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h index 409c3838147..9d4a2ebb16a 100644 --- a/src/Common/ZooKeeper/IKeeper.h +++ b/src/Common/ZooKeeper/IKeeper.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Common/ZooKeeper/TestKeeper.cpp b/src/Common/ZooKeeper/TestKeeper.cpp index 1b203d92fb8..4f7beadef5f 100644 --- a/src/Common/ZooKeeper/TestKeeper.cpp +++ b/src/Common/ZooKeeper/TestKeeper.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.h b/src/Common/ZooKeeper/ZooKeeperImpl.h index 305ee46d58a..085b0e9856a 100644 --- a/src/Common/ZooKeeper/ZooKeeperImpl.h +++ b/src/Common/ZooKeeper/ZooKeeperImpl.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Common/createHardLink.h b/src/Common/createHardLink.h index 8f8e5c27d9f..c2b01cf817b 100644 --- a/src/Common/createHardLink.h +++ b/src/Common/createHardLink.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB { diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h index 80a1cf10cb4..f97f91d2647 100644 --- a/src/Common/filesystemHelpers.h +++ b/src/Common/filesystemHelpers.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Common/intExp.h b/src/Common/intExp.h index 8a52015c54a..bc977a41d33 100644 --- a/src/Common/intExp.h +++ b/src/Common/intExp.h @@ -3,7 +3,7 @@ #include #include -#include +#include // Also defined in Core/Defines.h #if !defined(NO_SANITIZE_UNDEFINED) diff --git a/src/Common/isLocalAddress.cpp b/src/Common/isLocalAddress.cpp index 3e81ecd935c..8da281e3051 100644 --- a/src/Common/isLocalAddress.cpp +++ b/src/Common/isLocalAddress.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Common/oclBasics.h b/src/Common/oclBasics.h index 7c977830e82..a3e7636af1b 100644 --- a/src/Common/oclBasics.h +++ b/src/Common/oclBasics.h @@ -14,7 +14,7 @@ #endif #include -#include +#include #include diff --git a/src/Common/parseRemoteDescription.h b/src/Common/parseRemoteDescription.h index cbc73380628..6ba0bb4737f 100644 --- a/src/Common/parseRemoteDescription.h +++ b/src/Common/parseRemoteDescription.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include namespace DB { diff --git a/src/Common/quoteString.h b/src/Common/quoteString.h index 426034e4803..3d395a35b03 100644 --- a/src/Common/quoteString.h +++ b/src/Common/quoteString.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/Common/randomSeed.cpp b/src/Common/randomSeed.cpp index 4d466d283c9..8ad624febdd 100644 --- a/src/Common/randomSeed.cpp +++ b/src/Common/randomSeed.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace DB diff --git a/src/Common/randomSeed.h b/src/Common/randomSeed.h index e2b8310f79c..4f04e4b974a 100644 --- a/src/Common/randomSeed.h +++ b/src/Common/randomSeed.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include /** Returns a number suitable as seed for PRNG. Use clock_gettime, pid and so on. */ DB::UInt64 randomSeed(); diff --git a/src/Common/tests/average.cpp b/src/Common/tests/average.cpp index 900e99ee752..5f3b13af8e8 100644 --- a/src/Common/tests/average.cpp +++ b/src/Common/tests/average.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include #include #include diff --git a/src/Common/tests/gtest_shell_command.cpp b/src/Common/tests/gtest_shell_command.cpp index 057a4d22648..4d578422962 100644 --- a/src/Common/tests/gtest_shell_command.cpp +++ b/src/Common/tests/gtest_shell_command.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/src/Common/tests/integer_hash_tables_and_hashes.cpp b/src/Common/tests/integer_hash_tables_and_hashes.cpp index 5b090fa6e4e..f5d9150a6ad 100644 --- a/src/Common/tests/integer_hash_tables_and_hashes.cpp +++ b/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 +#include #include #include #include diff --git a/src/Common/tests/pod_array.cpp b/src/Common/tests/pod_array.cpp index 6e9634ba3cf..7ebf2670271 100644 --- a/src/Common/tests/pod_array.cpp +++ b/src/Common/tests/pod_array.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #define ASSERT_CHECK(cond, res) \ diff --git a/src/Compression/CompressedWriteBuffer.cpp b/src/Compression/CompressedWriteBuffer.cpp index 092da9e4364..02f418dcdf7 100644 --- a/src/Compression/CompressedWriteBuffer.cpp +++ b/src/Compression/CompressedWriteBuffer.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include "CompressedWriteBuffer.h" #include diff --git a/src/Compression/CompressionCodecT64.h b/src/Compression/CompressionCodecT64.h index 9671eb81ce1..06c34ba0a4a 100644 --- a/src/Compression/CompressionCodecT64.h +++ b/src/Compression/CompressionCodecT64.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/Compression/ICompressionCodec.h b/src/Compression/ICompressionCodec.h index 8f72ba55200..8d7d3fc800c 100644 --- a/src/Compression/ICompressionCodec.h +++ b/src/Compression/ICompressionCodec.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp index 4677efce5da..e9470536ae8 100644 --- a/src/Compression/tests/gtest_compressionCodec.cpp +++ b/src/Compression/tests/gtest_compressionCodec.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Core/BlockInfo.cpp b/src/Core/BlockInfo.cpp index 78ee165bad1..9f88513cd3c 100644 --- a/src/Core/BlockInfo.cpp +++ b/src/Core/BlockInfo.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/Core/BlockInfo.h b/src/Core/BlockInfo.h index 886ecd96ef4..c8dd1576b22 100644 --- a/src/Core/BlockInfo.h +++ b/src/Core/BlockInfo.h @@ -2,7 +2,7 @@ #include -#include +#include namespace DB diff --git a/src/Core/DecimalFunctions.h b/src/Core/DecimalFunctions.h index b821d29dd0d..cd5a2b5a670 100644 --- a/src/Core/DecimalFunctions.h +++ b/src/Core/DecimalFunctions.h @@ -1,5 +1,4 @@ #pragma once -// Moved Decimal-related functions out from Core/Types.h to reduce compilation time. #include #include diff --git a/src/Core/MySQL/Authentication.h b/src/Core/MySQL/Authentication.h index 3874655e523..e1b7c174139 100644 --- a/src/Core/MySQL/Authentication.h +++ b/src/Core/MySQL/Authentication.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Core/MySQL/MySQLClient.h b/src/Core/MySQL/MySQLClient.h index 3fb86b35833..a31794acc42 100644 --- a/src/Core/MySQL/MySQLClient.h +++ b/src/Core/MySQL/MySQLClient.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Core/MySQL/MySQLReplication.h b/src/Core/MySQL/MySQLReplication.h index b63b103e87a..ad5e53ed200 100644 --- a/src/Core/MySQL/MySQLReplication.h +++ b/src/Core/MySQL/MySQLReplication.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Core/Protocol.h b/src/Core/Protocol.h index bc97e5d47d4..15630d0a6f8 100644 --- a/src/Core/Protocol.h +++ b/src/Core/Protocol.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB diff --git a/src/Core/QueryProcessingStage.h b/src/Core/QueryProcessingStage.h index 658b504fc2c..b1ed4709df2 100644 --- a/src/Core/QueryProcessingStage.h +++ b/src/Core/QueryProcessingStage.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h index 270d0c7c7d0..1a5676bd8a8 100644 --- a/src/Core/SettingsFields.h +++ b/src/Core/SettingsFields.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Core/Types.h b/src/Core/Types.h index c23ac4a1379..3157598adc0 100644 --- a/src/Core/Types.h +++ b/src/Core/Types.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include 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 -using UInt8 = ::UInt8; -using UInt16 = ::UInt16; -using UInt32 = ::UInt32; -using UInt64 = ::UInt64; +/// Other int defines are in common/types.h 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 constexpr bool IsNumber = false; diff --git a/src/Core/tests/gtest_multienum.cpp b/src/Core/tests/gtest_multienum.cpp index 70c7699aa5c..91cee6b316a 100644 --- a/src/Core/tests/gtest_multienum.cpp +++ b/src/Core/tests/gtest_multienum.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include diff --git a/src/DataStreams/BlockStreamProfileInfo.h b/src/DataStreams/BlockStreamProfileInfo.h index 5f75cf9ddea..d068db89641 100644 --- a/src/DataStreams/BlockStreamProfileInfo.h +++ b/src/DataStreams/BlockStreamProfileInfo.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/DataStreams/ExecutionSpeedLimits.h b/src/DataStreams/ExecutionSpeedLimits.h index 8f098bfd6b4..9ab58e12cf4 100644 --- a/src/DataStreams/ExecutionSpeedLimits.h +++ b/src/DataStreams/ExecutionSpeedLimits.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include namespace DB diff --git a/src/DataStreams/MarkInCompressedFile.h b/src/DataStreams/MarkInCompressedFile.h index 62886ffad57..94ff5414762 100644 --- a/src/DataStreams/MarkInCompressedFile.h +++ b/src/DataStreams/MarkInCompressedFile.h @@ -2,7 +2,7 @@ #include -#include +#include #include #include diff --git a/src/DataStreams/NativeBlockOutputStream.h b/src/DataStreams/NativeBlockOutputStream.h index 720a779ec5e..64ccd267634 100644 --- a/src/DataStreams/NativeBlockOutputStream.h +++ b/src/DataStreams/NativeBlockOutputStream.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include namespace DB diff --git a/src/DataTypes/convertMySQLDataType.cpp b/src/DataTypes/convertMySQLDataType.cpp index 23899ea197a..a509cf8b091 100644 --- a/src/DataTypes/convertMySQLDataType.cpp +++ b/src/DataTypes/convertMySQLDataType.cpp @@ -1,7 +1,7 @@ #include "convertMySQLDataType.h" #include -#include +#include #include #include #include diff --git a/src/Databases/DatabasesCommon.h b/src/Databases/DatabasesCommon.h index 4c7ec1ec637..5e1e555a524 100644 --- a/src/Databases/DatabasesCommon.h +++ b/src/Databases/DatabasesCommon.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h index d82755a7bc8..b28bd5fd599 100644 --- a/src/Databases/IDatabase.h +++ b/src/Databases/IDatabase.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Databases/MySQL/MaterializeMetadata.h b/src/Databases/MySQL/MaterializeMetadata.h index c036ea77940..5e77620e365 100644 --- a/src/Databases/MySQL/MaterializeMetadata.h +++ b/src/Databases/MySQL/MaterializeMetadata.h @@ -6,7 +6,7 @@ #if USE_MYSQL -#include +#include #include #include #include diff --git a/src/Dictionaries/PolygonDictionaryUtils.h b/src/Dictionaries/PolygonDictionaryUtils.h index 11ec28502af..cd99717f98a 100644 --- a/src/Dictionaries/PolygonDictionaryUtils.h +++ b/src/Dictionaries/PolygonDictionaryUtils.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include @@ -25,8 +25,8 @@ using Ring = IPolygonDictionary::Ring; using Box = bg::model::box; /** 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 diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp index fc99a34cd42..453ce2b81f0 100644 --- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp +++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/Disks/DiskFactory.h b/src/Disks/DiskFactory.h index 50520381552..d41f14bd753 100644 --- a/src/Disks/DiskFactory.h +++ b/src/Disks/DiskFactory.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h index 47387fb370a..688c1dfad42 100644 --- a/src/Disks/IDisk.h +++ b/src/Disks/IDisk.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Disks/S3/ProxyConfiguration.h b/src/Disks/S3/ProxyConfiguration.h index 62aec0e005e..32a1c8d3c45 100644 --- a/src/Disks/S3/ProxyConfiguration.h +++ b/src/Disks/S3/ProxyConfiguration.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h index 54bff1eefc6..de53490dd3b 100644 --- a/src/Formats/FormatFactory.h +++ b/src/Formats/FormatFactory.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Formats/FormatSchemaInfo.h b/src/Formats/FormatSchemaInfo.h index 7af0d56a0cf..67f1baca84b 100644 --- a/src/Formats/FormatSchemaInfo.h +++ b/src/Formats/FormatSchemaInfo.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB { diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h index 70173bc847d..cd5cab8cf5a 100644 --- a/src/Formats/FormatSettings.h +++ b/src/Formats/FormatSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB diff --git a/src/Formats/IRowOutputStream.h b/src/Formats/IRowOutputStream.h index 3b18603ee69..7cf6251cd0d 100644 --- a/src/Formats/IRowOutputStream.h +++ b/src/Formats/IRowOutputStream.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace DB diff --git a/src/Formats/ParsedTemplateFormatString.h b/src/Formats/ParsedTemplateFormatString.h index 2da8a074679..f2e801faeab 100644 --- a/src/Formats/ParsedTemplateFormatString.h +++ b/src/Formats/ParsedTemplateFormatString.h @@ -1,8 +1,9 @@ #pragma once -#include +#include #include #include +#include #include #include @@ -10,6 +11,7 @@ namespace DB { class Block; +using Strings = std::vector; struct ParsedTemplateFormatString { diff --git a/src/Formats/ProtobufColumnMatcher.h b/src/Formats/ProtobufColumnMatcher.h index 03c5ec40fc6..35521be7a9b 100644 --- a/src/Formats/ProtobufColumnMatcher.h +++ b/src/Formats/ProtobufColumnMatcher.h @@ -8,7 +8,7 @@ # include # include # include -# include +# include # include # include # include diff --git a/src/Formats/ProtobufSchemas.h b/src/Formats/ProtobufSchemas.h index 590c479bcc8..05778a85343 100644 --- a/src/Formats/ProtobufSchemas.h +++ b/src/Formats/ProtobufSchemas.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include diff --git a/src/Functions/CustomWeekTransforms.h b/src/Functions/CustomWeekTransforms.h index 97752d51263..86e1c444a78 100644 --- a/src/Functions/CustomWeekTransforms.h +++ b/src/Functions/CustomWeekTransforms.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h index 6e2c3ea9ea6..6220d10a17d 100644 --- a/src/Functions/DateTimeTransforms.h +++ b/src/Functions/DateTimeTransforms.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Functions/DummyJSONParser.h b/src/Functions/DummyJSONParser.h index 4f4facba957..a71c90e4a19 100644 --- a/src/Functions/DummyJSONParser.h +++ b/src/Functions/DummyJSONParser.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace DB { diff --git a/src/Functions/FunctionsLogical.h b/src/Functions/FunctionsLogical.h index 474831b0b6d..068c3c6e63c 100644 --- a/src/Functions/FunctionsLogical.h +++ b/src/Functions/FunctionsLogical.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h index e54538c76b3..769d23b66dc 100644 --- a/src/Functions/GatherUtils/Algorithms.h +++ b/src/Functions/GatherUtils/Algorithms.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include "Sources.h" #include "Sinks.h" diff --git a/src/Functions/GeoHash.h b/src/Functions/GeoHash.h index 105384d714c..f918602d473 100644 --- a/src/Functions/GeoHash.h +++ b/src/Functions/GeoHash.h @@ -2,7 +2,7 @@ #include #include -#include +#include namespace DB diff --git a/src/Functions/PolygonUtils.h b/src/Functions/PolygonUtils.h index 88743312304..c8e96f0b63a 100644 --- a/src/Functions/PolygonUtils.h +++ b/src/Functions/PolygonUtils.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Functions/RapidJSONParser.h b/src/Functions/RapidJSONParser.h index e4d4718abc5..992480d64f7 100644 --- a/src/Functions/RapidJSONParser.h +++ b/src/Functions/RapidJSONParser.h @@ -5,7 +5,7 @@ #endif #if USE_RAPIDJSON -# include +# include # include # include diff --git a/src/Functions/SimdJSONParser.h b/src/Functions/SimdJSONParser.h index 30ecbce1ac5..a9adfa27e2c 100644 --- a/src/Functions/SimdJSONParser.h +++ b/src/Functions/SimdJSONParser.h @@ -5,7 +5,7 @@ #endif #if USE_SIMDJSON -# include +# include # include # include # include diff --git a/src/Functions/TargetSpecific.h b/src/Functions/TargetSpecific.h index ce20dfe2e60..bc433702180 100644 --- a/src/Functions/TargetSpecific.h +++ b/src/Functions/TargetSpecific.h @@ -1,6 +1,6 @@ #pragma once -#include +#include /* This file contains macros and helpers for writing platform-dependent code. * diff --git a/src/Functions/VectorExtension.h b/src/Functions/VectorExtension.h index 24c2ae9a18f..bffc04a6024 100644 --- a/src/Functions/VectorExtension.h +++ b/src/Functions/VectorExtension.h @@ -1,6 +1,6 @@ #pragma once -#include +#include // Contains types declarations and wrappers for GCC vector extension. namespace DB::VectorExtension diff --git a/src/Functions/abtesting.h b/src/Functions/abtesting.h index 1e9b9747505..24ec22e4a88 100644 --- a/src/Functions/abtesting.h +++ b/src/Functions/abtesting.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include diff --git a/src/Functions/formatString.h b/src/Functions/formatString.h index 591015f14cb..bea4fa2e1bc 100644 --- a/src/Functions/formatString.h +++ b/src/Functions/formatString.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Functions/likePatternToRegexp.h b/src/Functions/likePatternToRegexp.h index 24cb6ea78c7..4301ad18ee0 100644 --- a/src/Functions/likePatternToRegexp.h +++ b/src/Functions/likePatternToRegexp.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB { diff --git a/src/IO/BitHelpers.h b/src/IO/BitHelpers.h index 05eac24f1b0..0e2a08aa9a0 100644 --- a/src/IO/BitHelpers.h +++ b/src/IO/BitHelpers.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/IO/HexWriteBuffer.cpp b/src/IO/HexWriteBuffer.cpp index a7e804d00af..d7b8a993ce5 100644 --- a/src/IO/HexWriteBuffer.cpp +++ b/src/IO/HexWriteBuffer.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/IO/LimitReadBuffer.h b/src/IO/LimitReadBuffer.h index 545de6fd4a2..db3d2684ef7 100644 --- a/src/IO/LimitReadBuffer.h +++ b/src/IO/LimitReadBuffer.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/IO/ReadWriteBufferFromHTTP.h b/src/IO/ReadWriteBufferFromHTTP.h index 0eb2136ca6c..48407f76938 100644 --- a/src/IO/ReadWriteBufferFromHTTP.h +++ b/src/IO/ReadWriteBufferFromHTTP.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h index 45ec0ad90c6..d411c903676 100644 --- a/src/IO/S3Common.h +++ b/src/IO/S3Common.h @@ -4,7 +4,7 @@ #if USE_AWS_S3 -#include +#include #include #include #include diff --git a/src/IO/VarInt.h b/src/IO/VarInt.h index 30125f33081..8c57395a250 100644 --- a/src/IO/VarInt.h +++ b/src/IO/VarInt.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h index cabda4f2171..93a6947609e 100644 --- a/src/IO/WriteBufferFromS3.h +++ b/src/IO/WriteBufferFromS3.h @@ -6,7 +6,7 @@ # include # include -# include +# include # include # include # include diff --git a/src/IO/WriteBufferValidUTF8.cpp b/src/IO/WriteBufferValidUTF8.cpp index 0e04aa4c22d..f1f04e9805b 100644 --- a/src/IO/WriteBufferValidUTF8.cpp +++ b/src/IO/WriteBufferValidUTF8.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #ifdef __SSE2__ #include diff --git a/src/IO/tests/gtest_bit_io.cpp b/src/IO/tests/gtest_bit_io.cpp index 437ec13e93c..f75abf92f30 100644 --- a/src/IO/tests/gtest_bit_io.cpp +++ b/src/IO/tests/gtest_bit_io.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/IO/tests/gtest_peekable_read_buffer.cpp b/src/IO/tests/gtest_peekable_read_buffer.cpp index 0ba1e79799e..fb4b0b799b4 100644 --- a/src/IO/tests/gtest_peekable_read_buffer.cpp +++ b/src/IO/tests/gtest_peekable_read_buffer.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include #include diff --git a/src/IO/tests/o_direct_and_dirty_pages.cpp b/src/IO/tests/o_direct_and_dirty_pages.cpp index 8387ecac9e4..327d6357e9b 100644 --- a/src/IO/tests/o_direct_and_dirty_pages.cpp +++ b/src/IO/tests/o_direct_and_dirty_pages.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include #include diff --git a/src/IO/tests/read_buffer.cpp b/src/IO/tests/read_buffer.cpp index 952f8136a63..647382e667b 100644 --- a/src/IO/tests/read_buffer.cpp +++ b/src/IO/tests/read_buffer.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include diff --git a/src/IO/tests/read_buffer_perf.cpp b/src/IO/tests/read_buffer_perf.cpp index 74520a63041..a8198bce71f 100644 --- a/src/IO/tests/read_buffer_perf.cpp +++ b/src/IO/tests/read_buffer_perf.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include diff --git a/src/IO/tests/read_float_perf.cpp b/src/IO/tests/read_float_perf.cpp index aa0fa8ad15d..acfd294e0e7 100644 --- a/src/IO/tests/read_float_perf.cpp +++ b/src/IO/tests/read_float_perf.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/IO/tests/read_write_int.cpp b/src/IO/tests/read_write_int.cpp index 903940db5e4..c09db10cbe2 100644 --- a/src/IO/tests/read_write_int.cpp +++ b/src/IO/tests/read_write_int.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include #include diff --git a/src/IO/tests/write_buffer.cpp b/src/IO/tests/write_buffer.cpp index 8737f29cffb..14beb6d0539 100644 --- a/src/IO/tests/write_buffer.cpp +++ b/src/IO/tests/write_buffer.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include diff --git a/src/IO/tests/write_buffer_perf.cpp b/src/IO/tests/write_buffer_perf.cpp index 14a636e4570..096b58cb7c4 100644 --- a/src/IO/tests/write_buffer_perf.cpp +++ b/src/IO/tests/write_buffer_perf.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/src/Interpreters/ActionLocksManager.h b/src/Interpreters/ActionLocksManager.h index ea5d96ad8ce..a39d8b5784f 100644 --- a/src/Interpreters/ActionLocksManager.h +++ b/src/Interpreters/ActionLocksManager.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Interpreters/Aliases.h b/src/Interpreters/Aliases.h index 52159442224..0bdffe27933 100644 --- a/src/Interpreters/Aliases.h +++ b/src/Interpreters/Aliases.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Interpreters/BloomFilter.h b/src/Interpreters/BloomFilter.h index 0362f475d88..ccfb35bd68f 100644 --- a/src/Interpreters/BloomFilter.h +++ b/src/Interpreters/BloomFilter.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h index f3a99112170..99426716cb2 100644 --- a/src/Interpreters/ClientInfo.h +++ b/src/Interpreters/ClientInfo.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace DB diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h index 613889333c3..ff2af111885 100644 --- a/src/Interpreters/Context.h +++ b/src/Interpreters/Context.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Interpreters/DatabaseAndTableWithAlias.h b/src/Interpreters/DatabaseAndTableWithAlias.h index d4a1a582fdc..07a41c12983 100644 --- a/src/Interpreters/DatabaseAndTableWithAlias.h +++ b/src/Interpreters/DatabaseAndTableWithAlias.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/Interpreters/ExternalLoader.h b/src/Interpreters/ExternalLoader.h index 57b711d7f21..09915af2470 100644 --- a/src/Interpreters/ExternalLoader.h +++ b/src/Interpreters/ExternalLoader.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Interpreters/ExternalLoaderTempConfigRepository.h b/src/Interpreters/ExternalLoaderTempConfigRepository.h index 6ee717631cc..46e2eb846e9 100644 --- a/src/Interpreters/ExternalLoaderTempConfigRepository.h +++ b/src/Interpreters/ExternalLoaderTempConfigRepository.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Interpreters/ExternalLoaderXMLConfigRepository.h b/src/Interpreters/ExternalLoaderXMLConfigRepository.h index b89bc06e196..dd689856300 100644 --- a/src/Interpreters/ExternalLoaderXMLConfigRepository.h +++ b/src/Interpreters/ExternalLoaderXMLConfigRepository.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Interpreters/IExternalLoadable.h b/src/Interpreters/IExternalLoadable.h index 113d22df6bd..2d9a9abfa5f 100644 --- a/src/Interpreters/IExternalLoadable.h +++ b/src/Interpreters/IExternalLoadable.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace Poco::Util diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.h b/src/Interpreters/InJoinSubqueriesPreprocessor.h index 8d2e441e05f..4d46fabfd99 100644 --- a/src/Interpreters/InJoinSubqueriesPreprocessor.h +++ b/src/Interpreters/InJoinSubqueriesPreprocessor.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp index dbf6d5ae8d3..079fc792447 100644 --- a/src/Interpreters/InterpreterSelectQuery.cpp +++ b/src/Interpreters/InterpreterSelectQuery.cpp @@ -66,7 +66,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Interpreters/InterserverIOHandler.h b/src/Interpreters/InterserverIOHandler.h index 952c99ae46d..6d62c9651ca 100644 --- a/src/Interpreters/InterserverIOHandler.h +++ b/src/Interpreters/InterserverIOHandler.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Interpreters/RequiredSourceColumnsData.h b/src/Interpreters/RequiredSourceColumnsData.h index de1f3bc2721..d425989393e 100644 --- a/src/Interpreters/RequiredSourceColumnsData.h +++ b/src/Interpreters/RequiredSourceColumnsData.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include namespace DB diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp index a206456f1b6..7617f589eb7 100644 --- a/src/Interpreters/RowRefs.cpp +++ b/src/Interpreters/RowRefs.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Interpreters/StorageID.h b/src/Interpreters/StorageID.h index 36265b2a2b0..9343f67fe7a 100644 --- a/src/Interpreters/StorageID.h +++ b/src/Interpreters/StorageID.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h index a2e97747d12..03b1b735cbc 100644 --- a/src/Interpreters/SystemLog.h +++ b/src/Interpreters/SystemLog.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Interpreters/TablesStatus.h b/src/Interpreters/TablesStatus.h index c9e16e9615b..85290f69c87 100644 --- a/src/Interpreters/TablesStatus.h +++ b/src/Interpreters/TablesStatus.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include namespace DB diff --git a/src/Interpreters/addTypeConversionToAST.h b/src/Interpreters/addTypeConversionToAST.h index 56c3a636f45..1951eebc3f5 100644 --- a/src/Interpreters/addTypeConversionToAST.h +++ b/src/Interpreters/addTypeConversionToAST.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/Interpreters/tests/hash_map.cpp b/src/Interpreters/tests/hash_map.cpp index dc87fd9ddde..620f2515825 100644 --- a/src/Interpreters/tests/hash_map.cpp +++ b/src/Interpreters/tests/hash_map.cpp @@ -11,7 +11,7 @@ /* #define DBMS_HASH_MAP_COUNT_COLLISIONS */ -#include +#include #include #include #include diff --git a/src/Interpreters/tests/hash_map3.cpp b/src/Interpreters/tests/hash_map3.cpp index 1b4ce8eac77..132e6fe9e87 100644 --- a/src/Interpreters/tests/hash_map3.cpp +++ b/src/Interpreters/tests/hash_map3.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/src/Interpreters/tests/hash_map_lookup.cpp b/src/Interpreters/tests/hash_map_lookup.cpp index 926e6b6766e..39c43023b20 100644 --- a/src/Interpreters/tests/hash_map_lookup.cpp +++ b/src/Interpreters/tests/hash_map_lookup.cpp @@ -8,7 +8,7 @@ #define DBMS_HASH_MAP_DEBUG_RESIZES #include -#include +#include #include #include #include diff --git a/src/Interpreters/tests/hash_map_string.cpp b/src/Interpreters/tests/hash_map_string.cpp index 2f35ea2bdc8..c51d1a6db01 100644 --- a/src/Interpreters/tests/hash_map_string.cpp +++ b/src/Interpreters/tests/hash_map_string.cpp @@ -12,7 +12,7 @@ //#define DBMS_HASH_MAP_COUNT_COLLISIONS #define DBMS_HASH_MAP_DEBUG_RESIZES -#include +#include #include #include #include diff --git a/src/Interpreters/tests/hash_map_string_2.cpp b/src/Interpreters/tests/hash_map_string_2.cpp index 5f6954cb0b0..a75978c9e13 100644 --- a/src/Interpreters/tests/hash_map_string_2.cpp +++ b/src/Interpreters/tests/hash_map_string_2.cpp @@ -7,7 +7,7 @@ //#define DBMS_HASH_MAP_COUNT_COLLISIONS #define DBMS_HASH_MAP_DEBUG_RESIZES -#include +#include #include #include #include diff --git a/src/Interpreters/tests/hash_map_string_3.cpp b/src/Interpreters/tests/hash_map_string_3.cpp index 3dfbe5fb0f2..d0bf9093374 100644 --- a/src/Interpreters/tests/hash_map_string_3.cpp +++ b/src/Interpreters/tests/hash_map_string_3.cpp @@ -10,7 +10,7 @@ #define DBMS_HASH_MAP_COUNT_COLLISIONS #define DBMS_HASH_MAP_DEBUG_RESIZES -#include +#include #include #include #include diff --git a/src/Interpreters/tests/hash_map_string_small.cpp b/src/Interpreters/tests/hash_map_string_small.cpp index 7dac9691dc9..fe81c120d90 100644 --- a/src/Interpreters/tests/hash_map_string_small.cpp +++ b/src/Interpreters/tests/hash_map_string_small.cpp @@ -12,7 +12,7 @@ //#define DBMS_HASH_MAP_COUNT_COLLISIONS #define DBMS_HASH_MAP_DEBUG_RESIZES -#include +#include #include #include #include diff --git a/src/Interpreters/tests/string_hash_map.cpp b/src/Interpreters/tests/string_hash_map.cpp index 3969458fced..3420918887c 100644 --- a/src/Interpreters/tests/string_hash_map.cpp +++ b/src/Interpreters/tests/string_hash_map.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Interpreters/tests/two_level_hash_map.cpp b/src/Interpreters/tests/two_level_hash_map.cpp index 604f0de2976..f79be16e095 100644 --- a/src/Interpreters/tests/two_level_hash_map.cpp +++ b/src/Interpreters/tests/two_level_hash_map.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Parsers/ASTFunctionWithKeyValueArguments.h b/src/Parsers/ASTFunctionWithKeyValueArguments.h index 786d31d9e35..88ab712cc04 100644 --- a/src/Parsers/ASTFunctionWithKeyValueArguments.h +++ b/src/Parsers/ASTFunctionWithKeyValueArguments.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace DB { diff --git a/src/Parsers/ASTRolesOrUsersSet.h b/src/Parsers/ASTRolesOrUsersSet.h index f257ce1066c..f18aa0bdd73 100644 --- a/src/Parsers/ASTRolesOrUsersSet.h +++ b/src/Parsers/ASTRolesOrUsersSet.h @@ -5,6 +5,9 @@ namespace DB { + +using Strings = std::vector; + /// Represents a set of users/roles like /// {user_name | role_name | CURRENT_USER} [,...] | NONE | ALL | ALL EXCEPT {user_name | role_name | CURRENT_USER} [,...] class ASTRolesOrUsersSet : public IAST diff --git a/src/Parsers/ASTShowCreateAccessEntityQuery.h b/src/Parsers/ASTShowCreateAccessEntityQuery.h index f112e9211fe..10c4c0ca511 100644 --- a/src/Parsers/ASTShowCreateAccessEntityQuery.h +++ b/src/Parsers/ASTShowCreateAccessEntityQuery.h @@ -8,6 +8,8 @@ namespace DB { class ASTRowPolicyNames; +using Strings = std::vector; + /** SHOW CREATE USER [name | CURRENT_USER] * SHOW CREATE USERS [name [, name2 ...] * SHOW CREATE ROLE name diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h index cf6a7efc102..c88c80021d6 100644 --- a/src/Parsers/IAST.h +++ b/src/Parsers/IAST.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Parsers/IParser.h b/src/Parsers/IParser.h index 69c199c201e..05ceb8c900b 100644 --- a/src/Parsers/IParser.h +++ b/src/Parsers/IParser.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Parsers/StringRange.h b/src/Parsers/StringRange.h index 45b1b0dfbd1..1fc285a562e 100644 --- a/src/Parsers/StringRange.h +++ b/src/Parsers/StringRange.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Parsers/formatSettingName.h b/src/Parsers/formatSettingName.h index 40f14d95b4f..c9ed94dcc7d 100644 --- a/src/Parsers/formatSettingName.h +++ b/src/Parsers/formatSettingName.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB diff --git a/src/Parsers/tests/gtest_dictionary_parser.cpp b/src/Parsers/tests/gtest_dictionary_parser.cpp index d1ec5088482..6b777af77a2 100644 --- a/src/Parsers/tests/gtest_dictionary_parser.cpp +++ b/src/Parsers/tests/gtest_dictionary_parser.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/Parsers/tests/lexer.cpp b/src/Parsers/tests/lexer.cpp index b1d0bb6212c..d54267c135e 100644 --- a/src/Parsers/tests/lexer.cpp +++ b/src/Parsers/tests/lexer.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/src/Parsers/tests/lexer_fuzzer.cpp b/src/Parsers/tests/lexer_fuzzer.cpp index 8ebe39cb67b..8b0a7da238b 100644 --- a/src/Parsers/tests/lexer_fuzzer.cpp +++ b/src/Parsers/tests/lexer_fuzzer.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp index bf825e367c8..4ad7743151a 100644 --- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp +++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Server/StaticRequestHandler.h b/src/Server/StaticRequestHandler.h index 707087df24d..a5ac44683a1 100644 --- a/src/Server/StaticRequestHandler.h +++ b/src/Server/StaticRequestHandler.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include diff --git a/src/Storages/CheckResults.h b/src/Storages/CheckResults.h index 245f580f625..8fa0bb910d3 100644 --- a/src/Storages/CheckResults.h +++ b/src/Storages/CheckResults.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace DB diff --git a/src/Storages/ColumnDependency.h b/src/Storages/ColumnDependency.h index 3f5290efa35..606b8b3dc5f 100644 --- a/src/Storages/ColumnDependency.h +++ b/src/Storages/ColumnDependency.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include namespace DB diff --git a/src/Storages/IStorage_fwd.h b/src/Storages/IStorage_fwd.h index 015c74fa9a6..98ae9bea7c2 100644 --- a/src/Storages/IStorage_fwd.h +++ b/src/Storages/IStorage_fwd.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Storages/IndicesDescription.h b/src/Storages/IndicesDescription.h index 464e466dcd0..f383029837e 100644 --- a/src/Storages/IndicesDescription.h +++ b/src/Storages/IndicesDescription.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h index 6def7b8ec0b..1d889655941 100644 --- a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h +++ b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/Storages/MergeTree/ActiveDataPartSet.h b/src/Storages/MergeTree/ActiveDataPartSet.h index e17f4903a26..323ef3c4830 100644 --- a/src/Storages/MergeTree/ActiveDataPartSet.h +++ b/src/Storages/MergeTree/ActiveDataPartSet.h @@ -1,13 +1,16 @@ #pragma once #include -#include +#include #include +#include namespace DB { +using Strings = std::vector; + /** Supports multiple names of active parts of data. * Repeats part of the MergeTreeData functionality. * TODO: generalize with MergeTreeData diff --git a/src/Storages/MergeTree/BackgroundProcessingPool.h b/src/Storages/MergeTree/BackgroundProcessingPool.h index 8bed696ab2c..c1e44ee5cc8 100644 --- a/src/Storages/MergeTree/BackgroundProcessingPool.h +++ b/src/Storages/MergeTree/BackgroundProcessingPool.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h index 7df0468dc13..78daf6c9017 100644 --- a/src/Storages/MergeTree/IMergeTreeDataPart.h +++ b/src/Storages/MergeTree/IMergeTreeDataPart.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/MergeAlgorithm.h b/src/Storages/MergeTree/MergeAlgorithm.h index 813767f9fb1..23d6fc7137e 100644 --- a/src/Storages/MergeTree/MergeAlgorithm.h +++ b/src/Storages/MergeTree/MergeAlgorithm.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB { diff --git a/src/Storages/MergeTree/MergeTreeDataFormatVersion.h b/src/Storages/MergeTree/MergeTreeDataFormatVersion.h index 4b492a9fb61..7b21ac31609 100644 --- a/src/Storages/MergeTree/MergeTreeDataFormatVersion.h +++ b/src/Storages/MergeTree/MergeTreeDataFormatVersion.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace DB diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h index 89e1ba1d78a..3aa77678520 100644 --- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h +++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/MergeTreeDataPartType.h b/src/Storages/MergeTree/MergeTreeDataPartType.h index bb87918d3a5..44e170141f6 100644 --- a/src/Storages/MergeTree/MergeTreeDataPartType.h +++ b/src/Storages/MergeTree/MergeTreeDataPartType.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB { diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp index 421d0e8b38c..5a5dfffe287 100644 --- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp +++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h index a30d569150c..21a86f9bcea 100644 --- a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h +++ b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/Storages/MergeTree/MergeTreeMutationEntry.h b/src/Storages/MergeTree/MergeTreeMutationEntry.h index ccdea771e93..278babb67b9 100644 --- a/src/Storages/MergeTree/MergeTreeMutationEntry.h +++ b/src/Storages/MergeTree/MergeTreeMutationEntry.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/MergeTreeMutationStatus.h b/src/Storages/MergeTree/MergeTreeMutationStatus.h index d3a66bd09d6..94d9294624f 100644 --- a/src/Storages/MergeTree/MergeTreeMutationStatus.h +++ b/src/Storages/MergeTree/MergeTreeMutationStatus.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h index 80b0d3508e0..416308861b7 100644 --- a/src/Storages/MergeTree/MergeTreePartInfo.h +++ b/src/Storages/MergeTree/MergeTreePartInfo.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/Storages/MergeTree/MergeTreePartition.h b/src/Storages/MergeTree/MergeTreePartition.h index 947fb3ec504..f89b6f22d4f 100644 --- a/src/Storages/MergeTree/MergeTreePartition.h +++ b/src/Storages/MergeTree/MergeTreePartition.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/Storages/MergeTree/MergeType.h b/src/Storages/MergeTree/MergeType.h index 490c9b8c822..f7e99f98c8c 100644 --- a/src/Storages/MergeTree/MergeType.h +++ b/src/Storages/MergeTree/MergeType.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB { diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h b/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h index 2a620515278..8e7ab0c69fe 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h index ac169d248c2..fa3ede20c28 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h @@ -2,7 +2,7 @@ #include #include -#include +#include namespace Poco { class Logger; } diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h index f4191482d64..520af888621 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h index 2f5d038291b..e14a884ca1c 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h index 1b44a5dec75..cfcc3dec6f2 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h index e86356e1346..4239d7a8051 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h b/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h index 90cc327cf4b..7bc2b72d2d5 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h index e3bb658b2d0..ee12cabb5aa 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h index 1a8b0bf6378..bb032d9df8c 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h index 59b7c9bee47..c1c34637664 100644 --- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h +++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include namespace DB diff --git a/src/Storages/MergeTree/TTLMergeSelector.h b/src/Storages/MergeTree/TTLMergeSelector.h index 1d41b65f9fb..73d364f28c7 100644 --- a/src/Storages/MergeTree/TTLMergeSelector.h +++ b/src/Storages/MergeTree/TTLMergeSelector.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/Storages/MergeTree/localBackup.h b/src/Storages/MergeTree/localBackup.h index 3c9d92fa9da..630767c9ec6 100644 --- a/src/Storages/MergeTree/localBackup.h +++ b/src/Storages/MergeTree/localBackup.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include namespace DB diff --git a/src/Storages/PartitionCommands.h b/src/Storages/PartitionCommands.h index 242f8f5e2c1..e4f70305dbd 100644 --- a/src/Storages/PartitionCommands.h +++ b/src/Storages/PartitionCommands.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h index 1877fdfba35..109770c77e9 100644 --- a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h +++ b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/Storages/StorageLogSettings.h b/src/Storages/StorageLogSettings.h index c970cd6be37..0918c50aa19 100644 --- a/src/Storages/StorageLogSettings.h +++ b/src/Storages/StorageLogSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace DB { diff --git a/src/Storages/StorageS3Settings.h b/src/Storages/StorageS3Settings.h index ac31928a240..19b2bf48bd8 100644 --- a/src/Storages/StorageS3Settings.h +++ b/src/Storages/StorageS3Settings.h @@ -3,7 +3,8 @@ #include #include #include -#include +#include +#include namespace Poco::Util { diff --git a/src/Storages/transformQueryForExternalDatabase.h b/src/Storages/transformQueryForExternalDatabase.h index 09de53e36d3..c760c628970 100644 --- a/src/Storages/transformQueryForExternalDatabase.h +++ b/src/Storages/transformQueryForExternalDatabase.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/src/TableFunctions/TableFunctionNumbers.h b/src/TableFunctions/TableFunctionNumbers.h index c3efbc426ef..13064a3309e 100644 --- a/src/TableFunctions/TableFunctionNumbers.h +++ b/src/TableFunctions/TableFunctionNumbers.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace DB diff --git a/src/TableFunctions/TableFunctionView.h b/src/TableFunctions/TableFunctionView.h index 49f51823735..43d55a7dcb8 100644 --- a/src/TableFunctions/TableFunctionView.h +++ b/src/TableFunctions/TableFunctionView.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace DB diff --git a/src/TableFunctions/TableFunctionZeros.h b/src/TableFunctions/TableFunctionZeros.h index 71570c23a89..cae4604b1d7 100644 --- a/src/TableFunctions/TableFunctionZeros.h +++ b/src/TableFunctions/TableFunctionZeros.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace DB