Introduce Bool Type

.github/workflows/linux.yml

@@ -112,6 +112,7 @@ jobs:
             -D CMAKE_C_COMPILER=${{matrix.C_COMPILER}} \
             -D CMAKE_CXX_COMPILER=${{matrix.CXX_COMPILER}} \
             -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
+            -D CH_MAP_BOOL_TO_UINT8=OFF \
             -D BUILD_TESTS=ON \
             ${{matrix.SSL_CMAKE_OPTION}} \
             ${{matrix.DEPENDENCIES_CMAKE_OPTIONS}} \

.github/workflows/macos.yml

@@ -55,6 +55,7 @@ jobs:
         run: |
           cmake \
             -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
+            -D CH_MAP_BOOL_TO_UINT8=OFF \
             -D BUILD_TESTS=ON \
             ${{matrix.SSL_CMAKE_OPTION}} \
             -S ${{github.workspace}} \

.github/workflows/windows_mingw.yml

@@ -73,7 +73,7 @@ jobs:
             tar
 
       - name: Configure CMake
-        run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON -DCHECK_VERSION=OFF
+        run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCH_MAP_BOOL_TO_UINT8=OFF -DBUILD_TESTS=ON -DCHECK_VERSION=OFF
         # -DWITH_OPENSSL=ON was not able to make it work (some strange issues with CA paths, need debug)
         # -DCHECK_VERSION=OFF since it requires git, which can't be found from within cmake for some reason.
 

.github/workflows/windows_msvc.yml

@@ -47,7 +47,7 @@ jobs:
       - uses: ilammy/msvc-dev-cmd@v1
 
       - name: Configure CMake
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCH_MAP_BOOL_TO_UINT8=OFF -DBUILD_TESTS=ON
 
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

CMakeLists.txt

@@ -21,6 +21,7 @@ OPTION (WITH_SYSTEM_ZSTD "Use system ZSTD" OFF)
 OPTION (DEBUG_DEPENDENCIES "Print debug info about dependencies duting build" ON)
 OPTION (CHECK_VERSION "Check that version number corresponds to git tag, usefull in CI/CD to validate that new version published on GitHub has same version in sources" OFF)
 OPTION (DISABLE_CLANG_LIBC_WORKAROUND "Disable linking compiler-rt & gcc_s if using clang & libstdc++" OFF)
+OPTION (CH_MAP_BOOL_TO_UINT8 "Map ClickHouse Bool type to UInt8 instead of exposing a distinct Bool API." ON)
 
 PROJECT (CLICKHOUSE-CLIENT
     VERSION "${CLICKHOUSE_CPP_VERSION}"

README.md

@@ -6,6 +6,7 @@ C++ client for [ClickHouse](https://clickhouse.com/).
 ## Supported data types
 
 * Array(T)
+* Bool (mapped to UInt8 by default; use `-DCH_MAP_BOOL_TO_UINT8=OFF` for a distinct `clickhouse::Bool`/`ColumnBool` API)
 * Date
 * DateTime, DateTime64
 * DateTime([timezone]), DateTime64(N, [timezone])
@@ -26,6 +27,10 @@ C++ client for [ClickHouse](https://clickhouse.com/).
 * JSON - experimental support; requires output_format_native_write_json_as_string=1; data is passed as strings
 
 
+The distinct `Bool` type will become the default in some future version. The
+current mapping to `UInt8` is provided only for compatibility and controlled via
+`DCH_MAP_BOOL_TO_UINT8`.
+
 ## Dependencies
 In the most basic case one needs only:
 - a C++-17-complaint compiler,
@@ -258,5 +263,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
 ```
-
-

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
@@ -53,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
@@ -122,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)

clickhouse/columns/bool.cpp

@@ -0,0 +1,79 @@
+#include "bool.h"
+
+#include "../types/types.h"
+
+#if !CH_MAP_BOOL_TO_UINT8
+
+namespace clickhouse {
+
+ColumnBool::ColumnBool()
+    : Column(Type::CreateSimple<bool>())
+    , data_()
+{
+}
+
+ColumnBool::ColumnBool(std::vector<uint8_t> data)
+    : Column(Type::CreateSimple<bool>())
+    , data_(std::move(data))
+{
+}
+
+void ColumnBool::Reserve(size_t new_cap) {
+    data_.Reserve(new_cap);
+}
+
+void ColumnBool::Append(bool value) {
+    data_.Append(static_cast<uint8_t>(value));
+}
+
+bool ColumnBool::At(size_t n) const {
+    return static_cast<bool>(data_.At(n));
+}
+
+void ColumnBool::Append(ColumnRef column) {
+    if (auto col = column->As<ColumnBool>()) {
+        auto& src = col->data_.GetWritableData();
+        data_.GetWritableData().insert(data_.GetWritableData().end(), src.begin(), src.end());
+    } else if (auto col = column->As<ColumnUInt8>()) {
+        auto& src = col->GetWritableData();
+        data_.GetWritableData().insert(data_.GetWritableData().end(), src.begin(), src.end());
+    }
+}
+
+bool ColumnBool::LoadBody(InputStream* input, size_t rows) {
+    return data_.LoadBody(input, rows);
+}
+
+void ColumnBool::SaveBody(OutputStream* output) {
+    data_.SaveBody(output);
+}
+
+void ColumnBool::Clear() {
+    data_.Clear();
+}
+
+size_t ColumnBool::Size() const {
+    return data_.Size();
+}
+
+ColumnRef ColumnBool::Slice(size_t begin, size_t len) const {
+    auto sliced = std::static_pointer_cast<ColumnUInt8>(data_.Slice(begin, len));
+    return std::make_shared<ColumnBool>(std::move(sliced->GetWritableData()));
+}
+
+ColumnRef ColumnBool::CloneEmpty() const {
+    return std::make_shared<ColumnBool>();
+}
+
+void ColumnBool::Swap(Column& other) {
+    auto& col = dynamic_cast<ColumnBool&>(other);
+    data_.Swap(col.data_);
+}
+
+ItemView ColumnBool::GetItem(size_t index) const {
+    return ItemView{Type::Bool, data_.At(index)};
+}
+
+}  // namespace clickhouse
+
+#endif  // !CH_MAP_BOOL_TO_UINT8

clickhouse/columns/bool.h

@@ -0,0 +1,63 @@
+#pragma once
+
+#include "column.h"
+#include "numeric.h"
+
+#include "../types/types.h"
+
+#if !CH_MAP_BOOL_TO_UINT8
+
+#include <vector>
+
+namespace clickhouse {
+
+class ColumnBool : public Column {
+public:
+    using ValueType = bool;
+
+    ColumnBool();
+    explicit ColumnBool(std::vector<uint8_t> data);
+
+    /// Increase the capacity of the column for large block insertion.
+    void Reserve(size_t new_cap) override;
+
+    /// Appends one element to the end of column.
+    void Append(bool value);
+
+    /// Returns element at given row number.
+    bool At(size_t n) const;
+
+    /// Returns element at given row number.
+    bool operator[](size_t n) const { return At(n); }
+
+public:
+    /// Appends content of given column to the end of current one.
+    /// Accepts ColumnBool or ColumnUInt8.
+    void Append(ColumnRef column) override;
+
+    /// Loads column data from input stream.
+    bool LoadBody(InputStream* input, size_t rows) override;
+
+    /// Saves column data to output stream.
+    void SaveBody(OutputStream* output) override;
+
+    /// Clear column data.
+    void Clear() override;
+
+    /// Returns count of rows in the column.
+    size_t Size() const override;
+
+    /// Makes slice of the current column.
+    ColumnRef Slice(size_t begin, size_t len) const override;
+    ColumnRef CloneEmpty() const override;
+    void Swap(Column& other) override;
+
+    ItemView GetItem(size_t index) const override;
+
+private:
+    ColumnUInt8 data_;
+};
+
+}  // namespace clickhouse
+
+#endif  // !CH_MAP_BOOL_TO_UINT8

clickhouse/columns/factory.cpp

@@ -13,6 +13,7 @@
 #include "map.h"
 #include "nothing.h"
 #include "nullable.h"
+#include "bool.h"
 #include "numeric.h"
 #include "string.h"
 #include "./time.h" // `./` avoids possible conflicts with standard C time.h
@@ -50,6 +51,10 @@ static ColumnRef CreateTerminalColumn(const TypeAst& ast) {
     case Type::Void:
         return std::make_shared<ColumnNothing>();
 
+#if !CH_MAP_BOOL_TO_UINT8
+    case Type::Bool:
+        return std::make_shared<ColumnBool>();
+#endif
     case Type::UInt8:
         return std::make_shared<ColumnUInt8>();
     case Type::UInt16:

clickhouse/columns/itemview.cpp

@@ -44,6 +44,9 @@ void ItemView::ValidateData(Type::Code type, DataType data) {
         case Type::Code::Int8:
         case Type::Code::UInt8:
         case Type::Code::Enum8:
+#if !CH_MAP_BOOL_TO_UINT8
+        case Type::Code::Bool:
+#endif
             return AssertSize({1});
 
         case Type::Code::Int16:

clickhouse/columns/itemview.h

@@ -28,7 +28,9 @@ struct ItemView {
     inline auto ConvertToStorageValue(const T& t) {
         if constexpr (std::is_same_v<std::string_view, T> || std::is_same_v<std::string, T>) {
             return std::string_view{t};
-        } else if constexpr (std::is_fundamental_v<T> || std::is_same_v<Int128, std::decay_t<T>> || std::is_same_v<UInt128, std::decay_t<T>>) {
+        } else if constexpr (std::is_fundamental_v<T>
+                          || std::is_same_v<Int128, std::decay_t<T>>
+                          || std::is_same_v<UInt128, std::decay_t<T>>) {
             return std::string_view{reinterpret_cast<const char*>(&t), sizeof(T)};
         } else {
             static_assert(!std::is_same_v<T, T>, "Unknown type, which can't be stored in ItemView");
@@ -65,7 +67,9 @@ struct ItemView {
         using ValueType = std::remove_cv_t<std::decay_t<T>>;
         if constexpr (std::is_same_v<std::string_view, ValueType> || std::is_same_v<std::string, ValueType>) {
             return data;
-        } else if constexpr (std::is_fundamental_v<ValueType> || std::is_same_v<Int128, ValueType> || std::is_same_v<UInt128, ValueType>) {
+        } else if constexpr (std::is_fundamental_v<ValueType>
+                          || std::is_same_v<Int128, ValueType>
+                          || std::is_same_v<UInt128, ValueType>) {
             if (sizeof(ValueType) == data.size()) {
                 return *reinterpret_cast<const T*>(data.data());
             } else {

clickhouse/types/type_parser.cpp

@@ -34,7 +34,11 @@ static const std::unordered_map<std::string, Type::Code> kTypeCode = {
     { "Int16",       Type::Int16 },
     { "Int32",       Type::Int32 },
     { "Int64",       Type::Int64 },
+#if CH_MAP_BOOL_TO_UINT8
     { "Bool",        Type::UInt8 },
+#else
+    { "Bool",        Type::Bool },
+#endif
     { "UInt8",       Type::UInt8 },
     { "UInt16",      Type::UInt16 },
     { "UInt32",      Type::UInt32 },

clickhouse/types/types.cpp

@@ -55,6 +55,9 @@ const char* Type::TypeName(Type::Code code) {
         case Type::Code::Time:           return "Time";
         case Type::Code::Time64:         return "Time64";
         case Type::Code::JSON:           return "JSON";
+#if !CH_MAP_BOOL_TO_UINT8
+        case Type::Code::Bool:           return "Bool";
+#endif
     }
 
     return "Unknown type";
@@ -87,6 +90,9 @@ std::string Type::GetName() const {
         case Polygon:
         case MultiPolygon:
         case JSON:
+#if !CH_MAP_BOOL_TO_UINT8
+        case Bool:
+#endif
             return TypeName(code_);
         case Time64:
             return As<Time64Type>()->GetName();
@@ -149,6 +155,9 @@ uint64_t Type::GetTypeUniqueId() const {
         case Ring:
         case Polygon:
         case MultiPolygon:
+#if !CH_MAP_BOOL_TO_UINT8
+        case Bool:
+#endif
             // For simple types, unique ID is the same as Type::Code
             return code_;
 

clickhouse/types/types.h

@@ -9,12 +9,17 @@
 #include <vector>
 #include <stdexcept>
 
+#ifndef CH_MAP_BOOL_TO_UINT8
+#define CH_MAP_BOOL_TO_UINT8 1
+#endif
+
 namespace clickhouse {
 
 using Int128 = absl::int128;
 using UInt128 = absl::uint128;
 using Int64 = int64_t;
 
+
 using TypeRef = std::shared_ptr<class Type>;
 
 class Type {
@@ -60,6 +65,9 @@ class Type {
         Time,
         Time64,
         JSON,
+#if !CH_MAP_BOOL_TO_UINT8
+        Bool,
+#endif
     };
 
     using EnumItem = std::pair<std::string /* name */, int16_t /* value */>;
@@ -394,6 +402,13 @@ inline TypeRef Type::CreateSimple<uint64_t>() {
     return TypeRef(new Type(UInt64));
 }
 
+#if !CH_MAP_BOOL_TO_UINT8
+template <>
+inline TypeRef Type::CreateSimple<bool>() {
+    return TypeRef(new Type(Bool));
+}
+#endif
+
 template <>
 inline TypeRef Type::CreateSimple<float>() {
     return TypeRef(new Type(Float32));