Try with static libs

Author: filimonov

.github/workflows/windows_msvc.yml

@@ -28,4 +28,4 @@ jobs:
 
     - name: Test
       working-directory: ${{github.workspace}}/build/ut
-      run: ./clickhouse-cpp-ut.exe "${{env.GTEST_FILTER}}"
+      run: clickhouse-cpp-ut.exe "${{env.GTEST_FILTER}}"

contrib/gtest/CMakeLists.txt

@@ -1,4 +1,4 @@
 ADD_LIBRARY (gtest-lib STATIC
     "src/gtest-all.cc"
     "src/gtest_main.cc"
-)
+)

contrib/gtest/README.md

@@ -1 +1 @@
-google test, version release-1.11.0, stripped.
+google test, version release-1.11.0, stripped.

tests/simple/CMakeLists.txt

@@ -3,6 +3,6 @@ ADD_EXECUTABLE (simple-test
 )
 
 TARGET_LINK_LIBRARIES (simple-test
-	clickhouse-cpp-lib
+	clickhouse-cpp-lib-static
 )
 

ut/CMakeLists.txt

@@ -25,6 +25,6 @@ ADD_EXECUTABLE (clickhouse-cpp-ut
 )
 
 TARGET_LINK_LIBRARIES (clickhouse-cpp-ut
-    clickhouse-cpp-lib
+    clickhouse-cpp-lib-static
     gtest-lib
 )

ut/performance_tests.cpp

@@ -209,7 +209,7 @@ TYPED_TEST_P(ColumnPerformanceTest, InsertAndSelect) {
         size_t total_rows = 0;
         Timer timer;
         Timer::DurationType inner_loop_duration{0};
-        client.Select("SELECT " + column_name +  " FROM " + table_name, [&total_rows, &inner_loop_duration](const Block & block) {
+        client.Select("SELECT " + column_name +  " FROM " + table_name, [&total_rows, &inner_loop_duration, &ITEMS_COUNT](const Block & block) {
             Timer timer;
             total_rows += block.GetRowCount();
             if (block.GetRowCount() == 0) {

ut/tcp_server.cpp

@@ -1,13 +1,22 @@
 #include "tcp_server.h"
 
 #include <iostream>
-#include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
+
+#include <winsock2.h>
+/* 
+#if defined(_win_)
+#   include <winsock2.h>
+#else
+#   include <netinet/in.h>
+#   include <sys/socket.h>
+#   include <unistd.h>
+#endif
+*/ 
+
 #include <thread>
-#include <unistd.h>
 
 namespace clickhouse {
 
@@ -23,7 +32,7 @@ LocalTcpServer::~LocalTcpServer() {
 void LocalTcpServer::start() {
     //setup a socket
     sockaddr_in servAddr;
-    bzero((char*)&servAddr, sizeof(servAddr));
+    memset((char*)&servAddr, 0, sizeof(servAddr));
     servAddr.sin_family = AF_INET;
     servAddr.sin_addr.s_addr = htonl(INADDR_ANY);
     servAddr.sin_port = htons(port_);
@@ -33,7 +42,14 @@ void LocalTcpServer::start() {
         throw std::runtime_error("Error establishing server socket");
     }
     int enable = 1;
-    if (setsockopt(serverSd_, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int)) < 0) {
+
+#if defined(_unix_)
+    auto res = setsockopt(serverSd_, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
+#else
+    auto res = setsockopt(serverSd_, SOL_SOCKET, SO_REUSEADDR, (const char*)&enable, sizeof(enable));
+#endif
+
+    if (res < 0) {
         std::cerr << "setsockopt(SO_REUSEADDR) failed" << std::endl;
     }
     //bind the socket to its local address
@@ -47,8 +63,14 @@ void LocalTcpServer::start() {
 
 void LocalTcpServer::stop() {
     if(serverSd_ > 0) {
+
+#if defined(_unix_)
         shutdown(serverSd_, SHUT_RDWR);
         close(serverSd_);
+#else
+        shutdown(serverSd_, SD_BOTH);
+        closesocket(serverSd_);
+#endif
         serverSd_ = -1;
     }
 }

ut/tcp_server.h

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

ut/utils.h

@@ -39,9 +39,8 @@ struct Timer
 private:
     static auto Now()
     {
-        struct timespec ts;
-        clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
-        return std::chrono::nanoseconds(ts.tv_sec * 1000000000LL + ts.tv_nsec);
+        std::chrono::nanoseconds ns = std::chrono::high_resolution_clock::now().time_since_epoch();
+        return ns;
     }
 
 private: