thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 09:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/startup-sanity-checks' into startup-sanity-checks

Browse Source
This commit is contained in:
alesapin 2022-03-29 14:29:33 +02:00
commit 842c0b8ff0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/base/getAvailableMemoryAmount.cpp
View File

@ -27,7 +27,7 @@ uint64_t getAvailableMemoryAmountOrZero()
unsigned int usermem; unsigned int usermem;
size_t len = sizeof(usermem); size_t len = sizeof(usermem);
static int mib[2] = { CTL_HW, HW_USERMEM }; static int mib[2] = { CTL_HW, HW_USERMEM };
if (sysctl(mib, 2, &usermem, &len, NULL, 0) == 0 && len == sizeof(usermem)) if (sysctl(mib, 2, &usermem, &len, nullptr, 0) == 0 && len == sizeof(usermem))
return usermem; return usermem;
else else
return 0; return 0;

4
src/Common/filesystemHelpers.h
View File

@ -35,13 +35,13 @@ enum class BlockDeviceType
#if !defined(__linux__) #if !defined(__linux__)
[[noreturn]] [[noreturn]]
#endif #endif
BlockDeviceType getBlockDeviceType([[maybe_unused]] const String & deviceId); BlockDeviceType getBlockDeviceType([[maybe_unused]] const String & device_id);
// Get size of read-ahead in bytes for specified block device // Get size of read-ahead in bytes for specified block device
#if !defined(__linux__) #if !defined(__linux__)
[[noreturn]] [[noreturn]]
#endif #endif
UInt64 getBlockDeviceReadAheadBytes([[maybe_unused]] const String & deviceId); UInt64 getBlockDeviceReadAheadBytes([[maybe_unused]] const String & device_id);
/// Returns mount point of filesystem where absolute_path (must exist) is located /// Returns mount point of filesystem where absolute_path (must exist) is located
std::filesystem::path getMountPoint(std::filesystem::path absolute_path); std::filesystem::path getMountPoint(std::filesystem::path absolute_path);