From f52f48ca7708f629cb575b12a64467283ed37deb Mon Sep 17 00:00:00 2001 From: wangwei <1261385937@qq.com> Date: Sun, 16 Oct 2022 21:18:47 +0800 Subject: [PATCH 1/2] for win dll export --- clickhouse/columns/string.cpp | 14 ++++++++++++++ clickhouse/columns/string.h | 10 +++------- clickhouse/query.cpp | 2 -- clickhouse/query.h | 2 +- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/clickhouse/columns/string.cpp b/clickhouse/columns/string.cpp index 8ea362c4..569a2b5c 100644 --- a/clickhouse/columns/string.cpp +++ b/clickhouse/columns/string.cpp @@ -30,6 +30,20 @@ ColumnFixedString::ColumnFixedString(size_t n) { } +ColumnFixedString::ColumnFixedString(size_t n, const std::vector& data) + : ColumnFixedString(n) +{ + for (const auto& v : data) + Append(v); +} + +ColumnFixedString::ColumnFixedString(size_t n, const std::vector& data) + : ColumnFixedString(n) +{ + for (const auto& v : data) + Append(v); +} + void ColumnFixedString::Append(std::string_view str) { if (str.size() > string_size_) { throw ValidationError("Expected string of length not greater than " diff --git a/clickhouse/columns/string.h b/clickhouse/columns/string.h index f2216f40..38d5a584 100644 --- a/clickhouse/columns/string.h +++ b/clickhouse/columns/string.h @@ -19,14 +19,10 @@ class ColumnFixedString : public Column { explicit ColumnFixedString(size_t n); - template - ColumnFixedString(size_t n, const Values & values) - : ColumnFixedString(n) - { - for (const auto & v : values) - Append(v); - } + explicit ColumnFixedString(size_t n, const std::vector& data); + explicit ColumnFixedString(size_t n, const std::vector& data); + /// Appends one element to the column. void Append(std::string_view str); diff --git a/clickhouse/query.cpp b/clickhouse/query.cpp index 3986064c..aa73b818 100644 --- a/clickhouse/query.cpp +++ b/clickhouse/query.cpp @@ -2,8 +2,6 @@ namespace clickhouse { -const std::string Query::default_query_id = {}; - Query::Query() { } diff --git a/clickhouse/query.h b/clickhouse/query.h index ae98690d..bce435ee 100644 --- a/clickhouse/query.h +++ b/clickhouse/query.h @@ -116,7 +116,7 @@ class Query : public QueryEvents { return *this; } - static const std::string default_query_id; + inline static const std::string default_query_id{}; private: void OnData(const Block& block) override { From 5e6969814fafbaa3caa3c278fed224525b69119f Mon Sep 17 00:00:00 2001 From: wangwei <1261385937@qq.com> Date: Mon, 17 Oct 2022 08:35:10 +0800 Subject: [PATCH 2/2] pretty default_query_id --- clickhouse/query.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clickhouse/query.h b/clickhouse/query.h index bce435ee..41d4ef54 100644 --- a/clickhouse/query.h +++ b/clickhouse/query.h @@ -116,7 +116,7 @@ class Query : public QueryEvents { return *this; } - inline static const std::string default_query_id{}; + static constexpr char default_query_id[] = ""; private: void OnData(const Block& block) override {