Merge branch 'master' of https://github.com/ClickHouse/clickhouse-cpp into support-date32

Author: huyphams

clickhouse/CMakeLists.txt

@@ -7,6 +7,7 @@ SET ( clickhouse-cpp-lib-src
     base/wire_format.cpp
 
     columns/array.cpp
+    columns/column.cpp
     columns/date.cpp
     columns/decimal.cpp
     columns/enum.cpp

clickhouse/base/wire_format.cpp

@@ -40,7 +40,7 @@ void WireFormat::WriteAll(OutputStream& output, const void* buf, size_t len) {
     }
 
     if (len) {
-        throw Error("Failed to write " + std::to_string(original_len)
+        throw ProtocolError("Failed to write " + std::to_string(original_len)
                 + " bytes, only written " + std::to_string(original_len - len));
     }
 }

clickhouse/client.cpp

@@ -419,6 +419,10 @@ bool Client::Impl::ReceivePacket(uint64_t* server_packet) {
         return true;
     }
 
+    case ServerCodes::Hello: {
+        return true;
+    }
+
     case ServerCodes::EndOfStream: {
         if (events_) {
             events_->OnFinish();

clickhouse/columns/array.cpp

@@ -5,9 +5,21 @@
 namespace clickhouse {
 
 ColumnArray::ColumnArray(ColumnRef data)
+    : ColumnArray(data, std::make_shared<ColumnUInt64>())
+{
+}
+
+ColumnArray::ColumnArray(ColumnRef data, std::shared_ptr<ColumnUInt64> offsets)
     : Column(Type::CreateArray(data->Type()))
     , data_(data)
-    , offsets_(std::make_shared<ColumnUInt64>())
+    , offsets_(offsets)
+{
+}
+
+ColumnArray::ColumnArray(ColumnArray&& other)
+    : Column(other.Type())
+    , data_(std::move(other.data_))
+    , offsets_(std::move(other.offsets_))
 {
 }
 
@@ -18,30 +30,33 @@ void ColumnArray::AppendAsColumn(ColumnRef array) {
             "to column type " + data_->Type()->GetName());
     }
 
-    if (offsets_->Size() == 0) {
-        offsets_->Append(array->Size());
-    } else {
-        offsets_->Append((*offsets_)[offsets_->Size() - 1] + array->Size());
-    }
-
+    AddOffset(array->Size());
     data_->Append(array);
 }
 
 ColumnRef ColumnArray::GetAsColumn(size_t n) const {
+    if (n >= Size())
+        throw ValidationError("Index is out ouf bounds: " + std::to_string(n));
+
     return data_->Slice(GetOffset(n), GetSize(n));
 }
 
 ColumnRef ColumnArray::Slice(size_t begin, size_t size) const {
-    auto result = std::make_shared<ColumnArray>(GetAsColumn(begin));
-    result->OffsetsIncrease(1);
+    if (size && begin + size > Size())
+        throw ValidationError("Slice indexes are out of bounds");
 
-    for (size_t i = 1; i < size; i++) {
-        result->Append(std::make_shared<ColumnArray>(GetAsColumn(begin + i)));
+    auto result = std::make_shared<ColumnArray>(data_->CloneEmpty());
+    for (size_t i = 0; i < size; i++) {
+        result->AppendAsColumn(GetAsColumn(begin + i));
     }
 
     return result;
 }
 
+ColumnRef ColumnArray::CloneEmpty() const {
+    return std::make_shared<ColumnArray>(data_->CloneEmpty());
+}
+
 void ColumnArray::Append(ColumnRef column) {
     if (auto col = column->As<ColumnArray>()) {
         if (!col->data_->Type()->IsEqual(data_->Type())) {
@@ -54,22 +69,34 @@ void ColumnArray::Append(ColumnRef column) {
     }
 }
 
-bool ColumnArray::Load(InputStream* input, size_t rows) {
+bool ColumnArray::LoadPrefix(InputStream* input, size_t rows) {
     if (!rows) {
         return true;
     }
-    if (!offsets_->Load(input, rows)) {
+
+    return data_->LoadPrefix(input, rows);
+}
+
+bool ColumnArray::LoadBody(InputStream* input, size_t rows) {
+    if (!rows) {
+        return true;
+    }
+    if (!offsets_->LoadBody(input, rows)) {
         return false;
     }
-    if (!data_->Load(input, (*offsets_)[rows - 1])) {
+    if (!data_->LoadBody(input, (*offsets_)[rows - 1])) {
         return false;
     }
     return true;
 }
 
-void ColumnArray::Save(OutputStream* output) {
-    offsets_->Save(output);
-    data_->Save(output);
+void ColumnArray::SavePrefix(OutputStream* output) {
+    data_->SavePrefix(output);
+}
+
+void ColumnArray::SaveBody(OutputStream* output) {
+    offsets_->SaveBody(output);
+    data_->SaveBody(output);
 }
 
 void ColumnArray::Clear() {
@@ -92,11 +119,29 @@ void ColumnArray::OffsetsIncrease(size_t n) {
 }
 
 size_t ColumnArray::GetOffset(size_t n) const {
+
     return (n == 0) ? 0 : (*offsets_)[n - 1];
 }
 
+void ColumnArray::AddOffset(size_t n) {
+    if (offsets_->Size() == 0) {
+        offsets_->Append(n);
+    } else {
+        offsets_->Append((*offsets_)[offsets_->Size() - 1] + n);
+    }
+}
+
 size_t ColumnArray::GetSize(size_t n) const {
     return (n == 0) ? (*offsets_)[n] : ((*offsets_)[n] - (*offsets_)[n - 1]);
 }
 
+ColumnRef ColumnArray::GetData() {
+    return data_;
+}
+
+void ColumnArray::Reset() {
+    data_.reset();
+    offsets_.reset();
+}
+
 }