Merge pull request #32580 from azat/remove-arcadia

Remove arcadia build support

.gitattributes

@@ -1,4 +1,2 @@
 contrib/* linguist-vendored
 *.h linguist-language=C++
-# to avoid frequent conflicts
-tests/queries/0_stateless/arcadia_skip_list.txt text merge=union

programs/client/Client.cpp

@@ -20,9 +20,7 @@
 #include <base/argsToConfig.h>
 #include <base/find_symbols.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
+#include <Common/config_version.h>
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
 #include <Common/TerminalSize.h>

programs/keeper/Keeper.cpp

@@ -22,10 +22,8 @@
 #include <pwd.h>
 #include <Coordination/FourLetterCommand.h>
 
-#if !defined(ARCADIA_BUILD)
-#   include "config_core.h"
-#   include "Common/config_version.h"
-#endif
+#include "config_core.h"
+#include "Common/config_version.h"
 
 #if USE_SSL
 #    include <Poco/Net/Context.h>

programs/main.cpp

@@ -13,9 +13,7 @@
 #include <tuple>
 #include <utility> /// pair
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_tools.h"
-#endif
+#include "config_tools.h"
 
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/getHashOfLoadedBinary.h>

programs/server/Server.cpp

@@ -82,10 +82,8 @@
 #include <Compression/CompressionCodecEncrypted.h>
 #include <filesystem>
 
-#if !defined(ARCADIA_BUILD)
-#   include "config_core.h"
-#   include "Common/config_version.h"
-#endif
+#include "config_core.h"
+#include "Common/config_version.h"
 
 #if defined(OS_LINUX)
 #    include <sys/mman.h>
@@ -96,7 +94,7 @@
 #endif
 
 #if USE_SSL
-#    if USE_INTERNAL_SSL_LIBRARY  && !defined(ARCADIA_BUILD)
+#    if USE_INTERNAL_SSL_LIBRARY
 #        include <Compression/CompressionCodecEncrypted.h>
 #    endif
 #    include <Poco/Net/Context.h>

src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h

@@ -1,9 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
-
 #include <IO/ReadBufferFromFile.h>
 #include <IO/AsynchronousReader.h>
 #include <utility>

src/Disks/IO/ReadBufferFromRemoteFSGather.h

@@ -1,9 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
-
 #include <Disks/IDiskRemote.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadSettings.h>

src/Server/PostgreSQLHandler.h

@@ -1,15 +1,12 @@
 #pragma once
 
 #include <Common/CurrentMetrics.h>
+#include <Common/config.h>
 #include <Core/PostgreSQLProtocol.h>
 #include <Poco/Net/TCPServerConnection.h>
 #include <base/logger_useful.h>
 #include "IServer.h"
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
-
 #if USE_SSL
 #   include <Poco/Net/SecureStreamSocket.h>
 #endif

src/Server/PostgreSQLHandlerFactory.h

@@ -5,10 +5,7 @@
 #include <memory>
 #include <Server/IServer.h>
 #include <Core/PostgreSQLProtocol.h>
-
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 namespace DB
 {