Merge master and fix syntax error.

Author: huyphams

clickhouse/columns/date.cpp

@@ -88,27 +88,31 @@ void ColumnDate32::Append(ColumnRef column) {
     }
 }
 
-bool ColumnDate32::Load(InputStream* input, size_t rows) {
-    return data_->Load(input, rows);
+bool ColumnDate32::LoadBody(InputStream* input, size_t rows) {
+    return data_->LoadBody(input, rows);
 }
 
-void ColumnDate32::Save(OutputStream* output) {
-    data_->Save(output);
+void ColumnDate32::SaveBody(clickhouse/columns/date.cppOutputStream* output) {
+    data_->SaveBody(output);
 }
 
 size_t ColumnDate32::Size() const {
     return data_->Size();
 }
 
 ColumnRef ColumnDate32::Slice(size_t begin, size_t len) const {
-    auto col = data_->Slice(begin, len)->As<ColumnUInt16>();
+    auto col = data_->Slice(begin, len)->As<ColumnUInt32>();
     auto result = std::make_shared<ColumnDate32>();
 
     result->data_->Append(col);
 
     return result;
 }
 
+ColumnRef ColumnDate32::CloneEmpty() const {
+    return std::make_shared<ColumnDate32>();
+}
+
 void ColumnDate32::Swap(Column& other) {
     auto & col = dynamic_cast<ColumnDate32 &>(other);
     data_.swap(col.data_);
@@ -119,7 +123,6 @@ ItemView ColumnDate32::GetItem(size_t index) const {
 }
 
 
-
 ColumnDateTime::ColumnDateTime()
     : Column(Type::CreateDateTime())
     , data_(std::make_shared<ColumnUInt32>())

clickhouse/columns/date.h

@@ -49,7 +49,6 @@ class ColumnDate : public Column {
 };
 
 
-/** */
 class ColumnDate32 : public Column {
 public:
     using ValueType = std::time_t;
@@ -68,10 +67,10 @@ class ColumnDate32 : public Column {
     void Append(ColumnRef column) override;
 
     /// Loads column data from input stream.
-    bool Load(InputStream* input, size_t rows) override;
+    bool LoadBody(InputStream* input, size_t rows) override;
 
     /// Saves column data to output stream.
-    void Save(OutputStream* output) override;
+    void SaveBody(OutputStream* output) override;
 
     /// Clear column data .
     void Clear() override;
@@ -81,7 +80,7 @@ class ColumnDate32 : public Column {
 
     /// 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;