aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.ru>2022-06-27 13:43:06 +0300
committerthegeorg <thegeorg@yandex-team.ru>2022-06-27 13:43:06 +0300
commit0b1d6ef63f6be6ff3f199a79500bb3eb58f49b45 (patch)
tree8c7a51daac2d9e43ba3fc1bc7ca04aa94d5a64af
parentd99c955d0f5c7dbf42385a7d10720b8d71a58c40 (diff)
downloadydb-0b1d6ef63f6be6ff3f199a79500bb3eb58f49b45.tar.gz
Stop providing non-inlined MurmurHashSizeT
ref:7e797cda3221e4c1905f5e443a9342db82e66883
-rw-r--r--util/digest/murmur.cpp4
-rw-r--r--util/digest/murmur.h7
-rw-r--r--util/generic/string_hash.h5
3 files changed, 6 insertions, 10 deletions
diff --git a/util/digest/murmur.cpp b/util/digest/murmur.cpp
index b041d3e5f2..0cb0a2f7b5 100644
--- a/util/digest/murmur.cpp
+++ b/util/digest/murmur.cpp
@@ -126,6 +126,4 @@ namespace NMurmurPrivate {
}
}
-size_t MurmurHashSizeT(const char* buf, size_t len) noexcept {
- return MurmurHash<size_t>(buf, len);
-}
+template size_t MurmurHash<size_t>(const void* buf, size_t len) noexcept;
diff --git a/util/digest/murmur.h b/util/digest/murmur.h
index 6b519b430a..a54902006c 100644
--- a/util/digest/murmur.h
+++ b/util/digest/murmur.h
@@ -30,18 +30,15 @@ namespace NMurmurPrivate {
}
template <class T>
-static inline T MurmurHash(const void* buf, size_t len, T init) noexcept {
+inline T MurmurHash(const void* buf, size_t len, T init) noexcept {
return (T)NMurmurPrivate::TMurHelper<8 * sizeof(T)>::MurmurHash(buf, len, init);
}
template <class T>
-static inline T MurmurHash(const void* buf, size_t len) noexcept {
+inline T MurmurHash(const void* buf, size_t len) noexcept {
return MurmurHash<T>(buf, len, (T)0);
}
-//non-inline version
-size_t MurmurHashSizeT(const char* buf, size_t len) noexcept;
-
template <typename TOut = size_t>
struct TMurmurHash {
TOut operator()(const void* buf, size_t len) const noexcept {
diff --git a/util/generic/string_hash.h b/util/generic/string_hash.h
index b949c7a2d9..b873f23b11 100644
--- a/util/generic/string_hash.h
+++ b/util/generic/string_hash.h
@@ -6,7 +6,8 @@
#if defined(_64_) && !defined(NO_CITYHASH)
ui64 CityHash64(const char* buf, size_t len) noexcept;
#else
-size_t MurmurHashSizeT(const char* buf, size_t len) noexcept;
+template <typename T>
+T MurmurHash(const void* buf, size_t len) noexcept;
#endif
namespace NHashPrivate {
@@ -15,7 +16,7 @@ namespace NHashPrivate {
#if defined(_64_) && !defined(NO_CITYHASH)
return CityHash64((const char*)ptr, size * sizeof(C));
#else
- return MurmurHashSizeT((const char*)ptr, size * sizeof(C));
+ return MurmurHash<size_t>(ptr, size * sizeof(C));
#endif
}
}