Merge pull request #32376 from ClickHouse/revert_25122

Revert "graphite: split tagged/plain rollup rules (for merges perfoma…
ClickHouse · Dec 8, 2021 · 4cc45c1 · 4cc45c1
2 parents 4c44303 + 03927f5
commit 4cc45c1
Show file tree

Hide file tree

Showing 27 changed files with 266 additions and 2,705 deletions.
diff --git a/base/base/StringRef.h b/base/base/StringRef.h
@@ -48,10 +48,7 @@ struct StringRef
     std::string toString() const { return std::string(data, size); }
 
     explicit operator std::string() const { return toString(); }
-
-    std::string_view toView() const { return std::string_view(data, size); }
-
-    constexpr explicit operator std::string_view() const { return std::string_view(data, size); }
+    constexpr explicit operator std::string_view() const { return {data, size}; }
 };
 
 /// Here constexpr doesn't implicate inline, see https://www.viva64.com/en/w/v1043/

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -547,7 +547,6 @@ if (ENABLE_TESTS AND USE_GTEST)
         clickhouse_parsers
         clickhouse_storages_system
         dbms
-        clickhouse_common_config
         clickhouse_common_zookeeper
         string_utils)
 

diff --git a/src/Common/tests/gtest_global_context.cpp b/src/Common/tests/gtest_global_context.cpp
diff --git a/src/Common/tests/gtest_global_context.h b/src/Common/tests/gtest_global_context.h
@@ -18,4 +18,8 @@ struct ContextHolder
     ContextHolder(ContextHolder &&) = default;
 };
 
-const ContextHolder & getContext();
+inline const ContextHolder & getContext()
+{
+    static ContextHolder holder;
+    return holder;
+}