ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-02 00:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx++: minor fixes for UN-sanitizer.

Browse Source
This commit is contained in:
Leonid Yuriev 2021-07-06 01:20:19 +03:00
parent 682632756f
commit ffb8d23632
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mdbx.h++
View File

@ -3848,18 +3848,23 @@ inline slice slice::safe_middle(size_t from, size_t n) const {
} }
inline intptr_t slice::compare_fast(const slice &a, const slice &b) noexcept { inline intptr_t slice::compare_fast(const slice &a, const slice &b) noexcept {
const intptr_t diff = a.length() - b.length(); const intptr_t diff = intptr_t(a.length()) - intptr_t(b.length());
return diff ? diff return diff ? diff
: (a.data() == b.data()) : MDBX_UNLIKELY(a.length() == 0 || a.data() == b.data())
? 0 ? 0
: ::std::memcmp(a.data(), b.data(), a.length()); : ::std::memcmp(a.data(), b.data(), a.length());
} }
inline intptr_t slice::compare_lexicographically(const slice &a, inline intptr_t slice::compare_lexicographically(const slice &a,
const slice &b) noexcept { const slice &b) noexcept {
const intptr_t diff = const size_t shortest = ::std::min(a.length(), b.length());
::std::memcmp(a.data(), b.data(), ::std::min(a.length(), b.length())); if (MDBX_LIKELY(shortest > 0))
return diff ? diff : intptr_t(a.length() - b.length()); MDBX_CXX20_LIKELY {
const intptr_t diff = ::std::memcmp(a.data(), b.data(), shortest);
if (MDBX_LIKELY(diff != 0))
MDBX_CXX20_LIKELY return diff;
}
return intptr_t(a.length()) - intptr_t(b.length());
} }
MDBX_NOTHROW_PURE_FUNCTION inline bool operator==(const slice &a, MDBX_NOTHROW_PURE_FUNCTION inline bool operator==(const slice &a,