More column-generic tests

- roundtrip to server

Author: Enmk

ut/CMakeLists.txt

@@ -19,6 +19,7 @@ SET ( clickhouse-cpp-ut-src
     array_of_low_cardinality_tests.cpp
     CreateColumnByType_ut.cpp
     Column_ut.cpp
+    roundtrip_column.cpp
 
     utils.cpp
     value_generators.cpp

ut/Column_ut.cpp

@@ -13,9 +13,12 @@
 #include <clickhouse/base/output.h>
 #include <clickhouse/base/socket.h> // for ipv4-ipv6 platform-specific stuff
 
+#include <clickhouse/client.h>
+
 #include <gtest/gtest.h>
 
 #include "utils.h"
+#include "roundtrip_column.h"
 #include "value_generators.h"
 
 namespace {
@@ -262,3 +265,20 @@ TYPED_TEST(GenericColumnTest, LoadAndSave) {
 
     EXPECT_TRUE(CompareRecursive(*column_A, *column_B));
 }
+
+const auto LocalHostEndpoint = ClientOptions()
+        .SetHost(           getEnvOrDefault("CLICKHOUSE_HOST",     "localhost"))
+        .SetPort(   getEnvOrDefault<size_t>("CLICKHOUSE_PORT",     "9000"))
+        .SetUser(           getEnvOrDefault("CLICKHOUSE_USER",     "default"))
+        .SetPassword(       getEnvOrDefault("CLICKHOUSE_PASSWORD", ""))
+        .SetDefaultDatabase(getEnvOrDefault("CLICKHOUSE_DB",       "default"));
+
+TYPED_TEST(GenericColumnTest, RoundTrip) {
+    auto [column, values] = this->MakeColumnWithValues(100);
+    EXPECT_EQ(values.size(), column->Size());
+
+    clickhouse::Client client(LocalHostEndpoint);
+
+    auto result_typed = RoundtripColumnValues(client, column)->template AsStrict<typename TestFixture::ColumnType>();
+    EXPECT_TRUE(CompareRecursive(*column, *result_typed));
+}

ut/client_ut.cpp

@@ -3,6 +3,7 @@
 #include "readonly_client_test.h"
 #include "connection_failed_client_test.h"
 #include "utils.h"
+#include "roundtrip_column.h"
 
 #include <gtest/gtest.h>
 
@@ -978,35 +979,6 @@ TEST_P(ClientCase, DISABLED_ArrayArrayUInt64) {
     }
 }
 
-ColumnRef RoundtripColumnValues(Client& client, ColumnRef expected) {
-    // Create a temporary table with a single column
-    // insert values from `expected`
-    // select and aggregate all values from block into `result` column
-    auto result = expected->CloneEmpty();
-
-    const std::string type_name = result->GetType().GetName();
-    client.Execute("DROP TEMPORARY TABLE IF EXISTS temporary_roundtrip_table;");
-    client.Execute("CREATE TEMPORARY TABLE IF NOT EXISTS temporary_roundtrip_table (col " + type_name + ");");
-    {
-        Block block;
-        block.AppendColumn("col", expected);
-        block.RefreshRowCount();
-        client.Insert("temporary_roundtrip_table", block);
-    }
-
-    client.Select("SELECT col FROM temporary_roundtrip_table", [&result](const Block& b) {
-        if (b.GetRowCount() == 0)
-            return;
-
-        ASSERT_EQ(1u, b.GetColumnCount());
-        result->Append(b[0]);
-    });
-
-    EXPECT_EQ(expected->GetType(), result->GetType());
-    EXPECT_EQ(expected->Size(), result->Size());
-    return result;
-}
-
 TEST_P(ClientCase, RoundtripArrayTUint64) {
     auto array = std::make_shared<ColumnArrayT<ColumnUInt64>>();
     array->Append({0, 1, 2});

ut/roundtrip_column.cpp

@@ -0,0 +1,40 @@
+#include "roundtrip_column.h"
+
+#include <clickhouse/client.h>
+#include <clickhouse/block.h>
+
+#include <gtest/gtest.h>
+
+namespace {
+using namespace clickhouse;
+}
+
+ColumnRef RoundtripColumnValues(Client& client, ColumnRef expected) {
+    // Create a temporary table with a single column
+    // insert values from `expected`
+    // select and aggregate all values from block into `result` column
+    auto result = expected->CloneEmpty();
+
+    const std::string type_name = result->GetType().GetName();
+    client.Execute("DROP TEMPORARY TABLE IF EXISTS temporary_roundtrip_table;");
+    client.Execute("CREATE TEMPORARY TABLE IF NOT EXISTS temporary_roundtrip_table (col " + type_name + ");");
+    {
+        Block block;
+        block.AppendColumn("col", expected);
+        block.RefreshRowCount();
+        client.Insert("temporary_roundtrip_table", block);
+    }
+
+    client.Select("SELECT col FROM temporary_roundtrip_table", [&result](const Block& b) {
+        if (b.GetRowCount() == 0)
+            return;
+
+        ASSERT_EQ(1u, b.GetColumnCount());
+        result->Append(b[0]);
+    });
+
+    EXPECT_EQ(expected->GetType(), result->GetType());
+    EXPECT_EQ(expected->Size(), result->Size());
+
+    return result;
+}

ut/roundtrip_column.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <clickhouse/columns/column.h>
+
+namespace clickhouse {
+    class Client;
+}
+
+clickhouse::ColumnRef RoundtripColumnValues(clickhouse::Client& client, clickhouse::ColumnRef expected);

ut/utils.cpp

@@ -18,6 +18,7 @@
 #include <iomanip>
 #include <sstream>
 
+
 namespace {
 using namespace clickhouse;
 std::ostream & printColumnValue(const ColumnRef& c, const size_t row, std::ostream & ostr);

ut/utils.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <clickhouse/base/platform.h>
-#include <clickhouse/columns/uuid.h>
 
 #include "utils_meta.h"
 #include "utils_comparison.h"
@@ -18,6 +17,7 @@
 #include <gtest/gtest.h>
 
 namespace clickhouse {
+    class Client;
     class Block;
     class Type;
     struct ServerInfo;
@@ -135,5 +135,3 @@ std::ostream& operator<<(std::ostream & ostr, const PrintContainer<T>& print_con
 
     return ostr << "]";
 }
-
-

ut/value_generators.h

@@ -2,6 +2,7 @@
 
 #include <clickhouse/base/socket.h> // for ipv4-ipv6 platform-specific stuff
 #include <clickhouse/columns/numeric.h>
+#include <clickhouse/columns/uuid.h>
 
 #include "utils.h"