Merge pull request #33 from Enmk/low-cardinality

LowCardinality column implementation

Author: traceon

.travis.yml

@@ -35,7 +35,7 @@ matrix:
         - MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
 
     - os: osx
-      osx_image: xcode8.2
+      osx_image: xcode9.4
       compiler: clang
 
 before_install:
@@ -51,4 +51,4 @@ script:
   - cd build
   - cmake .. -DBUILD_TESTS=ON && make
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./ut/clickhouse-cpp-ut ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./ut/clickhouse-cpp-ut --gtest_filter='-Client/*' ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./ut/clickhouse-cpp-ut --gtest_filter=-"Client/*:*Performance*" ; fi

clickhouse/CMakeLists.txt

@@ -13,12 +13,15 @@ SET ( clickhouse-cpp-lib-src
     columns/factory.cpp
     columns/ip4.cpp
     columns/ip6.cpp
+    columns/lowcardinality.cpp
     columns/nullable.cpp
     columns/numeric.cpp
     columns/string.cpp
     columns/tuple.cpp
     columns/uuid.cpp
 
+    columns/itemview.cpp
+
     types/type_parser.cpp
     types/types.cpp
 
@@ -82,6 +85,8 @@ INSTALL(FILES columns/enum.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/factory.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/itemview.h DESTINATION include/clickhouse/columns/)
+INSTALL(FILES columns/lowcardinality.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/nullable.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/numeric.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/string.h DESTINATION include/clickhouse/columns/)

clickhouse/base/string_view.h

@@ -75,6 +75,11 @@ class StringViewImpl {
         return size_;
     }
 
+    // to mimic std::string and std::string_view
+    inline size_type length() const noexcept {
+        return size();
+    }
+
 public:
     // Returns a substring [pos, pos + count).
     // If the requested substring extends past the end of the string,

clickhouse/client.cpp

@@ -22,14 +22,19 @@
 #define DBMS_NAME                                       "ClickHouse"
 #define DBMS_VERSION_MAJOR                              1
 #define DBMS_VERSION_MINOR                              1
-#define REVISION                                        54126
+#define REVISION                                        54405
 
 #define DBMS_MIN_REVISION_WITH_TEMPORARY_TABLES         50264
 #define DBMS_MIN_REVISION_WITH_TOTAL_ROWS_IN_PROGRESS   51554
 #define DBMS_MIN_REVISION_WITH_BLOCK_INFO               51903
 #define DBMS_MIN_REVISION_WITH_CLIENT_INFO              54032
 #define DBMS_MIN_REVISION_WITH_SERVER_TIMEZONE          54058
 #define DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO 54060
+//#define DBMS_MIN_REVISION_WITH_TABLES_STATUS            54226
+//#define DBMS_MIN_REVISION_WITH_TIME_ZONE_PARAMETER_IN_DATETIME_DATA_TYPE 54337
+#define DBMS_MIN_REVISION_WITH_SERVER_DISPLAY_NAME      54372
+#define DBMS_MIN_REVISION_WITH_VERSION_PATCH            54401
+#define DBMS_MIN_REVISION_WITH_LOW_CARDINALITY_TYPE     54405
 
 namespace clickhouse {
 
@@ -45,14 +50,17 @@ struct ClientInfo {
     std::string initial_address = "[::ffff:127.0.0.1]:0";
     uint64_t client_version_major = 0;
     uint64_t client_version_minor = 0;
+    uint64_t client_version_patch = 0;
     uint32_t client_revision = 0;
 };
 
 struct ServerInfo {
     std::string name;
     std::string timezone;
+    std::string display_name;
     uint64_t    version_major;
     uint64_t    version_minor;
+    uint64_t    version_patch;
     uint64_t    revision;
 };
 
@@ -563,6 +571,9 @@ void Client::Impl::SendQuery(const std::string& query) {
 
         if (server_info_.revision >= DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO)
             WireFormat::WriteString(&output_, info.quota_key);
+        if (server_info_.revision >= DBMS_MIN_REVISION_WITH_VERSION_PATCH) {
+            WireFormat::WriteUInt64(&output_, info.client_version_patch);
+        }
     }
 
     /// Per query settings.
@@ -697,6 +708,18 @@ bool Client::Impl::ReceiveHello() {
             }
         }
 
+        if (server_info_.revision >= DBMS_MIN_REVISION_WITH_SERVER_DISPLAY_NAME) {
+            if (!WireFormat::ReadString(&input_, &server_info_.display_name)) {
+                return false;
+            }
+        }
+
+        if (server_info_.revision >= DBMS_MIN_REVISION_WITH_VERSION_PATCH) {
+            if (!WireFormat::ReadUInt64(&input_, &server_info_.version_patch)) {
+                return false;
+            }
+        }
+
         return true;
     } else if (packet_type == ServerCodes::Exception) {
         ReceiveException(true);

clickhouse/client.h

@@ -9,6 +9,7 @@
 #include "columns/enum.h"
 #include "columns/ip4.h"
 #include "columns/ip6.h"
+#include "columns/lowcardinality.h"
 #include "columns/nullable.h"
 #include "columns/numeric.h"
 #include "columns/string.h"

clickhouse/columns/array.cpp

@@ -78,6 +78,12 @@ size_t ColumnArray::Size() const {
     return offsets_->Size();
 }
 
+void ColumnArray::Swap(Column& other) {
+    auto & col = dynamic_cast<ColumnArray &>(other);
+    data_.swap(col.data_);
+    offsets_.swap(col.offsets_);
+}
+
 void ColumnArray::OffsetsIncrease(size_t n) {
     offsets_->Append(n);
 }

clickhouse/columns/array.h

@@ -38,6 +38,8 @@ class ColumnArray : public Column {
     /// Makes slice of the current column.
     ColumnRef Slice(size_t, size_t) override;
 
+    void Swap(Column&) override;
+
     void OffsetsIncrease(size_t);
 
 private:

clickhouse/columns/column.h

@@ -3,6 +3,9 @@
 #include "../base/coded.h"
 #include "../base/input.h"
 #include "../types/types.h"
+#include "../columns/itemview.h"
+
+#include <memory>
 
 namespace clickhouse {
 
@@ -31,6 +34,7 @@ class Column : public std::enable_shared_from_this<Column> {
 
     /// Get type object of the column.
     inline TypeRef Type() const { return type_; }
+    inline const class Type& GetType() const { return *type_; }
 
     /// Appends content of given column to the end of current one.
     virtual void Append(ColumnRef column) = 0;
@@ -50,6 +54,18 @@ class Column : public std::enable_shared_from_this<Column> {
     /// Makes slice of the current column.
     virtual ColumnRef Slice(size_t begin, size_t len) = 0;
 
+    virtual void Swap(Column&) = 0;
+
+    /// Get a view on raw item data if it is supported by column, will throw an exception if index is out of range.
+    /// Please note that view is invalidated once column is items are added or deleted, column is loaded from strean or destroyed.
+    virtual ItemView GetItem(size_t) const {
+        throw std::runtime_error("GetItem() is not supported for column of " + type_->GetName());
+    }
+
+    friend void swap(Column& left, Column& right) {
+        left.Swap(right);
+    }
+
 protected:
     TypeRef type_;
 };

clickhouse/columns/date.cpp

@@ -48,6 +48,16 @@ ColumnRef ColumnDate::Slice(size_t begin, size_t len) {
     return result;
 }
 
+void ColumnDate::Swap(Column& other) {
+    auto & col = dynamic_cast<ColumnDate &>(other);
+    data_.swap(col.data_);
+}
+
+ItemView ColumnDate::GetItem(size_t index) const {
+    return data_->GetItem(index);
+}
+
+
 
 ColumnDateTime::ColumnDateTime()
     : Column(Type::CreateDateTime())
@@ -94,4 +104,13 @@ ColumnRef ColumnDateTime::Slice(size_t begin, size_t len) {
     return result;
 }
 
+void ColumnDateTime::Swap(Column& other) {
+    auto & col = dynamic_cast<ColumnDateTime &>(other);
+    data_.swap(col.data_);
+}
+
+ItemView ColumnDateTime::GetItem(size_t index) const {
+    return data_->GetItem(index);
+}
+
 }

clickhouse/columns/date.h

@@ -37,6 +37,10 @@ class ColumnDate : public Column {
     /// Makes slice of the current column.
     ColumnRef Slice(size_t begin, size_t len) override;
 
+    void Swap(Column& other) override;
+
+    ItemView GetItem(size_t index) const override;
+
 private:
     std::shared_ptr<ColumnUInt16> data_;
 };
@@ -70,6 +74,10 @@ class ColumnDateTime : public Column {
     /// Makes slice of the current column.
     ColumnRef Slice(size_t begin, size_t len) override;
 
+    void Swap(Column& other) override;
+
+    ItemView GetItem(size_t index) const override;
+
 private:
     std::shared_ptr<ColumnUInt32> data_;
 };