Continue on garbage removal

base/base/EnumReflection.h

@@ -3,6 +3,7 @@
 #include <magic_enum.hpp>
 #include <fmt/format.h>
 
+
 template <class T> concept is_enum = std::is_enum_v<T>;
 
 namespace detail

src/Common/LoggingFormatStringHelpers.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <base/defines.h>
 #include <base/types.h>
 #include <fmt/format.h>
@@ -6,6 +7,8 @@
 #include <unordered_map>
 #include <Poco/Logger.h>
 #include <Poco/Message.h>
+#include <base/EnumReflection.h>
+
 
 struct PreformattedMessage;
 consteval void formatStringCheckArgsNumImpl(std::string_view str, size_t nargs);

src/Common/NamedCollections/NamedCollectionConfiguration.cpp

@@ -3,6 +3,8 @@
 #include <Common/Exception.h>
 #include <Common/SettingsChanges.h>
 #include <Common/FieldVisitorToString.h>
+#include <magic_enum.hpp>
+
 
 namespace DB
 {

src/Core/Field.cpp

@@ -9,16 +9,24 @@
 #include <Common/FieldVisitorDump.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/FieldVisitorWriteBinary.h>
+#include <base/EnumReflection.h>
 
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int CANNOT_RESTORE_FROM_FIELD_DUMP;
     extern const int DECIMAL_OVERFLOW;
 }
 
+/// Keep in mind, that "magic_enum" is very expensive for compiler.
+std::string_view Field::getTypeName() const
+{
+    return magic_enum::enum_name(which);
+}
+
 inline Field getBinaryValue(UInt8 type, ReadBuffer & buf)
 {
     switch (type)

src/Core/Field.h

@@ -15,8 +15,7 @@
 #include <Core/UUID.h>
 #include <base/IPv4andIPv6.h>
 #include <base/DayNum.h>
-#include <base/strong_typedef.h>
-#include <base/EnumReflection.h>
+
 
 namespace DB
 {
@@ -449,7 +448,7 @@ public:
 
     Types::Which getType() const { return which; }
 
-    constexpr std::string_view getTypeName() const { return magic_enum::enum_name(which); }
+    std::string_view getTypeName() const;
 
     bool isNull() const { return which == Types::Null; }
     template <typename T>

src/Core/SettingsFields.h

@@ -10,6 +10,8 @@
 #include <chrono>
 #include <unordered_map>
 #include <string_view>
+#include <magic_enum.hpp>
+
 
 namespace DB
 {

src/IO/S3/Credentials.cpp

@@ -14,26 +14,26 @@
 #    include <Common/logger_useful.h>
 
 #    include <IO/S3/PocoHTTPClient.h>
-#    include <IO/S3/PocoHTTPClientFactory.h>
 #    include <IO/S3/Client.h>
-#    include <IO/S3Common.h>
 
 #    include <fstream>
+#    include <base/EnumReflection.h>
 
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int AWS_ERROR;
 }
-}
 
-namespace DB::S3
+namespace S3
 {
 
 namespace
 {
+
 bool areCredentialsEmptyOrExpired(const Aws::Auth::AWSCredentials & credentials, uint64_t expiration_window_seconds)
 {
     if (credentials.IsEmpty())
@@ -569,4 +569,6 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
 
 }
 
+}
+
 #endif