Skip to content

Issue #182 Fix src/library/digest/murmur tests #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/library/digest/murmur/murmur.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ class TMurmurHash2A {
using TValue = typename TTraits::TValue;

public:
inline TMurmurHash2A(TValue seed = 0)
TMurmurHash2A(TValue seed = 0)
: Hash(seed)
{
}

inline TMurmurHash2A& Update(const void* buf, size_t len) noexcept {
TMurmurHash2A& Update(const void* buf, size_t len) noexcept {
Size += len;

MixTail(buf, len);
Expand All @@ -58,8 +58,8 @@ class TMurmurHash2A {
return *this;
}

inline TValue Value() const noexcept {
TValue hash = Mix(Mix(Hash, Tail), (TValue)Size);
TValue Value() const noexcept {
TValue hash = Mix(Mix(Hash, Tail), static_cast<TValue>(Size));

hash ^= hash >> TTraits::R2;
hash *= TTraits::Multiplier;
Expand All @@ -69,7 +69,7 @@ class TMurmurHash2A {
}

private:
static inline TValue Mix(TValue h, TValue k) noexcept {
static TValue Mix(TValue h, TValue k) noexcept {
k *= TTraits::Multiplier;
k ^= k >> TTraits::R1;
k *= TTraits::Multiplier;
Expand All @@ -78,9 +78,9 @@ class TMurmurHash2A {
return h;
}

inline void MixTail(const void*& buf, size_t& len) noexcept {
void MixTail(const void*& buf, size_t& len) noexcept {
while (len && (len < sizeof(TValue) || Count)) {
Tail |= (TValue) * ((const unsigned char*&)buf)++ << (Count++ * 8);
Tail |= (TValue) * (reinterpret_cast<const unsigned char*&>(buf))++ << (Count++ * 8);

--len;

Expand Down
13 changes: 0 additions & 13 deletions src/library/digest/murmur/ut/ya.make

This file was deleted.

1 change: 1 addition & 0 deletions tests/library/digest/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
add_subdirectory(lower_case)
add_subdirectory(md5)
add_subdirectory(murmur)
9 changes: 9 additions & 0 deletions tests/library/digest/murmur/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
add_ydb_test(NAME library-digest-murmur-ut
SOURCES
ut.cpp
INCLUDE_DIRS
${YDB_SDK_SOURCE_DIR}/src/library/digest/murmur
LINK_LIBRARIES
cpp-digest-murmur
cpp-testing-unittest_main
)
Loading