Merge pull request #298 from Enmk/dont_run_query_id_tests_on_non_Linux

Dont run query id tests on non linux

Author: Enmk

.github/workflows/macos.yml

@@ -65,6 +65,7 @@ jobs:
       working-directory: ${{github.workspace}}/build/ut
       env:
         # It is impossible to start CH server in docker on macOS due to github actions limitations,
-        # so limit tests to ones that do no require server interaction.
-        GTEST_FILTER_ONLY_LOCAL: "-Client/*"
-      run: ./clickhouse-cpp-ut
+        # so we use remote server to execute tests, some do not allow some features for anonymoust/free users:
+        # - system.query_log used by 'Client/ClientCase.Query_ID'
+        GTEST_FILTER: "-Client/ClientCase.Query_ID*"
+      run: ./clickhouse-cpp-ut ${GTEST_FILTER}

.github/workflows/windows_mingw.yml

@@ -81,7 +81,12 @@ jobs:
             ./go-tlsoffloader.exe -l localhost:9000 -b github.demo.trial.altinity.cloud:9440 &
 
     - name: Test
-      run: ./build/ut/clickhouse-cpp-ut.exe
+      env:
+        # It is impossible to start CH server in docker on Windows due to github actions limitations,
+        # so we use remote server to execute tests, some do not allow some features for anonymoust/free users:
+        # - system.query_log used by 'Client/ClientCase.Query_ID'
+        GTEST_FILTER: "-Client/ClientCase.Query_ID*"
+      run: ./build/ut/clickhouse-cpp-ut.exe ${GTEST_FILTER}
 
     - name: Test (simple)
       run: ./build/tests/simple/simple-test.exe

.github/workflows/windows_msvc.yml

@@ -10,7 +10,6 @@ on:
 
 env:
   BUILD_TYPE: Release
-  GTEST_FILTER: --gtest_filter=-"*"
   CLICKHOUSE_USER: clickhouse_cpp_cicd
   CLICKHOUSE_PASSWORD: clickhouse_cpp_cicd
   #
@@ -58,5 +57,10 @@ jobs:
             ./go-tlsoffloader.exe -l localhost:9000 -b github.demo.trial.altinity.cloud:9440 &
 
     - name: Test
+      env:
+        # It is impossible to start CH server in docker on Windows due to github actions limitations,
+        # so we use remote server to execute tests, some do not allow some features for anonymoust/free users:
+        # - system.query_log used by 'Client/ClientCase.Query_ID'
+        GTEST_FILTER: "-Client/ClientCase.Query_ID*"
       working-directory: ${{github.workspace}}/build/ut
       run: Release\clickhouse-cpp-ut.exe "${{env.GTEST_FILTER}}"

clickhouse/query.h

@@ -80,6 +80,7 @@ using SelectCallback           = std::function<void(const Block& block)>;
 using SelectCancelableCallback = std::function<bool(const Block& block)>;
 using SelectServerLogCallback  = std::function<bool(const Block& block)>;
 using ProfileEventsCallback    = std::function<bool(const Block& block)>;
+using ProfileCallbak           = std::function<void(const Profile& profile)>;
 
 
 class Query : public QueryEvents {
@@ -159,6 +160,11 @@ class Query : public QueryEvents {
         return *this;
     }
 
+    inline Query& OnProfile(ProfileCallbak cb) {
+        profile_callback_cb_ = std::move(cb);
+        return *this;
+    }
+
     static const std::string default_query_id;
 
 private:
@@ -183,7 +189,8 @@ class Query : public QueryEvents {
     }
 
     void OnProfile(const Profile& profile) override {
-        (void)profile;
+        if (profile_callback_cb_)
+            profile_callback_cb_(profile);
     }
 
     void OnProgress(const Progress& progress) override {
@@ -218,6 +225,7 @@ class Query : public QueryEvents {
     SelectCancelableCallback select_cancelable_cb_;
     SelectServerLogCallback select_server_log_cb_;
     ProfileEventsCallback profile_events_callback_cb_;
+    ProfileCallbak profile_callback_cb_;
 };
 
 }

ut/client_ut.cpp

@@ -6,6 +6,7 @@
 
 #include <gtest/gtest.h>
 
+#include <optional>
 #include <thread>
 #include <chrono>
 
@@ -1116,6 +1117,37 @@ TEST_P(ClientCase, OnProfileEvents) {
     }
 }
 
+TEST_P(ClientCase, OnProfile) {
+    Query query("SELECT * FROM system.numbers LIMIT 10;");
+
+    std::optional<Profile> profile;
+    query.OnProfile([&profile](const Profile & new_profile) {
+        profile = new_profile;
+
+        std::cout <<
+            "Profile:" <<
+            "\n\trows: " << new_profile.rows <<
+            "\n\tblocks: " << new_profile.blocks <<
+            "\n\tbytes: " << new_profile.bytes <<
+            "\n\trows_before_limit: " << new_profile.rows_before_limit <<
+            "\n\tapplied_limit: " << new_profile.applied_limit <<
+            "\n\tcalculated_rows_before_limit: " << new_profile.calculated_rows_before_limit <<
+            std::endl;
+    });
+
+    client_->Execute(query);
+
+    // Make sure that profile event came through
+    ASSERT_NE(profile, std::nullopt);
+
+    EXPECT_GE(profile->rows, 10u);
+    EXPECT_GE(profile->blocks, 1u);
+    EXPECT_GT(profile->bytes, 1u);
+    EXPECT_GE(profile->rows_before_limit, 10u);
+    EXPECT_EQ(profile->applied_limit, true);
+    EXPECT_EQ(profile->calculated_rows_before_limit, true);
+}
+
 TEST_P(ClientCase, SelectAggregateFunction) {
     // Verifies that perofing SELECT value of type AggregateFunction(...) doesn't crash the client.
     // For details: https://github.com/ClickHouse/clickhouse-cpp/issues/266

ut/utils.cpp

@@ -21,6 +21,7 @@
 #include <cinttypes>
 #include <iomanip>
 #include <sstream>
+#include <type_traits>
 
 
 namespace {
@@ -51,7 +52,9 @@ std::ostream& operator<<(std::ostream & ostr, const DateTimeValue & time) {
 template <typename ColumnType, typename AsType = decltype(std::declval<ColumnType>().At(0)) >
 bool doPrintValue(const ColumnRef & c, const size_t row, std::ostream & ostr) {
     if (const auto & casted_c = c->As<ColumnType>()) {
-        if constexpr (is_container_v<std::decay_t<AsType>>) {
+        if constexpr (is_container_v<std::decay_t<AsType>>
+                && !std::is_same_v<ColumnType, ColumnString>
+                && !std::is_same_v<ColumnType, ColumnFixedString>) {
             ostr << PrintContainer{static_cast<AsType>(casted_c->At(row))};
         } else {
             ostr << static_cast<AsType>(casted_c->At(row));