thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 09:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33525 from kitaisreal/hash-table-constant-fix

Browse Source 
HashTable constant fix
This commit is contained in:
Maksim Kita 2022-01-12 19:39:49 +03:00 committed by GitHub
commit 2088570a01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/CombinedCardinalityEstimator.h
View File

@ -323,7 +323,7 @@ private:
UInt64 address = 0; UInt64 address = 0;
}; };
static const UInt64 mask = 0xFFFFFFFFFFFFFFFC; static const UInt64 mask = 0xFFFFFFFFFFFFFFFC;
static const UInt32 medium_set_size_max = 1UL << medium_set_power2_max; static const UInt32 medium_set_size_max = 1ULL << medium_set_power2_max;
}; };
} }

2
src/Common/HashTable/StringHashTable.h
View File

@ -280,7 +280,7 @@ public:
if ((reinterpret_cast<uintptr_t>(p) & 2048) == 0) if ((reinterpret_cast<uintptr_t>(p) & 2048) == 0)
{ {
memcpy(&n[0], p, 8); memcpy(&n[0], p, 8);
n[0] &= -1ul >> s; n[0] &= -1ULL >> s;
} }
else else
{ {

2
src/Common/HashTable/TwoLevelStringHashTable.h
View File

@ -114,7 +114,7 @@ public:
if ((reinterpret_cast<uintptr_t>(p) & 2048) == 0) if ((reinterpret_cast<uintptr_t>(p) & 2048) == 0)
{ {
memcpy(&n[0], p, 8); memcpy(&n[0], p, 8);
n[0] &= -1ul >> s; n[0] &= -1ULL >> s;
} }
else else
{ {

2
src/Common/Throttler.cpp
View File

@ -23,7 +23,7 @@ static constexpr auto NS = 1000000000UL;
/// Tracking window. Actually the size is not really important. We just want to avoid /// Tracking window. Actually the size is not really important. We just want to avoid
/// throttles when there are no actions for a long period time. /// throttles when there are no actions for a long period time.
static const double window_ns = 1UL * NS; static const double window_ns = 1ULL * NS;
void Throttler::add(size_t amount) void Throttler::add(size_t amount)
{ {