Fixed TLS-enabled build + cleanup

ClickHouse · Nov 1, 2021 · 009b8af · 009b8af
1 parent 964a070
commit 009b8af
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 75 deletions.
diff --git a/clickhouse/CMakeLists.txt b/clickhouse/CMakeLists.txt
@@ -1,5 +1,4 @@
 SET ( clickhouse-cpp-lib-src
-    base/coded.cpp
     base/compressed.cpp
     base/input.cpp
     base/output.cpp
@@ -73,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/)

diff --git a/clickhouse/base/coded.cpp b/clickhouse/base/coded.cpp
diff --git a/clickhouse/base/coded.h b/clickhouse/base/coded.h
diff --git a/clickhouse/base/sslsocket.cpp b/clickhouse/base/sslsocket.cpp
@@ -196,6 +196,10 @@ SSLSocketInput::SSLSocketInput(SSL *ssl)
 
 SSLSocketInput::~SSLSocketInput() = default;
 
+bool SSLSocketInput::Skip(size_t /*bytes*/) {
+    return false;
+}
+
 size_t SSLSocketInput::DoRead(void* buf, size_t len) {
     size_t actually_read;
     HANDLE_SSL_ERROR(SSL_read_ex(ssl_, buf, len, &actually_read));

diff --git a/clickhouse/base/sslsocket.h b/clickhouse/base/sslsocket.h
@@ -59,6 +59,8 @@ class SSLSocketInput : public InputStream {
     explicit SSLSocketInput(SSL *ssl);
     ~SSLSocketInput();
 
+    bool Skip(size_t bytes) override;
+
 protected:
     size_t DoRead(void* buf, size_t len) override;
 

diff --git a/clickhouse/client.cpp b/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/streamstack.h"

diff --git a/ut/client_ut.cpp b/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