Fixed TLS-enabled build + cleanup

Author: Enmk

clickhouse/CMakeLists.txt

@@ -1,10 +1,10 @@
 SET ( clickhouse-cpp-lib-src
-    base/coded.cpp
     base/compressed.cpp
     base/input.cpp
     base/output.cpp
     base/platform.cpp
     base/socket.cpp
+    base/coded.cpp
 
     columns/array.cpp
     columns/date.cpp
@@ -72,7 +72,6 @@ INSTALL(FILES query.h DESTINATION include/clickhouse/)
 
 # base
 INSTALL(FILES base/buffer.h DESTINATION include/clickhouse/base/)
-INSTALL(FILES base/coded.h DESTINATION include/clickhouse/base/)
 INSTALL(FILES base/compressed.h DESTINATION include/clickhouse/base/)
 INSTALL(FILES base/input.h DESTINATION include/clickhouse/base/)
 INSTALL(FILES base/output.h DESTINATION include/clickhouse/base/)

clickhouse/client.cpp

@@ -1,7 +1,6 @@
 #include "client.h"
 #include "protocol.h"
 
-#include "base/coded.h"
 #include "base/compressed.h"
 #include "base/socket.h"
 #include "base/wire_format.h"

ut/client_ut.cpp

@@ -1053,37 +1053,37 @@ INSTANTIATE_TEST_CASE_P(
     }
 ));
 
-// Special test that require properly configured TLS-enabled version of CH running locally
-INSTANTIATE_TEST_CASE_P(
-    LocalhostTLS_None, ReadonlyClientTest,
-    ::testing::Values(std::tuple<ClientOptions, std::vector<std::string> > {
-        ClientOptions()
-            .SetHost("127.0.0.1")
-            .SetPort(9440)
-            .SetUser("default")
-            .SetPingBeforeQuery(true)
-            .SetCompressionMethod(CompressionMethod::None)
-            .SetSSLOptions(ClientOptions::SSLOptions()
-                    .PathToCADirectory("./CA/")
-                    .UseSNI(false)),
-        QUERIES
-    }
-));
-
-INSTANTIATE_TEST_CASE_P(
-    LocalhostTLS_LZ4, ReadonlyClientTest,
-    ::testing::Values(std::tuple<ClientOptions, std::vector<std::string> > {
-        ClientOptions()
-            .SetHost("127.0.0.1")
-            .SetPort(9440)
-            .SetUser("default")
-            .SetPingBeforeQuery(true)
-            .SetCompressionMethod(CompressionMethod::LZ4)
-            .SetSSLOptions(ClientOptions::SSLOptions()
-                    .PathToCADirectory("./CA/")
-                    .UseSNI(false)),
-        QUERIES
-    }
-));
+//// Special test that require properly configured TLS-enabled version of CH running locally
+//INSTANTIATE_TEST_CASE_P(
+//    LocalhostTLS_None, ReadonlyClientTest,
+//    ::testing::Values(std::tuple<ClientOptions, std::vector<std::string> > {
+//        ClientOptions()
+//            .SetHost("127.0.0.1")
+//            .SetPort(9440)
+//            .SetUser("default")
+//            .SetPingBeforeQuery(true)
+//            .SetCompressionMethod(CompressionMethod::None)
+//            .SetSSLOptions(ClientOptions::SSLOptions()
+//                    .PathToCADirectory("./CA/")
+//                    .UseSNI(false)),
+//        QUERIES
+//    }
+//));
+
+//INSTANTIATE_TEST_CASE_P(
+//    LocalhostTLS_LZ4, ReadonlyClientTest,
+//    ::testing::Values(std::tuple<ClientOptions, std::vector<std::string> > {
+//        ClientOptions()
+//            .SetHost("127.0.0.1")
+//            .SetPort(9440)
+//            .SetUser("default")
+//            .SetPingBeforeQuery(true)
+//            .SetCompressionMethod(CompressionMethod::LZ4)
+//            .SetSSLOptions(ClientOptions::SSLOptions()
+//                    .PathToCADirectory("./CA/")
+//                    .UseSNI(false)),
+//        QUERIES
+//    }
+//));
 
 #endif