libs: compiling with msvc2017 (#1996)

* Allow use bundled *ssl library

* fix

* Add submodule

* Fixes

* fix

* fixes

* fixes

* fix

* fix

* update poco

* fix warnings

* fix

* fix

* Build fixes

* Build fixes

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add bat

* no zookeeper in dbms

* update boost

* fixes

* fixes

* fix

* fix

* fix

* fix

* try fix

* try fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* Better

* fix

* dh verbose

* fix

* dh verbose

* fix

* clean

* Update LocalDate.h

* Update LocalDateTime.h

cmake/find_poco.cmake

@@ -49,7 +49,8 @@ elseif (NOT MISSING_INTERNAL_POCO_LIBRARY)
         set (Poco_DataODBC_INCLUDE_DIRS "${ClickHouse_SOURCE_DIR}/contrib/poco/Data/ODBC/include/")
     endif ()
 
-    if (OPENSSL_FOUND)
+    # TODO! fix internal ssl
+    if (OPENSSL_FOUND AND NOT USE_INTERNAL_SSL_LIBRARY)
         set (Poco_NetSSL_FOUND 1)
         set (Poco_NetSSL_LIBRARY PocoNetSSL)
         set (Poco_Crypto_LIBRARY PocoCrypto)

contrib/CMakeLists.txt

@@ -100,13 +100,17 @@ if (USE_INTERNAL_RDKAFKA_LIBRARY)
     mark_as_advanced (ZLIB_INCLUDE_DIR)
 
     if (USE_INTERNAL_SSL_LIBRARY)
-        add_library(bundled-ssl ALIAS ${OPENSSL_SSL_LIBRARY})
-        set (WITH_BUNDLED_SSL 1)
+        if (MAKE_STATIC_LIBRARIES)
+            add_library(bundled-ssl ALIAS ${OPENSSL_SSL_LIBRARY})
+            set (WITH_BUNDLED_SSL 1 CACHE INTERNAL "")
+        else ()
+            set (WITH_SSL 0 CACHE INTERNAL "")
+        endif ()
     endif ()
 
     add_subdirectory (librdkafka)
 
-    if (USE_INTERNAL_SSL_LIBRARY)
+    if (USE_INTERNAL_SSL_LIBRARY AND MAKE_STATIC_LIBRARIES)
         target_include_directories(rdkafka PRIVATE BEFORE ${OPENSSL_INCLUDE_DIR})
     endif ()
     target_include_directories(rdkafka PRIVATE BEFORE ${ZLIB_INCLUDE_DIR})
@@ -127,16 +131,18 @@ endif ()
 
 
 if (USE_INTERNAL_POCO_LIBRARY)
-    set (ALLOW_DUPLICATE_CUSTOM_TARGETS 1)
     set (save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
     set (save_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
     set (_save ${ENABLE_TESTS})
     set (ENABLE_TESTS 0)
     set (CMAKE_DISABLE_FIND_PACKAGE_ZLIB 1)
     if (USE_INTERNAL_SSL_LIBRARY)
-        set (DISABLE_INTERNAL_OPENSSL 1)
-        set (ENABLE_NETSSL 0) # TODO!
-        set (ENABLE_CRYPTO 0) # TODO!
+        set (DISABLE_INTERNAL_OPENSSL 1 CACHE INTERNAL "")
+        set (ENABLE_NETSSL 0 CACHE INTERNAL "") # TODO!
+        set (ENABLE_CRYPTO 0 CACHE INTERNAL "") # TODO!
+    endif ()
+    if (MSVC)
+        set (ENABLE_DATA_ODBC 0 CACHE INTERNAL "") # TODO (build fail)
     endif ()
     add_subdirectory (poco)
     unset (CMAKE_DISABLE_FIND_PACKAGE_ZLIB)

boost @ 5121cc9d

-Subproject commit eb5943711e88d1008583e6ae3720a5489313d02e
+Subproject commit 5121cc9d0375c7b81b24b6087a51684e6cd62ded

contrib/libcityhash/src/config.h

@@ -5,7 +5,11 @@
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Define to 1 if the compiler supports __builtin_expect. */
+#if _MSC_VER
+#define HAVE_BUILTIN_EXPECT 0
+#else
 #define HAVE_BUILTIN_EXPECT 1
+#endif
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1

contrib/libfarmhash/CMakeLists.txt

@@ -2,4 +2,8 @@ add_library(farmhash
 	farmhash.cc
 	farmhash.h)
 
+if (MSVC)
+    target_compile_definitions (farmhash PRIVATE FARMHASH_NO_BUILTIN_EXPECT=1)
+endif ()
+
 target_include_directories (farmhash PUBLIC ${CMAKE_CURRENT_BINARY_DIR})

contrib/libtcmalloc/src/config.h

@@ -13,7 +13,11 @@
 /* #undef ENABLE_SIZED_DELETE */
 
 /* Define to 1 if compiler supports __builtin_expect */
+#if _MSC_VER
+#define HAVE_BUILTIN_EXPECT 0
+#else
 #define HAVE_BUILTIN_EXPECT 1
+#endif
 
 /* Define to 1 if compiler supports __builtin_stack_pointer */
 /* #undef HAVE_BUILTIN_STACK_POINTER */

dbms/CMakeLists.txt

@@ -131,7 +131,6 @@ target_link_libraries (clickhouse_common_io
     ${LINK_LIBRARIES_ONLY_ON_X86_64}
     ${LZ4_LIBRARY}
     ${ZSTD_LIBRARY}
-    ${ZOOKEEPER_LIBRARY}
     ${DOUBLE_CONVERSION_LIBRARIES}
     ${Poco_Net_LIBRARY}
     ${Poco_Data_LIBRARY}
@@ -158,10 +157,6 @@ if (NOT USE_INTERNAL_RE2_LIBRARY)
     target_include_directories (dbms BEFORE PRIVATE ${RE2_INCLUDE_DIR})
 endif ()
 
-if (NOT USE_INTERNAL_ZOOKEEPER_LIBRARY)
-    target_include_directories (clickhouse_common_io BEFORE PUBLIC ${ZOOKEEPER_INCLUDE_DIR})
-endif ()
-
 if (NOT USE_INTERNAL_BOOST_LIBRARY)
     target_include_directories (clickhouse_common_io BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
 endif ()

dbms/src/Common/AIO.h

 #pragma once
 
-#if !(defined(__FreeBSD__) || defined(__APPLE__))
+#if !(defined(__FreeBSD__) || defined(__APPLE__) || defined(_MSC_VER))
 
 #include <Common/Exception.h>
 #include <common/logger_useful.h>

dbms/src/Common/ShellCommand.cpp

 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <dlfcn.h>
-
 #include <Common/Exception.h>
 #include <Common/ShellCommand.h>
 #include <IO/WriteBufferFromVector.h>
 #include <IO/WriteHelpers.h>
+#include <port/unistd.h>
 
 
 namespace DB

dbms/src/Common/ZooKeeper/CMakeLists.txt

@@ -5,7 +5,11 @@ add_headers_and_sources(clickhouse_common_zookeeper .)
 
 add_library(clickhouse_common_zookeeper ${SPLIT_SHARED} ${clickhouse_common_zookeeper_headers} ${clickhouse_common_zookeeper_sources})
 
-target_link_libraries (clickhouse_common_zookeeper clickhouse_common_io)
+if (NOT USE_INTERNAL_ZOOKEEPER_LIBRARY)
+    target_include_directories (clickhouse_common_zookeeper BEFORE PUBLIC ${ZOOKEEPER_INCLUDE_DIR})
+endif ()
+
+target_link_libraries (clickhouse_common_zookeeper clickhouse_common_io ${ZOOKEEPER_LIBRARY})
 
 if (ENABLE_TESTS)
     add_subdirectory (tests)

dbms/src/Common/ZooKeeper/ZooKeeper.h

@@ -8,10 +8,10 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <unistd.h>
 #include <common/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
+#include <port/unistd.h>
 
 
 namespace ProfileEvents

dbms/src/Common/ZooKeeper/tests/zkutil_test_commands.cpp

 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <iostream>
-#include <unistd.h>
+#include <port/unistd.h>
 
 using namespace zkutil;
 

dbms/src/Common/localBackup.cpp

 #include <sys/stat.h>
-#include <unistd.h>
-
 #include <string>
 #include <iostream>
-
 #include <Poco/DirectoryIterator.h>
 #include <Poco/File.h>
-
 #include <Common/Exception.h>
+#include <port/unistd.h>
 
 
 namespace DB

dbms/src/Common/randomSeed.cpp

 #include <time.h>
-#include <unistd.h>
+#include <port/unistd.h>
 #include <sys/types.h>
-
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
 #include <Common/SipHash.h>
 #include <Core/Types.h>
-
 #ifdef __APPLE__
 #include <common/apple_rt.h>
 #endif

dbms/src/Common/tests/compact_array.cpp

@@ -7,15 +7,13 @@
 #include <Common/CompactArray.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
-
 #include <boost/filesystem.hpp>
-
 #include <string>
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
-#include <unistd.h>
 #include <cstdlib>
+#include <port/unistd.h>
 
 namespace fs = boost::filesystem;
 

dbms/src/Core/Defines.h

@@ -74,8 +74,18 @@
 #define DEFAULT_HTTP_READ_BUFFER_TIMEOUT 1800
 #define DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT 1
 
-#define ALWAYS_INLINE __attribute__((__always_inline__))
-#define NO_INLINE __attribute__((__noinline__))
+// more aliases: https://mailman.videolan.org/pipermail/x264-devel/2014-May/010660.html
+
+#if defined(_MSC_VER)
+    #define ALWAYS_INLINE __forceinline
+    #define NO_INLINE static __declspec(noinline)
+    #define MAY_ALIAS
+#else
+    #define ALWAYS_INLINE __attribute__((__always_inline__))
+    #define NO_INLINE __attribute__((__noinline__))
+    #define MAY_ALIAS __attribute__((__may_alias__))
+#endif
+
 
 #define PLATFORM_NOT_SUPPORTED "The only supported platforms are x86_64 and AArch64 (work in progress)"
 

dbms/src/Core/Field.h

@@ -198,14 +198,14 @@ public:
     template <typename T> T & get()
     {
         using TWithoutRef = std::remove_reference_t<T>;
-        TWithoutRef * __attribute__((__may_alias__)) ptr = reinterpret_cast<TWithoutRef*>(&storage);
+        TWithoutRef * MAY_ALIAS ptr = reinterpret_cast<TWithoutRef*>(&storage);
         return *ptr;
     };
 
     template <typename T> const T & get() const
     {
         using TWithoutRef = std::remove_reference_t<T>;
-        const TWithoutRef * __attribute__((__may_alias__)) ptr = reinterpret_cast<const TWithoutRef*>(&storage);
+        const TWithoutRef * MAY_ALIAS ptr = reinterpret_cast<const TWithoutRef*>(&storage);
         return *ptr;
     };
 
@@ -340,7 +340,7 @@ private:
     void createConcrete(T && x)
     {
         using JustT = std::decay_t<T>;
-        JustT * __attribute__((__may_alias__)) ptr = reinterpret_cast<JustT *>(&storage);
+        JustT * MAY_ALIAS ptr = reinterpret_cast<JustT *>(&storage);
         new (ptr) JustT(std::forward<T>(x));
         which = TypeToEnum<JustT>::value;
     }
@@ -350,7 +350,7 @@ private:
     void assignConcrete(T && x)
     {
         using JustT = std::decay_t<T>;
-        JustT * __attribute__((__may_alias__)) ptr = reinterpret_cast<JustT *>(&storage);
+        JustT * MAY_ALIAS ptr = reinterpret_cast<JustT *>(&storage);
         *ptr = std::forward<T>(x);
     }
 
@@ -398,7 +398,7 @@ private:
 
     void create(const char * data, size_t size)
     {
-        String * __attribute__((__may_alias__)) ptr = reinterpret_cast<String*>(&storage);
+        String * MAY_ALIAS ptr = reinterpret_cast<String*>(&storage);
         new (ptr) String(data, size);
         which = Types::String;
     }
@@ -434,7 +434,7 @@ private:
     template <typename T>
     void destroy()
     {
-        T * __attribute__((__may_alias__)) ptr = reinterpret_cast<T*>(&storage);
+        T * MAY_ALIAS ptr = reinterpret_cast<T*>(&storage);
         ptr->~T();
     }
 };

dbms/src/DataStreams/PrettyBlockOutputStream.cpp

 #include <sys/ioctl.h>
-#include <unistd.h>
-
+#include <port/unistd.h>
 #include <DataStreams/PrettyBlockOutputStream.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>

dbms/src/IO/ReadBufferAIO.cpp

-#if !(defined(__FreeBSD__) || defined(__APPLE__))
+#if !(defined(__FreeBSD__) || defined(__APPLE__) || defined(_MSC_VER))
 
 #include <IO/ReadBufferAIO.h>
 #include <Common/ProfileEvents.h>

dbms/src/IO/ReadBufferAIO.h

 #pragma once
 
-#if !(defined(__FreeBSD__) || defined(__APPLE__))
+#if !(defined(__FreeBSD__) || defined(__APPLE__) || defined(_MSC_VER))
 
 #include <IO/ReadBufferFromFileBase.h>
 #include <IO/ReadBuffer.h>
@@ -8,7 +8,6 @@
 #include <Core/Defines.h>
 #include <Common/AIO.h>
 #include <Common/CurrentMetrics.h>
-
 #include <string>
 #include <limits>
 #include <unistd.h>

dbms/src/IO/ReadBufferFromFileDescriptor.cpp

 #include <errno.h>
 #include <time.h>
-
 #include <optional>
-
 #include <Common/ProfileEvents.h>
 #include <Common/Stopwatch.h>
-
 #include <Common/Exception.h>
 #include <Common/CurrentMetrics.h>
-
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteHelpers.h>
 

dbms/src/IO/ReadBufferFromFileDescriptor.h

 #pragma once
 
-#include <unistd.h>
-
+#include <port/unistd.h>
 #include <IO/ReadBufferFromFileBase.h>
 #include <IO/ReadBuffer.h>
 

dbms/src/IO/WriteBufferAIO.cpp

-#if !(defined(__FreeBSD__) || defined(__APPLE__))
+#if !(defined(__FreeBSD__) || defined(__APPLE__) || defined(_MSC_VER))
 
 #include <IO/WriteBufferAIO.h>
 #include <Common/ProfileEvents.h>

dbms/src/IO/WriteBufferAIO.h

 #pragma once
 
-#if !(defined(__FreeBSD__) || defined(__APPLE__))
+#if !(defined(__FreeBSD__) || defined(__APPLE__) || defined(_MSC_VER))
 
 #include <IO/WriteBufferFromFileBase.h>
 #include <IO/WriteBuffer.h>

dbms/src/IO/WriteBufferFromFileDescriptor.cpp

-#include <unistd.h>
+#include <port/unistd.h>
 #include <errno.h>
 
 #include <Common/Exception.h>

dbms/src/IO/createReadBufferFromFileBase.cpp

 #include <IO/createReadBufferFromFileBase.h>
 #include <IO/ReadBufferFromFile.h>
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_MSC_VER)
 #include <IO/ReadBufferAIO.h>
 #endif
 #include <Common/ProfileEvents.h>
@@ -14,7 +14,7 @@ namespace ProfileEvents
 
 namespace DB
 {
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_MSC_VER)
 namespace ErrorCodes
 {
         extern const int NOT_IMPLEMENTED;
@@ -31,7 +31,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(const std::
     }
     else
     {
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_MSC_VER)
         ProfileEvents::increment(ProfileEvents::CreatedReadBufferAIO);
         return std::make_unique<ReadBufferAIO>(filename_, buffer_size_, flags_, existing_memory_);
 #else

dbms/src/IO/createWriteBufferFromFileBase.cpp

 #include <IO/createWriteBufferFromFileBase.h>
 #include <IO/WriteBufferFromFile.h>
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_MSC_VER)
 #include <IO/WriteBufferAIO.h>
 #endif
 #include <Common/ProfileEvents.h>
@@ -15,7 +15,7 @@ namespace ProfileEvents
 namespace DB
 {
 
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_MSC_VER)
 namespace ErrorCodes
 {
         extern const int NOT_IMPLEMENTED;
@@ -33,7 +33,7 @@ WriteBufferFromFileBase * createWriteBufferFromFileBase(const std::string & file
     }
     else
     {
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_MSC_VER)
         ProfileEvents::increment(ProfileEvents::CreatedWriteBufferAIO);
         return new WriteBufferAIO(filename_, buffer_size_, flags_, mode, existing_memory_);
 #else

dbms/src/IO/tests/read_buffer_aio.cpp

 #include <IO/ReadBufferAIO.h>
 #include <Core/Defines.h>
-
 #include <boost/filesystem.hpp>
-
 #include <vector>
 #include <iostream>
 #include <fstream>
 #include <functional>
 #include <cstdlib>
-#include <unistd.h>
+#include <port/unistd.h>
+
 
 namespace
 {

dbms/src/Interpreters/ClientInfo.cpp

-#include <unistd.h>
-
 #include <Interpreters/ClientInfo.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
@@ -8,6 +6,7 @@
 #include <Core/Defines.h>
 #include <Common/getFQDNOrHostName.h>
 #include <Common/ClickHouseRevision.h>
+#include <port/unistd.h>
 
 
 namespace DB

dbms/src/Interpreters/tests/users.cpp

 #include <Common/Config/ConfigProcessor.h>
 #include <Interpreters/SecurityManager.h>
-
 #include <boost/filesystem.hpp>
-
 #include <vector>
 #include <string>
 #include <tuple>
@@ -10,8 +8,8 @@
 #include <fstream>
 #include <sstream>
 #include <stdexcept>
-#include <unistd.h>
 #include <cstdlib>
+#include <port/unistd.h>
 
 namespace
 {

dbms/src/Server/Benchmark.cpp

-#include <unistd.h>
+#include <port/unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <time.h>
-
 #include <iostream>
 #include <fstream>
 #include <iomanip>
 #include <random>
 #include <pcg_random.hpp>
-
 #include <Poco/File.h>
 #include <Poco/Util/Application.h>
-
 #include <Common/Stopwatch.h>
 #include <common/ThreadPool.h>
 #include <AggregateFunctions/ReservoirSampler.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
-
 #include <boost/program_options.hpp>
-
 #include <Common/ConcurrentBoundedQueue.h>
-
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
 #include <Core/Types.h>
-
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFile.h>
@@ -33,13 +26,9 @@
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 #include <IO/ConnectionTimeouts.h>
-
 #include <DataStreams/RemoteBlockInputStream.h>
-
 #include <Interpreters/Context.h>
-
 #include <Client/Connection.h>
-
 #include "InterruptListener.h"
 
 

dbms/src/Server/Client.cpp

-#include <unistd.h>
+#include <port/unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <signal.h>
-
 #include <iostream>
 #include <fstream>
 #include <iomanip>
@@ -10,13 +9,10 @@
 #include <algorithm>
 #include <optional>
 #include <boost/program_options.hpp>
-
 #include <Poco/File.h>
 #include <Poco/Util/Application.h>
-
 #include <common/readline_use.h>
 #include <common/find_first_symbols.h>
-
 #include <Common/ClickHouseRevision.h>
 #include <Common/Stopwatch.h>
 #include <Common/Exception.h>

dbms/src/Server/PerformanceTest.cpp

@@ -3,14 +3,11 @@
 #include <limits>
 #include <regex>
 #include <thread>
-#include <unistd.h>
-
+#include <port/unistd.h>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 #include <sys/stat.h>
-
 #include <common/DateLUT.h>
-
 #include <AggregateFunctions/ReservoirSampler.h>
 #include <Client/Connection.h>
 #include <Common/ConcurrentBoundedQueue.h>
@@ -27,13 +24,11 @@
 #include <Interpreters/Settings.h>
 #include <common/ThreadPool.h>
 #include <common/getMemoryAmount.h>
-
 #include <Poco/AutoPtr.h>
 #include <Poco/Exception.h>
 #include <Poco/SAX/InputSource.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <Poco/XML/XMLStream.h>
-
 #include "InterruptListener.h"
 
 /** Tests launcher for ClickHouse.

dbms/src/Storages/tests/remove_symlink_directory.cpp

-#include <unistd.h>
+#include <port/unistd.h>
 #include <iostream>
-
 #include <Poco/File.h>
 #include <Poco/Path.h>
 #include <Common/Exception.h>

debian/.pbuilderrc

@@ -188,7 +188,7 @@ export DEB_BUILD_OPTIONS=parallel=`nproc`
 
 # Floating bug with permissions:
 [ -n "$CCACHEDIR" ] && sudo mkdir -p $CCACHEDIR
-[ -n "$CCACHEDIR" ] && sudo chmod -R a+rwx $CCACHEDIR
+[ -n "$CCACHEDIR" ] && sudo chmod -R a+rwx $CCACHEDIR || true
 # chown -R $BUILDUSERID:$BUILDUSERID $CCACHEDIR
 
 

debian/rules

@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # -pie only for static mode
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie

libs/libcommon/cmake/find_gperftools.cmake

@@ -4,7 +4,7 @@ else ()
     option (USE_INTERNAL_GPERFTOOLS_LIBRARY "Set to FALSE to use system gperftools (tcmalloc) library instead of bundled" ${NOT_UNBUNDLED})
 endif ()
 
-if (ARCH_FREEBSD)
+if (ARCH_FREEBSD OR MSVC)
     option (ENABLE_TCMALLOC "Set to TRUE to enable tcmalloc" OFF)
 else ()
     option (ENABLE_TCMALLOC "Set to TRUE to enable tcmalloc" ON)

libs/libcommon/include/common/DateLUT.h

@@ -2,7 +2,6 @@
 
 #include <common/DateLUTImpl.h>
 #include <ext/singleton.h>
-
 #include <unordered_map>
 #include <atomic>
 #include <mutex>
@@ -10,8 +9,12 @@
 
 // Also defined in Core/Defines.h
 #if !defined(ALWAYS_INLINE)
+#if defined(_MSC_VER)
+    #define ALWAYS_INLINE __forceinline
+#else
     #define ALWAYS_INLINE __attribute__((__always_inline__))
 #endif
+#endif
 
 
 /// This class provides lazy initialization and lookup of singleton DateLUTImpl objects for a given timezone.

libs/libcommon/include/common/LocalDate.h

@@ -18,7 +18,7 @@
   *
   * packed - for memcmp to work naturally (but because m_year is 2 bytes, on little endian, comparison is correct only before year 2047)
   */
-class __attribute__ ((__packed__)) LocalDate
+class LocalDate
 {
 private:
     unsigned short m_year;

libs/libcommon/include/common/LocalDateTime.h

@@ -17,7 +17,7 @@
   *
   * packed - for memcmp to work naturally (but because m_year is 2 bytes, on little endian, comparison is correct only before year 2047)
   */
-class __attribute__ ((__packed__)) LocalDateTime
+class LocalDateTime
 {
 private:
     unsigned short m_year;

libs/libcommon/include/common/likely.h

 #pragma once
 
-#define likely(x)    (__builtin_expect(!!(x), 1))
-#define unlikely(x)    (__builtin_expect(!!(x), 0))
+#if _MSC_VER
+#define likely(x)   (x)
+#define unlikely(x) (x)
+#else
+#define likely(x)   (__builtin_expect(!!(x), 1))
+#define unlikely(x) (__builtin_expect(!!(x), 0))
+#endif

libs/libcommon/include/common/mremap.h

 #pragma once
 
 #include <cstddef>
+#include <sys/types.h>
+#if !_MSC_VER
 #include <sys/mman.h>
+#endif
 
 #if defined(MREMAP_MAYMOVE)
 // we already have implementation (linux)

libs/libcommon/include/port/ssize_t.h

+#pragma once
+
+#ifdef _MSC_VER
+    #include <basetsd.h>
+    typedef SSIZE_T ssize_t;
+#else
+    #include <sys/types.h>
+#endif

libs/libcommon/include/port/unistd.h

+#pragma once
+
+// https://stackoverflow.com/questions/341817/is-there-a-replacement-for-unistd-h-for-windows-visual-c
+
+#ifdef _MSC_VER
+    #include <io.h>
+#else
+    #include <unistd.h>
+#endif
+
+#include "ssize_t.h"

libs/libcommon/src/DateLUT.cpp

@@ -56,13 +56,13 @@ std::string determineDefaultTimeZone()
         /// then the relative path is the time zone id.
         fs::path relative_path = tz_file_path.lexically_relative(tz_database_path);
         if (!relative_path.empty() && *relative_path.begin() != ".." && *relative_path.begin() != ".")
-            return relative_path.native();
+            return relative_path.string();
 
         /// The file is not inside the tz_database_dir, so we hope that it was copied and
         /// try to find the file with exact same contents in the database.
 
         size_t tzfile_size = fs::file_size(tz_file_path);
-        Poco::SHA1Engine::Digest tzfile_sha1 = calcSHA1(tz_file_path.native());
+        Poco::SHA1Engine::Digest tzfile_sha1 = calcSHA1(tz_file_path.string());
 
         fs::recursive_directory_iterator begin(tz_database_path);
         fs::recursive_directory_iterator end;
@@ -80,8 +80,8 @@ std::string determineDefaultTimeZone()
             if (candidate_it->status().type() != fs::regular_file || path.filename() == "localtime")
                 continue;
 
-            if (fs::file_size(path) == tzfile_size && calcSHA1(path.native()) == tzfile_sha1)
-                return path.lexically_relative(tz_database_path).native();
+            if (fs::file_size(path) == tzfile_size && calcSHA1(path.string()) == tzfile_sha1)
+                return path.lexically_relative(tz_database_path).string();
         }
     }
     catch (const Poco::Exception & ex)

libs/libcommon/src/mremap.cpp

+#include <common/mremap.h>
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
-#include <sys/mman.h>
 #include <errno.h>
-#include <common/mremap.h>
 
 #if defined(MREMAP_FIXED)
 // we already have implementation (linux)
@@ -22,18 +21,26 @@ void * mremap(
         return nullptr;
     }
 
+#if _MSC_VER
+    void * new_address = ::operator new(new_size);
+#else
     void * new_address = mmap(nullptr, new_size, mmap_prot, mmap_flags, mmap_fd, mmap_offset);
     if (MAP_FAILED == new_address)
     {
         return MAP_FAILED;
     }
+#endif
 
     memcpy(new_address, old_address, old_size);
 
+#if _MSC_VER
+    delete old_address;
+#else
     if (munmap(old_address, old_size))
     {
         abort();
     }
+#endif
 
     return new_address;
 }

libs/libdaemon/include/daemon/BaseDaemon.h

 #pragma once
 
 #include <sys/types.h>
-#include <unistd.h>
+#include <port/unistd.h>
 #include <iostream>
 #include <memory>
 #include <functional>

libs/libpocoext/src/ThreadNumber.cpp

-#include <pthread.h>
-#include <common/likely.h>
-
 #include <Poco/Ext/ThreadNumber.h>
-
+#include <common/likely.h>
+#include <atomic>
 
 static thread_local unsigned thread_number = 0;
-static unsigned threads = 0;
+static std::atomic_uint threads{0};
 
 unsigned Poco::ThreadNumber::get()
 {
     if (unlikely(thread_number == 0))
-        thread_number = __sync_add_and_fetch(&threads, 1);
+        thread_number = ++threads;
 
     return thread_number;
 }

utils/build/build_msvc2017.bat

+
+:: WINDOWS BUILD NOT SUPPORTED!
+:: Script only for development
+
+cd ../..
+git clone --recursive https://github.com/madler/zlib contrib/zlib
+md build
+cd build
+
+:: Stage 1: try build client
+cmake .. -G "Visual Studio 15 2017 Win64" -DENABLE_CLICKHOUSE_ALL=0 -DENABLE_CLICKHOUSE_CLIENT=1 > cmake.log
+cmake --build . --target clickhouse -- /m > build.log
+:: Stage 2: try build minimal server
+:: Stage 3: enable all possible features (ssl, ...)

utils/compressor/zstd_test.cpp

-#include <unistd.h>
+#include <port/unistd.h>
 #include <zstd.h>
 #include <vector>
 #include <stdexcept>
+#include <sys/types.h>
 
 
 int main(int argc, char ** argv)

utils/iotest/iotest.cpp

 #include <fcntl.h>
-#include <unistd.h>
+#include <port/unistd.h>
 #include <stdlib.h>
 #include <time.h>
-
 #include <iostream>
 #include <iomanip>
 #include <vector>
 #include <random>
 #include <pcg_random.hpp>
-
 #include <Poco/NumberParser.h>
 #include <Poco/NumberFormatter.h>
 #include <Poco/Exception.h>
-
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
-
 #include <common/ThreadPool.h>
 #include <Common/Stopwatch.h>
-
 #include <IO/BufferWithOwnMemory.h>
-
 #include <cstdlib>
-
 #ifdef __APPLE__
 #include <common/apple_rt.h>
 #endif

utils/iotest/iotest_aio.cpp

 #include <fcntl.h>
-#include <unistd.h>
+#include <port/unistd.h>
 #include <stdlib.h>
 #include <time.h>
-
 #include <iostream>
 #include <iomanip>
 #include <vector>
-
 #include <Poco/NumberParser.h>
 #include <Poco/NumberFormatter.h>
 #include <Poco/Exception.h>
-
 #include <Common/Exception.h>
-
 #include <common/ThreadPool.h>
 #include <Common/Stopwatch.h>
-
 #include <IO/BufferWithOwnMemory.h>
-
 #include <stdlib.h>
 #if !defined(__APPLE__) && !defined(__FreeBSD__)
 #include <malloc.h>
 #endif
-
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -33,6 +26,7 @@
 #endif
 #include <sys/syscall.h>
 
+
 using DB::throwFromErrno;
 
 inline int io_setup(unsigned nr, aio_context_t *ctxp)

utils/iotest/iotest_nonblock.cpp

 #include <fcntl.h>
-#include <unistd.h>
+#include <port/unistd.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdlib.h>
@@ -7,24 +7,18 @@
 #include <malloc.h>
 #endif
 #include <poll.h>
-
 #include <iostream>
 #include <iomanip>
 #include <vector>
-
 #include <random>
 #include <pcg_random.hpp>
-
 #include <Poco/NumberParser.h>
 #include <Poco/NumberFormatter.h>
 #include <Poco/Exception.h>
-
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
-
 #include <common/ThreadPool.h>
 #include <Common/Stopwatch.h>
-
 #ifdef __APPLE__
 #include <common/apple_rt.h>
 #endif