From 57c027be0eff6c7c58788c4f442afd1cddb95264 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Dec 2021 21:25:23 +0300
Subject: [PATCH 1/2] Remove arcadia build support

---
 programs/client/Client.cpp                                | 4 +---
 programs/keeper/Keeper.cpp                                | 6 ++----
 programs/main.cpp                                         | 4 +---
 programs/server/Server.cpp                                | 8 +++-----
 src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h | 3 ---
 src/Disks/IO/ReadBufferFromRemoteFSGather.h               | 3 ---
 src/Server/PostgreSQLHandler.h                            | 5 +----
 src/Server/PostgreSQLHandlerFactory.h                     | 5 +----
 8 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index b6214d66628..e01677aaac6 100644
--- a/programs/client/Client.cpp
+++ b/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>
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
index 4dadef911d7..afd6a36ea15 100644
--- a/programs/keeper/Keeper.cpp
+++ b/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>
diff --git a/programs/main.cpp b/programs/main.cpp
index cd416f57982..2cdda075ca7 100644
--- a/programs/main.cpp
+++ b/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>
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index bd99b047e6b..14075f9fbf2 100644
--- a/programs/server/Server.cpp
+++ b/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>
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
index c9b6532e76c..1b0cc17cb41 100644
--- a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
+++ b/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>
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.h b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
index 5bc7d4e4819..f15de4a2d7f 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.h
+++ b/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>
diff --git a/src/Server/PostgreSQLHandler.h b/src/Server/PostgreSQLHandler.h
index ded9616296a..1d33f41f255 100644
--- a/src/Server/PostgreSQLHandler.h
+++ b/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
diff --git a/src/Server/PostgreSQLHandlerFactory.h b/src/Server/PostgreSQLHandlerFactory.h
index 9103cbaad90..dc3d4047d2a 100644
--- a/src/Server/PostgreSQLHandlerFactory.h
+++ b/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
 {

From 8268d8a8c3677c4872ab41b55d91584cd6e68f3f Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Dec 2021 21:27:36 +0300
Subject: [PATCH 2/2] Cleanup .gitattributes

---
 .gitattributes | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index efb059f169a..bcc7d57b904 100644
--- a/.gitattributes
+++ b/.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