databases/clickhouse: update to 21.3.6.55-lts

PR:		255352
Reported by:	maintainer

6 files changed, 26 insertions, 28 deletions

diff --git a/databases/clickhouse/files/clickhouse.in b/databases/clickhouse/files/clickhouse.in
index a3ff2098e49b..a81b35ed1835 100644
--- a/databases/clickhouse/files/clickhouse.in
+++ b/databases/clickhouse/files/clickhouse.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD: head/databases/clickhouse/files/clickhouse.in 475667 2018-07-29 17:49:12Z pi $
+#
 # PROVIDE: clickhouse
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake b/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake
index 92eb1ef0be45..70c32f8227bf 100644
--- a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake
+++ b/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake
@@ -1,4 +1,4 @@
---- cmake/freebsd/default_libs.cmake.orig	2020-08-31 16:22:57 UTC
+--- cmake/freebsd/default_libs.cmake.orig	2021-04-12 12:15:33 UTC
 +++ cmake/freebsd/default_libs.cmake
 @@ -4,13 +4,13 @@ if (NOT COMPILER_CLANG)
      message (FATAL_ERROR "FreeBSD build is supported only for Clang")
diff --git a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp
index a4e9ad63dbcc..de0458181f69 100644
--- a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp
+++ b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp
@@ -1,6 +1,6 @@
---- src/Common/MemoryStatisticsOS.cpp.orig	2020-08-31 16:22:57 UTC
+--- src/Common/MemoryStatisticsOS.cpp.orig	2021-03-19 11:39:14 UTC
 +++ src/Common/MemoryStatisticsOS.cpp
-@@ -1,7 +1,13 @@
+@@ -1,14 +1,20 @@
 -#if defined(OS_LINUX)
 -
  #include <sys/types.h>
@@ -16,19 +16,15 @@
  #include <fcntl.h>
  #include <unistd.h>
  #include <cassert>
-@@ -11,9 +17,10 @@
- #include <Common/Exception.h>
- #include <IO/ReadBufferFromMemory.h>
- #include <IO/ReadHelpers.h>
--#include <common/logger_useful.h>
  
+ #include "MemoryStatisticsOS.h"
  
-+
-+
- namespace DB
- {
- 
-@@ -23,21 +30,40 @@ namespace ErrorCodes
+-#include <common/logger_useful.h>
++//#include <common/logger_useful.h>
+ #include <common/getPageSize.h>
+ #include <Common/Exception.h>
+ #include <IO/ReadBufferFromMemory.h>
+@@ -24,20 +30,40 @@ namespace ErrorCodes
      extern const int CANNOT_OPEN_FILE;
      extern const int CANNOT_READ_FROM_FILE_DESCRIPTOR;
      extern const int CANNOT_CLOSE_FILE;
@@ -37,9 +33,10 @@
 +#endif
  }
  
+-static constexpr auto filename = "/proc/self/statm";
 +#ifndef OS_FREEBSD
- static constexpr auto filename = "/proc/self/statm";
- static constexpr size_t PAGE_SIZE = 4096;
++ static constexpr auto filename = "/proc/self/statm";
++ static constexpr size_t PAGE_SIZE = 4096;
 +#endif
  
  MemoryStatisticsOS::MemoryStatisticsOS()
@@ -69,7 +66,7 @@
      if (0 != ::close(fd))
      {
          try
-@@ -51,12 +77,43 @@ MemoryStatisticsOS::~MemoryStatisticsOS()
+@@ -51,12 +77,42 @@ MemoryStatisticsOS::~MemoryStatisticsOS()
              DB::tryLogCurrentException(__PRETTY_FUNCTION__);
          }
      }
@@ -109,14 +106,13 @@
 +    ::procstat_freevmmap(pstat, kve);
 +    ::procstat_freeprocs(pstat, kp);
 +#else
-+
      constexpr size_t buf_size = 1024;
      char buf[buf_size];
  
-@@ -98,10 +155,8 @@ MemoryStatisticsOS::Data MemoryStatisticsOS::get() con
-     data.shared *= PAGE_SIZE;
-     data.code *= PAGE_SIZE;
-     data.data_and_stack *= PAGE_SIZE;
+@@ -99,10 +155,8 @@ MemoryStatisticsOS::Data MemoryStatisticsOS::get() con
+     data.shared *= page_size;
+     data.code *= page_size;
+     data.data_and_stack *= page_size;
 -
 +#endif
      return data;
diff --git a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.h b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.h
index 053ce988d569..dc2da1c5518e 100644
--- a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.h
+++ b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.h
@@ -1,4 +1,4 @@
---- src/Common/MemoryStatisticsOS.h.orig	2020-08-31 16:22:57 UTC
+--- src/Common/MemoryStatisticsOS.h.orig	2021-03-19 11:39:14 UTC
 +++ src/Common/MemoryStatisticsOS.h
 @@ -1,5 +1,4 @@
  #pragma once
diff --git a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp
index 0f7ea8b8ce75..209e04c8e017 100644
--- a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp
+++ b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp
@@ -1,7 +1,7 @@
---- src/Interpreters/AsynchronousMetrics.cpp.orig	2020-08-31 16:22:57 UTC
+--- src/Interpreters/AsynchronousMetrics.cpp.orig	2021-03-19 11:39:14 UTC
 +++ src/Interpreters/AsynchronousMetrics.cpp
-@@ -194,7 +194,7 @@ void AsynchronousMetrics::update()
-     new_values["Uptime"] = context.getUptimeSeconds();
+@@ -196,7 +196,7 @@ void AsynchronousMetrics::update()
+     new_values["Uptime"] = global_context.getUptimeSeconds();
  
      /// Process memory usage according to OS
 -#if defined(OS_LINUX)
diff --git a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h
index 5fa3e02fcb07..6eecdbacede0 100644
--- a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h
+++ b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h
@@ -1,6 +1,6 @@
---- src/Interpreters/AsynchronousMetrics.h.orig	2020-08-31 16:22:57 UTC
+--- src/Interpreters/AsynchronousMetrics.h.orig	2021-03-19 11:39:14 UTC
 +++ src/Interpreters/AsynchronousMetrics.h
-@@ -50,7 +50,7 @@ class AsynchronousMetrics (private)
+@@ -78,7 +78,7 @@ class AsynchronousMetrics (private)
      bool quit {false};
      AsynchronousMetricValues values;