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

Fix endian issue in StringHashTable for s390x

Browse Source
This commit is contained in:
HarryLeeIBM 2022-12-08 08:56:56 -08:00
parent b068119d27
commit c381eb1b8e
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,17 +22,29 @@ struct StringKey24
inline StringRef ALWAYS_INLINE toStringRef(const StringKey8 & n) inline StringRef ALWAYS_INLINE toStringRef(const StringKey8 & n)
{ {
assert(n != 0); assert(n != 0);
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
return {reinterpret_cast<const char *>(&n), 8ul - (std::countr_zero(n) >> 3)};
#else
return {reinterpret_cast<const char *>(&n), 8ul - (std::countl_zero(n) >> 3)}; return {reinterpret_cast<const char *>(&n), 8ul - (std::countl_zero(n) >> 3)};
#endif
} }
inline StringRef ALWAYS_INLINE toStringRef(const StringKey16 & n) inline StringRef ALWAYS_INLINE toStringRef(const StringKey16 & n)
{ {
assert(n.items[1] != 0); assert(n.items[1] != 0);
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
return {reinterpret_cast<const char *>(&n), 16ul - (std::countr_zero(n.items[1]) >> 3)};
#else
return {reinterpret_cast<const char *>(&n), 16ul - (std::countl_zero(n.items[1]) >> 3)}; return {reinterpret_cast<const char *>(&n), 16ul - (std::countl_zero(n.items[1]) >> 3)};
#endif
} }
inline StringRef ALWAYS_INLINE toStringRef(const StringKey24 & n) inline StringRef ALWAYS_INLINE toStringRef(const StringKey24 & n)
{ {
assert(n.c != 0); assert(n.c != 0);
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
return {reinterpret_cast<const char *>(&n), 24ul - (std::countr_zero(n.c) >> 3)};
#else
return {reinterpret_cast<const char *>(&n), 24ul - (std::countl_zero(n.c) >> 3)}; return {reinterpret_cast<const char *>(&n), 24ul - (std::countl_zero(n.c) >> 3)};
#endif
} }
struct StringHashTableHash struct StringHashTableHash
@ -238,7 +250,6 @@ public:
// 2. Use switch case extension to generate fast dispatching table // 2. Use switch case extension to generate fast dispatching table
// 3. Funcs are named callables that can be force_inlined // 3. Funcs are named callables that can be force_inlined
// //
// NOTE: It relies on Little Endianness
// //
// NOTE: It requires padded to 8 bytes keys (IOW you cannot pass // NOTE: It requires padded to 8 bytes keys (IOW you cannot pass
// std::string here, but you can pass i.e. ColumnString::getDataAt()), // std::string here, but you can pass i.e. ColumnString::getDataAt()),
@ -280,13 +291,19 @@ 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] &= -1ULL >> s; if constexpr (std::endian::native == std::endian::little)
n[0] &= -1ULL >> s;
else
n[0] &= -1ULL << s;
} }
else else
{ {
const char * lp = x.data + x.size - 8; const char * lp = x.data + x.size - 8;
memcpy(&n[0], lp, 8); memcpy(&n[0], lp, 8);
n[0] >>= s; if constexpr (std::endian::native == std::endian::little)
n[0] >>= s;
else
n[0] <<= s;
} }
keyHolderDiscardKey(key_holder); keyHolderDiscardKey(key_holder);
return func(self.m1, k8, hash(k8)); return func(self.m1, k8, hash(k8));
@ -296,7 +313,10 @@ public:
memcpy(&n[0], p, 8); memcpy(&n[0], p, 8);
const char * lp = x.data + x.size - 8; const char * lp = x.data + x.size - 8;
memcpy(&n[1], lp, 8); memcpy(&n[1], lp, 8);
n[1] >>= s; if constexpr (std::endian::native == std::endian::little)
n[1] >>= s;
else
n[1] <<= s;
keyHolderDiscardKey(key_holder); keyHolderDiscardKey(key_holder);
return func(self.m2, k16, hash(k16)); return func(self.m2, k16, hash(k16));
} }
@ -305,7 +325,10 @@ public:
memcpy(&n[0], p, 16); memcpy(&n[0], p, 16);
const char * lp = x.data + x.size - 8; const char * lp = x.data + x.size - 8;
memcpy(&n[2], lp, 8); memcpy(&n[2], lp, 8);
n[2] >>= s; if constexpr (std::endian::native == std::endian::little)
n[2] >>= s;
else
n[2] <<= s;
keyHolderDiscardKey(key_holder); keyHolderDiscardKey(key_holder);
return func(self.m3, k24, hash(k24)); return func(self.m3, k24, hash(k24));
} }