clickhouse-native 0.8.0 → 0.10.0

data/ext/clickhouse_native/vendor/clickhouse-cpp/README.md

@@ -6,6 +6,7 @@ C++ client for [ClickHouse](https://clickhouse.com/).
 ## Supported data types
 
 * Array(T)
+* Bool \* (by default, mapped to UInt8 when receiving data)
 * Date
 * DateTime, DateTime64
 * DateTime([timezone]), DateTime64(N, [timezone])
@@ -23,6 +24,15 @@ C++ client for [ClickHouse](https://clickhouse.com/).
 * UUID
 * Map
 * Point, Ring, Polygon, MultiPolygon
+* JSON - experimental support; requires output_format_native_write_json_as_string=1; data is passed as strings
+
+\*: There exists a distinct `ColumnBool` and entry in the `Type` enumeration that
+can be used.
+By default, data received from the server will map Bool columns to UInt8. This is
+a backwards compatibility feature.
+If you want the library to produce ColumnBool, set the CMake variable `DCH_MAP_BOOL_TO_UINT8=OFF`.
+The default for this variable will switch, with it being subsequently removed, in
+a future release.
 
 ## Dependencies
 In the most basic case one needs only:
@@ -157,16 +167,34 @@ target_link_libraries(${PROJECT_NAME} PRIVATE clickhouse-cpp-lib)
 - run `rm -rf build && cmake -B build -S . && cmake --build build -j32` to remove remainders of the previous builds, run CMake and build the
   application. The generated binary is located in location `build/application-example`.
 
+## Experimental Bazel support
+
+If you use Bazel, you can also use it to import the library into your project. However, please keep
+in mind that Bazel support is currently experimental and is still being refined. This means things
+might change as we improve and update the setup.
+
+Most importantly, the project includes settings that were added for compatibility with older
+versions of the library and its API, and to preserve old behavior. These settings will not be part
+of the Bazel configuration. This means that even when only the minor version changes your build
+still might break.
+
+Additionally, by default, the library is built with BoringSSL and not OpenSSL because it builds
+reliably across platforms on BCR today and matches what many Bazel workspaces, such as gRPC and
+Envoy, already link against.
+
+It is still possible to build the library with OpenSSL by using the `tls=openssl` option. TLS
+support can be completely omitted with the `tls=no` option.
+
 ## Batch Insertion
 
 In addition to the `Insert` method, which inserts all the data in a block in a
-single call, you can use the `BeginInsert` / `InsertData` / `EndInsert`
+single call, you can use the `BeginInsert` / `SendInsertBlock` / `EndInsert`
 pattern to insert batches of data. This can be useful for managing larger data
 sets without inflating memory with the entire set.
 
 To use it pass `BeginInsert` an `INSERT` statement ending in `VALUES` but with
 no actual values. Use the resulting `Block` to append batches of data, sending
-each to the sever with `InsertData`. Finally, call `EndInsert` (or let the
+each to the sever with `SendInsertBlock`. Finally, call `EndInsert` (or let the
 client go out of scope) to signal the server that insertion is complete.
 Example:
 
@@ -186,7 +214,7 @@ col2.Append("naomi");
 
 // Send those records.
 block.RefreshRowCount();
-client->InsertData(block);
+client->SendInsertBlock(block);
 block.Clear();
 
 // Add another record.
@@ -195,7 +223,7 @@ col2.Append("amos");
 
 // Send it and finish.
 block.RefreshRowCount();
-client->EndInsert(block);
+client->EndInsert();
 ```
 
 ## Thread-safety
@@ -256,5 +284,3 @@ client.Insert("default.test", block);
 ```sql
 ALTER USER insert_account SETTINGS async_insert=1,wait_for_async_insert=1,async_insert_use_adaptive_busy_timeout=0,async_insert_busy_timeout_ms=5000,async_insert_max_data_size=104857600
 ```
-
-

data/ext/clickhouse_native/vendor/clickhouse-cpp/ci/docker-compose/config.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<clickhouse>
+
+  <http_port>8123</http_port>
+  <tcp_port>9000</tcp_port>
+
+  <users_config>users.xml</users_config>
+  <default_profile>default</default_profile>
+  <default_database>default</default_database>
+
+  <mark_cache_size>5368709120</mark_cache_size>
+
+  <path>/var/lib/clickhouse/</path>
+  <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+  <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+  <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+  <keep_alive_timeout>3</keep_alive_timeout>
+
+  <logger>
+    <level>debug</level>
+    <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+    <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+    <size>1000M</size>
+    <count>10</count>
+    <console>1</console>
+  </logger>
+
+  <query_log>
+    <database>system</database>
+    <table>query_log</table>
+    <partition_by>toYYYYMM(event_date)</partition_by>
+    <flush_interval_milliseconds>1000</flush_interval_milliseconds>
+  </query_log>
+
+  <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+  <user_directories>
+    <users_xml>
+      <path>users.xml</path>
+    </users_xml>
+  </user_directories>
+
+  <opentelemetry_span_log>
+    <engine>
+      engine MergeTree
+      partition by toYYYYMM(finish_date)
+      order by (finish_date, finish_time_us, trace_id)
+    </engine>
+    <database>system</database>
+    <table>opentelemetry_span_log</table>
+    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+  </opentelemetry_span_log>
+
+</clickhouse>

data/ext/clickhouse_native/vendor/clickhouse-cpp/ci/docker-compose/users.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<clickhouse>
+
+  <profiles>
+    <default>
+      <load_balancing>random</load_balancing>
+      <enable_time_time64_type>1</enable_time_time64_type>
+    </default>
+  </profiles>
+
+  <users>
+    <default>
+      <password></password>
+      <networks>
+        <ip>::/0</ip>
+      </networks>
+      <profile>default</profile>
+      <quota>default</quota>
+      <access_management>1</access_management>
+    </default>
+  </users>
+
+  <quotas>
+    <default>
+      <interval>
+        <duration>3600</duration>
+        <queries>0</queries>
+        <errors>0</errors>
+        <result_rows>0</result_rows>
+        <read_rows>0</read_rows>
+        <execution_time>0</execution_time>
+      </interval>
+    </default>
+  </quotas>
+</clickhouse>

data/ext/clickhouse_native/vendor/clickhouse-cpp/ci/docker-compose.yml

@@ -0,0 +1,22 @@
+services:
+    clickhouse:
+        image: 'docker.io/clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-25.12-alpine}'
+        container_name: 'clickhouse-odbc-clickhouse-server'
+        environment:
+            CLICKHOUSE_SKIP_USER_SETUP: 1
+        ports:
+            - '8123:8123'
+            - '9000:9000'
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        volumes:
+            - './docker-compose/config.xml:/etc/clickhouse-server/config.xml:z'
+            - './docker-compose/users.xml:/etc/clickhouse-server/users.xml:z'
+        networks:
+            - clickhouse-odbc
+
+networks:
+    clickhouse-odbc:
+        driver: bridge

data/ext/clickhouse_native/vendor/clickhouse-cpp/clickhouse/CMakeLists.txt

@@ -8,6 +8,7 @@ SET ( clickhouse-cpp-lib-src
     base/endpoints_iterator.cpp
 
     columns/array.cpp
+    columns/bool.cpp
     columns/column.cpp
     columns/date.cpp
     columns/decimal.cpp
@@ -16,6 +17,7 @@ SET ( clickhouse-cpp-lib-src
     columns/geo.cpp
     columns/ip4.cpp
     columns/ip6.cpp
+    columns/json.cpp
     columns/lowcardinality.cpp
     columns/nullable.cpp
     columns/numeric.cpp
@@ -52,6 +54,7 @@ SET ( clickhouse-cpp-lib-src
     base/wire_format.h
 
     columns/array.h
+    columns/bool.h
     columns/column.h
     columns/date.h
     columns/decimal.h
@@ -60,6 +63,7 @@ SET ( clickhouse-cpp-lib-src
     columns/geo.h
     columns/ip4.h
     columns/ip6.h
+    columns/json.h
     columns/itemview.h
     columns/lowcardinality.h
     columns/lowcardinalityadaptor.h
@@ -120,6 +124,11 @@ TARGET_LINK_LIBRARIES (clickhouse-cpp-lib
 TARGET_INCLUDE_DIRECTORIES (clickhouse-cpp-lib
     PUBLIC ${PROJECT_SOURCE_DIR}
 )
+IF (CH_MAP_BOOL_TO_UINT8)
+    TARGET_COMPILE_DEFINITIONS (clickhouse-cpp-lib PUBLIC CH_MAP_BOOL_TO_UINT8=1)
+ELSE ()
+    TARGET_COMPILE_DEFINITIONS (clickhouse-cpp-lib PUBLIC CH_MAP_BOOL_TO_UINT8=0)
+ENDIF ()
 
 IF (NOT BUILD_SHARED_LIBS)
     ADD_LIBRARY (clickhouse-cpp-lib-static ALIAS clickhouse-cpp-lib)
@@ -213,6 +222,7 @@ INSTALL(FILES base/endpoints_iterator.h DESTINATION include/clickhouse/base/)
 
 # columns
 INSTALL(FILES columns/array.h DESTINATION include/clickhouse/columns/)
+INSTALL(FILES columns/bool.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/column.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/date.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/decimal.h DESTINATION include/clickhouse/columns/)
@@ -221,6 +231,7 @@ INSTALL(FILES columns/factory.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/geo.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/ip4.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/ip6.h DESTINATION include/clickhouse/columns/)
+INSTALL(FILES columns/json.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/itemview.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/lowcardinality.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/nothing.h DESTINATION include/clickhouse/columns/)

data/ext/clickhouse_native/vendor/clickhouse-cpp/clickhouse/base/sslsocket.cpp

@@ -2,6 +2,7 @@
 #include "../client.h"
 #include "../exceptions.h"
 
+#include <iostream>
 #include <stdexcept>
 
 #include <openssl/ssl.h>
@@ -50,6 +51,19 @@ void throwSSLError(SSL * ssl, int error, const char * /*location*/, const char *
 }
 
 void configureSSL(const clickhouse::SSLParams::ConfigurationType & configuration, SSL * ssl, SSL_CTX * context = nullptr) {
+#ifdef USE_BORINGSSL
+    // BoringSSL doesn't ship the SSL_CONF_* command API, so the
+    // configuration vector cannot be applied. Users who rely on
+    // SSL_CONF commands should build against
+    // OpenSSL (e.g. --@clickhouse_cpp//:tls=openssl with Bazel).
+    (void)ssl;
+    (void)context;
+    if (!configuration.empty()) {
+        throw clickhouse::OpenSSLError(
+            "SSLParams::configuration cannot be used when the library is built against BoringSSL "
+            "To apply these settings, build against OpenSSL by using the `tls=openssl` option in Bazel.");
+    }
+#else
     std::unique_ptr<SSL_CONF_CTX, decltype(&SSL_CONF_CTX_free)> conf_ctx_holder(SSL_CONF_CTX_new(), SSL_CONF_CTX_free);
     auto conf_ctx = conf_ctx_holder.get();
 
@@ -84,6 +98,7 @@ void configureSSL(const clickhouse::SSLParams::ConfigurationType & configuration
         else
             throw clickhouse::OpenSSLError("Failed to configure OpenSSL: command '" + kv.first + "' unknown error: " + std::to_string(err));
     }
+#endif
 }
 
 #define STRINGIFY_HELPER(x) #x
@@ -285,9 +300,18 @@ SSLSocketInput::SSLSocketInput(SSL *ssl)
 {}
 
 size_t SSLSocketInput::DoRead(void* buf, size_t len) {
+#ifdef USE_BORINGSSL
+    // BoringSSL doesn't have SSL_read_ex (OpenSSL 3.0+ API); fall back to
+    // SSL_read with the length clamped to INT_MAX.
+    const int max_read = static_cast<int>(
+        std::min<std::size_t>(len, std::numeric_limits<int>::max()));
+    return static_cast<size_t>(
+        HANDLE_SSL_ERROR(ssl_, SSL_read(ssl_, buf, max_read)));
+#else
     size_t actually_read;
     HANDLE_SSL_ERROR(ssl_, SSL_read_ex(ssl_, buf, len, &actually_read));
     return actually_read;
+#endif
 }
 
 SSLSocketOutput::SSLSocketOutput(SSL *ssl)

data/ext/clickhouse_native/vendor/clickhouse-cpp/clickhouse/block.cpp

@@ -115,7 +115,7 @@ void Block::Reserve(size_t new_cap) {
 
 
 
-ColumnRef Block::operator [] (size_t idx) const {
+ColumnRef Block::At(size_t idx) const {
     if (idx < columns_.size()) {
         return columns_[idx].column;
     }

data/ext/clickhouse_native/vendor/clickhouse-cpp/clickhouse/block.h

@@ -92,7 +92,8 @@ public:
     void Reserve(size_t new_cap);
 
     /// Reference to column by index in the block.
-    ColumnRef operator [] (size_t idx) const;
+    ColumnRef At(size_t idx) const;
+    ColumnRef operator [] (size_t idx) const { return At(idx); }
 
     Iterator begin() const;
     Iterator end() const;