Fixed GCC-7 build

Author: Enmk

ut/Column_ut.cpp

@@ -164,6 +164,7 @@ TYPED_TEST(GenericColumnTest, Slice) {
 
 TYPED_TEST(GenericColumnTest, CloneEmpty) {
     auto [column, values] = this->MakeColumnWithValues(100);
+    EXPECT_EQ(values.size(), column->Size());
 
     auto clone_untyped = column->CloneEmpty();
     // Check that type matches
@@ -175,6 +176,7 @@ TYPED_TEST(GenericColumnTest, CloneEmpty) {
 
 TYPED_TEST(GenericColumnTest, Clear) {
     auto [column, values] = this->MakeColumnWithValues(100);
+    EXPECT_EQ(values.size(), column->Size());
 
     column->Clear();
     EXPECT_EQ(0u, column->Size());

ut/client_ut.cpp

@@ -12,17 +12,6 @@
 
 using namespace clickhouse;
 
-namespace clickhouse {
-std::ostream & operator<<(std::ostream & ostr, const ServerInfo & server_info) {
-    return ostr << server_info.name << "/" << server_info.display_name
-                << " ver "
-                << server_info.version_major << "."
-                << server_info.version_minor << "."
-                << server_info.version_patch
-                << " (" << server_info.revision << ")";
-}
-}
-
 namespace {
 
 uint64_t versionNumber(
@@ -1013,7 +1002,7 @@ ColumnRef RoundtripColumnValues(Client& client, ColumnRef expected) {
         result->Append(b[0]);
     });
 
-    EXPECT_EQ(expected->Type(), result->Type());
+    EXPECT_EQ(expected->GetType(), result->GetType());
     EXPECT_EQ(expected->Size(), result->Size());
     return result;
 }

ut/utils.cpp

@@ -1,6 +1,7 @@
 #include "utils.h"
 
 #include <clickhouse/block.h>
+#include <clickhouse/client.h>
 #include <clickhouse/columns/column.h>
 #include <clickhouse/columns/array.h>
 #include <clickhouse/columns/date.h>
@@ -154,28 +155,6 @@ std::ostream & operator<<(std::ostream & ostr, const ColumnValue& v) {
 
 }
 
-std::ostream& operator<<(std::ostream & ostr, const Block & block) {
-    if (block.GetRowCount() == 0 || block.GetColumnCount() == 0)
-        return ostr;
-
-    for (size_t col = 0; col < block.GetColumnCount(); ++col) {
-        const auto & c = block[col];
-        ostr << c->GetType().GetName() << " [";
-
-        for (size_t row = 0; row < block.GetRowCount(); ++row) {
-            printColumnValue(c, row, ostr);
-            if (row != block.GetRowCount() - 1)
-                ostr << ", ";
-        }
-        ostr << "]";
-
-        if (col != block.GetColumnCount() - 1)
-            ostr << "\n";
-    }
-
-    return ostr;
-}
-
 std::ostream& operator<<(std::ostream & ostr, const PrettyPrintBlock & pretty_print_block) {
     // Pretty-print block:
     // - names of each column
@@ -249,7 +228,41 @@ std::ostream& operator<<(std::ostream& ostr, const in6_addr& addr) {
     return ostr << ip_str;
 }
 
-std::ostream& operator<<(std::ostream & ostr, const clickhouse::Type & type) {
+namespace clickhouse {
+
+std::ostream& operator<<(std::ostream & ostr, const Block & block) {
+    if (block.GetRowCount() == 0 || block.GetColumnCount() == 0)
+        return ostr;
+
+    for (size_t col = 0; col < block.GetColumnCount(); ++col) {
+        const auto & c = block[col];
+        ostr << c->GetType().GetName() << " [";
+
+        for (size_t row = 0; row < block.GetRowCount(); ++row) {
+            printColumnValue(c, row, ostr);
+            if (row != block.GetRowCount() - 1)
+                ostr << ", ";
+        }
+        ostr << "]";
+
+        if (col != block.GetColumnCount() - 1)
+            ostr << "\n";
+    }
+
+    return ostr;
+}
+
+std::ostream& operator<<(std::ostream & ostr, const Type & type) {
     return ostr << type.GetName();
 }
 
+std::ostream & operator<<(std::ostream & ostr, const ServerInfo & server_info) {
+    return ostr << server_info.name << "/" << server_info.display_name
+                << " ver "
+                << server_info.version_major << "."
+                << server_info.version_minor << "."
+                << server_info.version_patch
+                << " (" << server_info.revision << ")";
+}
+
+}

ut/utils.h

@@ -20,6 +20,7 @@
 namespace clickhouse {
     class Block;
     class Type;
+    struct ServerInfo;
 }
 
 template <typename ResultType = std::string>
@@ -93,9 +94,13 @@ struct PrettyPrintBlock {
     const clickhouse::Block & block;
 };
 
-std::ostream& operator<<(std::ostream & ostr, const clickhouse::Block & block);
+namespace clickhouse {
+std::ostream& operator<<(std::ostream & ostr, const Block & block);
+std::ostream& operator<<(std::ostream & ostr, const Type & type);
+std::ostream & operator<<(std::ostream & ostr, const ServerInfo & server_info);
+}
+
 std::ostream& operator<<(std::ostream & ostr, const PrettyPrintBlock & block);
-std::ostream& operator<<(std::ostream & ostr, const clickhouse::Type & type);
 std::ostream& operator<<(std::ostream& ostr, const in_addr& addr);
 std::ostream& operator<<(std::ostream& ostr, const in6_addr& addr);