Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Remove dead code: Hash128 #8203

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Remove dead code: Hash128 #8203

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ab38c5
get rid of Hash128::hash64
teh-cmc Nov 22, 2024
87cca8e
fix Hash128::hash
teh-cmc Nov 22, 2024
6930cfb
remove Hash128
teh-cmc Nov 22, 2024
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
73 changes: 0 additions & 73 deletions crates/store/re_log_types/src/hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// ----------------------------------------------------------------------------

use std::hash::BuildHasher;

/// 64-bit hash.
///
/// 10^-12 collision risk with 6k values.
Expand Down Expand Up @@ -61,77 +57,8 @@ impl std::fmt::Debug for Hash64 {

// ----------------------------------------------------------------------------

/// 128-bit hash. Negligible risk for collision.
#[derive(Copy, Clone, Eq)]
pub struct Hash128([u64; 2]);

impl Hash128 {
pub const ZERO: Self = Self([0; 2]);

pub fn hash(value: impl std::hash::Hash + Copy) -> Self {
Self(double_hash(value))
}

#[inline]
pub fn hash64(&self) -> u64 {
self.0[0]
}

#[inline]
pub fn first64(&self) -> u64 {
self.0[0]
}

#[inline]
pub fn second64(&self) -> u64 {
self.0[1]
}
}

impl std::hash::Hash for Hash128 {
#[inline]
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
state.write_u64(self.0[0]);
}
}

impl std::cmp::PartialEq for Hash128 {
#[inline]
fn eq(&self, other: &Self) -> bool {
self.0 == other.0
}
}

impl nohash_hasher::IsEnabled for Hash128 {}

impl std::fmt::Debug for Hash128 {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str(&format!("Hash128({:016X}{:016X})", self.0[0], self.0[1]))
}
}

// ----------------------------------------------------------------------------

pub const HASH_RANDOM_STATE: ahash::RandomState = ahash::RandomState::with_seeds(0, 1, 2, 3);

#[inline]
fn double_hash(value: impl std::hash::Hash + Copy) -> [u64; 2] {
[hash_with_seed(value, 123), hash_with_seed(value, 456)]
}

/// Hash the given value.
#[inline]
fn hash_with_seed(value: impl std::hash::Hash, seed: u128) -> u64 {
use std::hash::Hash as _;
use std::hash::Hasher as _;

// Don't use ahash::AHasher::default() since it uses a random number for seeding the hasher on every application start.
let mut hasher = HASH_RANDOM_STATE.build_hasher();
seed.hash(&mut hasher);
value.hash(&mut hasher);
hasher.finish()
}

/// Hash the given value.
#[inline]
fn hash(value: impl std::hash::Hash) -> u64 {
Expand Down
Loading