rebase to trunk

clickhouse/columns/geo.cpp

@@ -34,13 +34,13 @@ namespace clickhouse {
 
 template <typename NestedColumnType, Type::Code type_code>
 ColumnGeo<NestedColumnType, type_code>::ColumnGeo()
-    : Column(std::move(CreateGeoType<type_code>())),
+    : Column(std::move(CreateGeoType<type_code>()), Serialization::MakeDefault(this)),
       data_(std::move(CreateColumn<NestedColumnType>())) {
 }
 
 template <typename NestedColumnType, Type::Code type_code>
 ColumnGeo<NestedColumnType, type_code>::ColumnGeo(ColumnRef data)
-    : Column(std::move(CreateGeoType<type_code>()))
+    : Column(std::move(CreateGeoType<type_code>()), Serialization::MakeDefault(this))
     , data_(std::move(WrapColumn<NestedColumnType>(std::move(data)))) {
 }
 
@@ -66,16 +66,6 @@ void ColumnGeo<NestedColumnType, type_code>::Append(ColumnRef column) {
     }
 }
 
-template <typename NestedColumnType, Type::Code type_code>
-bool ColumnGeo<NestedColumnType, type_code>::LoadBody(InputStream* input, size_t rows) {
-    return data_->LoadBody(input, rows);
-}
-
-template <typename NestedColumnType, Type::Code type_code>
-void ColumnGeo<NestedColumnType, type_code>::SaveBody(OutputStream* output) {
-    data_->SaveBody(output);
-}
-
 template <typename NestedColumnType, Type::Code type_code>
 size_t ColumnGeo<NestedColumnType, type_code>::Size() const {
     return data_->Size();
@@ -97,6 +87,40 @@ void ColumnGeo<NestedColumnType, type_code>::Swap(Column& other) {
     data_.swap(col.data_);
 }
 
+template <typename NestedColumnType, Type::Code type_code>
+void ColumnGeo<NestedColumnType, type_code>::SetSerializationKind(Serialization::Kind kind) {
+    switch (kind)
+    {
+    case Serialization::Kind::DEFAULT:
+        serialization_ = Serialization::MakeDefault(this);
+        break;
+    default:
+        throw UnimplementedError("Serialization kind:" + std::to_string(static_cast<int>(kind))
+            + " is not supported for column of " + type_->GetName());
+    }
+}
+
+template <typename NestedColumnType, Type::Code type_code>
+bool ColumnGeo<NestedColumnType, type_code>::LoadPrefix(InputStream* input, size_t rows) {
+    return data_->GetSerialization()->LoadPrefix(data_.get(), input, rows);
+}
+
+template <typename NestedColumnType, Type::Code type_code>
+bool ColumnGeo<NestedColumnType, type_code>::LoadBody(InputStream* input, size_t rows) {
+    return data_->GetSerialization()->LoadBody(data_.get(), input, rows);
+}
+
+template <typename NestedColumnType, Type::Code type_code>
+void ColumnGeo<NestedColumnType, type_code>::SavePrefix(OutputStream* output) {
+    data_->GetSerialization()->SavePrefix(data_.get(), output);
+}
+
+template <typename NestedColumnType, Type::Code type_code>
+void ColumnGeo<NestedColumnType, type_code>::SaveBody(OutputStream* output) {
+    data_->GetSerialization()->SaveBody(data_.get(), output);
+}
+
+
 template class ColumnGeo<ColumnTupleT<ColumnFloat64, ColumnFloat64>, Type::Code::Point>;
 
 template class ColumnGeo<ColumnArrayT<ColumnPoint>, Type::Code::Ring>;

clickhouse/columns/geo.h

@@ -32,12 +32,6 @@ class ColumnGeo : public Column {
     /// Appends content of given column to the end of current one.
     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;
 
@@ -49,7 +43,23 @@ class ColumnGeo : public Column {
     ColumnRef CloneEmpty() const override;
     void Swap(Column& other) override;
 
+    void SetSerializationKind(Serialization::Kind kind) override;
+
 private:
+    /// Loads column prefix from input stream.
+    bool LoadPrefix(InputStream* input, size_t rows);
+
+    /// Loads column data from input stream.
+    bool LoadBody(InputStream* input, size_t rows);
+
+    /// Saves column prefix to output stream.
+    void SavePrefix(OutputStream* output);
+
+    /// Saves column data to output stream.
+    void SaveBody(OutputStream* output);
+
+    friend SerializationDefault<ColumnGeo<NestedColumnType, type_code>>;
+
     std::shared_ptr<NestedColumnType> data_;
 };
 

clickhouse/columns/map.cpp

@@ -30,7 +30,8 @@ TypeRef GetMapType(const Type& data_type) {
 namespace clickhouse {
 
 ColumnMap::ColumnMap(ColumnRef data)
-    : Column(GetMapType(data->GetType())), data_(data->As<ColumnArray>()) {
+    : Column(GetMapType(data->GetType()), Serialization::MakeDefault(this))
+    , data_(data->As<ColumnArray>()) {
 }
 
 void ColumnMap::Clear() {
@@ -44,19 +45,19 @@ void ColumnMap::Append(ColumnRef column) {
 }
 
 bool ColumnMap::LoadPrefix(InputStream* input, size_t rows) {
-    return data_->LoadPrefix(input, rows);
+    return data_->GetSerialization()->LoadPrefix(data_.get(), input, rows);
 }
 
 bool ColumnMap::LoadBody(InputStream* input, size_t rows) {
-    return data_->LoadBody(input, rows);
+    return data_->GetSerialization()->LoadBody(data_.get(),input, rows);
 }
 
 void ColumnMap::SavePrefix(OutputStream* output) {
-    data_->SavePrefix(output);
+    data_->GetSerialization()->SavePrefix(data_.get(), output);
 }
 
 void ColumnMap::SaveBody(OutputStream* output) {
-    data_->SaveBody(output);
+    data_->GetSerialization()->SaveBody(data_.get(), output);
 }
 
 size_t ColumnMap::Size() const {
@@ -76,6 +77,18 @@ void ColumnMap::Swap(Column& other) {
     data_.swap(col.data_);
 }
 
+void ColumnMap::SetSerializationKind(Serialization::Kind kind) {
+    switch (kind)
+    {
+    case Serialization::Kind::DEFAULT:
+        serialization_ = Serialization::MakeDefault(this);
+        break;
+    default:
+        throw UnimplementedError("Serialization kind:" + std::to_string(static_cast<int>(kind))
+            + " is not supported for column of " + type_->GetName());
+    }
+}
+
 ColumnRef ColumnMap::GetAsColumn(size_t n) const {
     return data_->GetAsColumn(n);
 }

clickhouse/columns/map.h

@@ -28,18 +28,6 @@ class ColumnMap : public Column {
     /// Appends content of given column to the end of current one.
     void Append(ColumnRef column) override;
 
-    /// Loads column prefix from input stream.
-    bool LoadPrefix(InputStream* input, size_t rows) override;
-
-    /// Loads column data from input stream.
-    bool LoadBody(InputStream* input, size_t rows) override;
-
-    /// Saves column prefix to output stream.
-    void SavePrefix(OutputStream* output) override;
-
-    /// Saves column data to output stream.
-    void SaveBody(OutputStream* output) override;
-
     /// Clear column data .
     void Clear() override;
 
@@ -51,6 +39,8 @@ class ColumnMap : public Column {
     ColumnRef CloneEmpty() const override;
     void Swap(Column&) override;
 
+    void SetSerializationKind(Serialization::Kind kind) override;
+
     /// Converts map at pos n to column.
     /// Type of row is tuple {key, value}.
     ColumnRef GetAsColumn(size_t n) const;
@@ -62,6 +52,20 @@ class ColumnMap : public Column {
     ColumnMap(ColumnMap&& map);
 
 private:
+    /// Loads column prefix from input stream.
+    bool LoadPrefix(InputStream* input, size_t rows);
+
+    /// Loads column data from input stream.
+    bool LoadBody(InputStream* input, size_t rows);
+
+    /// Saves column prefix to output stream.
+    void SavePrefix(OutputStream* output);
+
+    /// Saves column data to output stream.
+    void SaveBody(OutputStream* output);
+
+    friend SerializationDefault<ColumnMap>;
+
     std::shared_ptr<ColumnArray> data_;
 };
 

clickhouse/columns/string.cpp

@@ -177,7 +177,7 @@ ColumnString::ColumnString()
 }
 
 ColumnString::ColumnString(size_t element_count)
-    : Column(Type::CreateString())
+    : Column(Type::CreateString(), Serialization::MakeDefault(this))
 {
     items_.reserve(element_count);
     // 100 is arbitrary number, assumption that string values are about ~40 bytes long.