Fix #127

Author: filimonov

.github/workflows/windows_msvc.yml

@@ -8,9 +8,27 @@ on:
 
 env:
   BUILD_TYPE: Release
-  # It is impossible to start CH server in docker on Windows due to github actions limitations,
-  # so limit tests to ones that do no require server interaction.
-  GTEST_FILTER: --gtest_filter=-"Client/*:*Performance*"
+  GTEST_FILTER: --gtest_filter=-"*"
+  CLICKHOUSE_USER: clickhouse_cpp_cicd
+  CLICKHOUSE_PASSWORD: clickhouse_cpp_cicd
+  #
+  # CLICKHOUSE_HOST: localhost
+  # CLICKHOUSE_PORT: 9000
+  # CLICKHOUSE_USER: default
+  # CLICKHOUSE_PASSWORD:
+  # CLICKHOUSE_DB:   default
+  #
+  # CLICKHOUSE_SECURE_HOST:     github.demo.trial.altinity.cloud
+  # CLICKHOUSE_SECURE_PORT:     9440
+  # CLICKHOUSE_SECURE_USER:     demo
+  # CLICKHOUSE_SECURE_PASSWORD: demo
+  # CLICKHOUSE_SECURE_DB:       default
+  #
+  # CLICKHOUSE_SECURE2_HOST:    gh-api.clickhouse.tech
+  # CLICKHOUSE_SECURE2_PORT:    9440
+  # CLICKHOUSE_SECURE2_USER:    explorer
+  # CLICKHOUSE_SECURE2_PASSWORD:
+  # CLICKHOUSE_SECURE2_DB:      default
 
 jobs:
   build:
@@ -26,6 +44,17 @@ jobs:
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
+    - name: Start tls offoader proxy
+      shell: bash
+      # that mimics non-secure clickhouse running on localhost
+      # by tunneling queries to remote tls server
+      # (needed because we can't start real clickhouse instance on windows)
+      run: |
+            choco install wget
+            wget https://github.com/filimonov/go-tlsoffloader/releases/download/v0.1.2/go-tlsoffloader_0.1.2_Windows_x86_64.tar.gz
+            tar -xvzf go-tlsoffloader_0.1.2_Windows_x86_64.tar.gz
+            ./go-tlsoffloader.exe -l localhost:9000 -b github.demo.trial.altinity.cloud:9440 &
+
     - name: Test
       working-directory: ${{github.workspace}}/build/ut
       run: Release\clickhouse-cpp-ut.exe "${{env.GTEST_FILTER}}"

clickhouse/base/platform.h

@@ -13,6 +13,8 @@
 
 #if defined(_win32_) || defined(_win64_)
 #   define _win_
+#   define _WIN32_WINNT 0x0600    // The WSAPoll function is defined on Windows Vista and later.
+#   define WIN32_LEAN_AND_MEAN 1  // don't include too much header automatically
 #endif
 
 #if defined(_linux_) || defined (_darwin_)

clickhouse/base/socket.cpp

@@ -14,11 +14,33 @@
 #   include <netinet/tcp.h>
 #   include <signal.h>
 #   include <unistd.h>
-#   include <netinet/tcp.h>
 #endif
 
 namespace clickhouse {
 
+#if defined(_win_)
+char const* windowsErrorCategory::name() const noexcept {
+    return "WindowsSocketError";
+}
+
+std::string windowsErrorCategory::message(int c) const {
+    char error[UINT8_MAX];
+    auto len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, static_cast<DWORD>(c), 0, error, sizeof(error), nullptr);
+    if (len == 0) {
+        return "unknown";
+    }
+    while (len && (error[len - 1] == '\r' || error[len - 1] == '\n')) {
+        --len;
+    }
+    return std::string(error, len);
+}
+
+/*static*/ windowsErrorCategory const& windowsErrorCategory::category() {
+    static windowsErrorCategory c;
+    return c;
+}
+#endif
+
 namespace {
 
 class LocalNames : public std::unordered_set<std::string> {
@@ -37,6 +59,22 @@ class LocalNames : public std::unordered_set<std::string> {
     }
 };
 
+inline int getSocketErrorCode() {
+#if defined(_win_)
+    return WSAGetLastError();
+#else
+    return errno;
+#endif
+}
+
+const std::error_category& getErrorCategory() noexcept {
+#if defined(_win_)
+    return windowsErrorCategory::category();
+#else
+    return std::system_category();
+#endif
+}
+
 void SetNonBlock(SOCKET fd, bool value) {
 #if defined(_unix_)
     int flags;
@@ -68,8 +106,7 @@ void SetNonBlock(SOCKET fd, bool value) {
     }
 
     if (WSAIoctl(fd, FIONBIO, &inbuf, sizeof(inbuf), &outbuf, sizeof(outbuf), &written, 0, 0) == SOCKET_ERROR) {
-        throw std::system_error(
-            errno, std::system_category(), "fail to set nonblocking mode");
+        throw std::system_error(getSocketErrorCode(), getErrorCategory(), "fail to set nonblocking mode");
     }
 #endif
 }
@@ -94,16 +131,21 @@ SOCKET SocketConnect(const NetworkAddress& addr) {
         SetNonBlock(s, true);
 
         if (connect(s, res->ai_addr, (int)res->ai_addrlen) != 0) {
-            int err = errno;
-            if (err == EINPROGRESS || err == EAGAIN || err == EWOULDBLOCK) {
+            int err = getSocketErrorCode();
+            if (
+                err == EINPROGRESS || err == EAGAIN || err == EWOULDBLOCK
+#if defined(_win_)
+                || err == WSAEWOULDBLOCK || err == WSAEINPROGRESS
+#endif
+            ) {
                 pollfd fd;
                 fd.fd = s;
                 fd.events = POLLOUT;
                 fd.revents = 0;
                 ssize_t rval = Poll(&fd, 1, 5000);
 
                 if (rval == -1) {
-                    throw std::system_error(errno, std::system_category(), "fail to connect");
+                    throw std::system_error(getSocketErrorCode(), getErrorCategory(), "fail to connect");
                 }
                 if (rval > 0) {
                     socklen_t len = sizeof(err);
@@ -122,10 +164,9 @@ SOCKET SocketConnect(const NetworkAddress& addr) {
         }
     }
     if (last_err > 0) {
-        throw std::system_error(last_err, std::system_category(), "fail to connect");
+        throw std::system_error(last_err, getErrorCategory(), "fail to connect");
     }
-    throw std::system_error(
-        errno, std::system_category(), "fail to connect"
+    throw std::system_error(getSocketErrorCode(), getErrorCategory(), "fail to connect"
     );
 }
 

clickhouse/base/socket.h

@@ -1,8 +1,8 @@
 #pragma once
 
+#include "platform.h"
 #include "input.h"
 #include "output.h"
-#include "platform.h"
 
 #include <cstddef>
 #include <string>
@@ -24,7 +24,7 @@
 #endif
 
 #include <memory>
-
+#include <system_error>
 
 struct addrinfo;
 
@@ -47,6 +47,17 @@ class NetworkAddress {
     struct addrinfo* info_;
 };
 
+#if defined(_win_)
+
+class windowsErrorCategory : public std::error_category {
+public:
+    char const* name() const noexcept override final;
+    std::string message(int c) const override final;
+
+    static windowsErrorCategory const& category();
+};
+
+#endif
 
 class Socket {
 public:

contrib/absl/base/policy_checks.h

@@ -36,9 +36,11 @@
 // Operating System Check
 // -----------------------------------------------------------------------------
 
+/* it looks like int128 part of absl work correctly on mingw.
 #if defined(__CYGWIN__)
 #error "Cygwin is not supported."
 #endif
+*/
 
 // -----------------------------------------------------------------------------
 // Toolchain Check

ut/tcp_server.cpp

@@ -5,16 +5,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <winsock2.h>
-/* 
-#if defined(_win_)
+#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN64)
 #   include <winsock2.h>
 #else
 #   include <netinet/in.h>
 #   include <sys/socket.h>
 #   include <unistd.h>
 #endif
-*/ 
 
 #include <thread>
 
@@ -43,10 +40,10 @@ void LocalTcpServer::start() {
     }
     int enable = 1;
 
-#if defined(_unix_)
-    auto res = setsockopt(serverSd_, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
-#else
+#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN64)
     auto res = setsockopt(serverSd_, SOL_SOCKET, SO_REUSEADDR, (const char*)&enable, sizeof(enable));
+#else
+    auto res = setsockopt(serverSd_, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
 #endif
 
     if (res < 0) {
@@ -64,12 +61,12 @@ void LocalTcpServer::start() {
 void LocalTcpServer::stop() {
     if(serverSd_ > 0) {
 
-#if defined(_unix_)
-        shutdown(serverSd_, SHUT_RDWR);
-        close(serverSd_);
-#else
+#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN64)
         shutdown(serverSd_, SD_BOTH);
         closesocket(serverSd_);
+#else
+        shutdown(serverSd_, SHUT_RDWR);
+        close(serverSd_);
 #endif
         serverSd_ = -1;
     }

ut/tcp_server.h

@@ -1,7 +1,4 @@
 #pragma once
-
-#include <winsock2.h>
-
 namespace clickhouse {
 
 class LocalTcpServer {
@@ -17,7 +14,7 @@ class LocalTcpServer {
 
 private:
     int port_;
-    SOCKET serverSd_;
+    int serverSd_;
 };
 
 }