Merge branch 'fix-varint' of https://github.com/artpaul/clickhouse-cpp

Author: alexey-milovidov

clickhouse/base/coded.cpp

@@ -45,13 +45,13 @@ bool CodedInputStream::Skip(size_t count) {
 bool CodedInputStream::ReadVarint64(uint64_t* value) {
     *value = 0;
 
-    for (size_t i = 0; i < 9; ++i) {
+    for (size_t i = 0; i < MAX_VARINT_BYTES; ++i) {
         uint8_t byte;
 
         if (!input_->ReadByte(&byte)) {
             return false;
         } else {
-            *value |= (byte & 0x7F) << (7 * i);
+            *value |= uint64_t(byte & 0x7F) << (7 * i);
 
             if (!(byte & 0x80)) {
                 return true;
@@ -81,7 +81,7 @@ void CodedOutputStream::WriteVarint64(uint64_t value) {
     uint8_t bytes[MAX_VARINT_BYTES];
     int size = 0;
 
-    for (size_t i = 0; i < 9; ++i) {
+    for (size_t i = 0; i < MAX_VARINT_BYTES; ++i) {
         uint8_t byte = value & 0x7F;
         if (value > 0x7F)
             byte |= 0x80;

clickhouse/client.cpp

@@ -106,10 +106,6 @@ class Client::Impl {
     void WriteBlock(const Block& block, CodedOutputStream* output);
 
 private:
-    void Disconnect() {
-        socket_.Close();
-    }
-
     /// In case of network errors tries to reconnect to server and
     /// call fuc several times.
     void RetryGuard(std::function<void()> fuc);
@@ -186,9 +182,8 @@ Client::Impl::Impl(const ClientOptions& opts)
     }
 }
 
-Client::Impl::~Impl() {
-    Disconnect();
-}
+Client::Impl::~Impl()
+{ }
 
 void Client::Impl::ExecuteQuery(Query query) {
     EnsureNull en(static_cast<QueryEvents*>(&query), &events_);

ut/CMakeLists.txt

@@ -1,12 +1,13 @@
 ADD_EXECUTABLE (clickhouse-cpp-ut
     main.cpp
 
-    columns_ut.cpp
-    types_ut.cpp
-    type_parser_ut.cpp
     client_ut.cpp
+    columns_ut.cpp
     socket_ut.cpp
+    stream_ut.cpp
     tcp_server.cpp
+    type_parser_ut.cpp
+    types_ut.cpp
 )
 
 TARGET_LINK_LIBRARIES (clickhouse-cpp-ut

ut/stream_ut.cpp

@@ -0,0 +1,23 @@
+#include <clickhouse/base/coded.h>
+#include <contrib/gtest/gtest.h>
+
+using namespace clickhouse;
+
+TEST(CodedStreamCase, Varint64) {
+    Buffer buf;
+
+    {
+        BufferOutput output(&buf);
+        CodedOutputStream coded(&output);
+        coded.WriteVarint64(18446744071965638648ULL);
+    }
+
+
+    {
+        ArrayInput input(buf.data(), buf.size());
+        CodedInputStream coded(&input);
+        uint64_t value;
+        ASSERT_TRUE(coded.ReadVarint64(&value));
+        ASSERT_EQ(value, 18446744071965638648ULL);
+    }
+}