Skip to content
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
28 changes: 18 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ default = ["std", "rand"]
std = ["portable-atomic/std"]
loom = ["dep:loom"]
rand = ["std", "dep:rand"]
serde = ["dep:serde", "siphasher/serde_std", "portable-atomic/serde"]
serde = ["dep:serde", "twox-hash/serialize", "portable-atomic/serde"]

[dependencies]
foldhash = { version = "0.2.0", default-features = false }
loom = { version = "0.7.2", optional = true }
rand = { version = "0.9.0", optional = true }
serde = { version = "1.0.203", features = ["derive"], optional = true }
siphasher = { version = "1.0.0", default-features = false }
twox-hash = { version = "1.6.3", default-features = false }
libm = "0.2"
portable-atomic = { version = "1.13.1", default-features = false, features = ["fallback"] }

Expand Down
28 changes: 11 additions & 17 deletions src/hasher.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use core::hash::{BuildHasher, Hasher};
use siphasher::sip::SipHasher13;
use twox_hash::XxHash64;

#[derive(Clone, Debug, Default, Eq, PartialEq)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
Expand Down Expand Up @@ -32,7 +32,7 @@ impl<H: Hasher + Clone> BuildHasher for CloneBuildHasher<H> {
pub type DefaultHasher = CloneBuildHasher<RandomDefaultHasher>;

impl DefaultHasher {
pub fn seeded(seed: &[u8; 16]) -> Self {
pub fn seeded(seed: u64) -> Self {
Self {
hasher: RandomDefaultHasher::seeded(seed),
}
Expand All @@ -41,12 +41,12 @@ impl DefaultHasher {

#[derive(Clone, Debug)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct RandomDefaultHasher(SipHasher13);
pub struct RandomDefaultHasher(XxHash64);

impl RandomDefaultHasher {
#[inline]
pub fn seeded(seed: &[u8; 16]) -> Self {
Self(SipHasher13::new_with_key(seed))
pub fn seeded(seed: u64) -> Self {
Self(XxHash64::with_seed(seed))
}
}

Expand All @@ -56,18 +56,13 @@ impl Default for RandomDefaultHasher {
#[cfg(not(feature = "rand"))]
{
use foldhash::fast::RandomState;
let state_a = RandomState::default();
let state_b = RandomState::default();
let lo = state_a.build_hasher().finish() as u128;
let hi = state_b.build_hasher().finish() as u128;
Self::seeded(&((hi << 64) | lo).to_ne_bytes())
let seed = RandomState::default().build_hasher().finish();
Self::seeded(seed)
}
#[cfg(feature = "rand")]
{
let mut seed = [0u8; 16];
use rand::RngCore;
rand::rng().fill_bytes(&mut seed);
Self::seeded(&seed)
use rand::Rng;
Self::seeded(rand::rng().random())
}
}
}
Expand Down Expand Up @@ -135,7 +130,6 @@ impl Hasher for RandomDefaultHasher {
mod test {
use crate::hasher::RandomDefaultHasher;
use core::hash::Hasher;
use siphasher::sip::SipHasher13;

fn hash_all(mut x: impl Hasher) -> u64 {
x.write(&[1; 16]);
Expand All @@ -156,8 +150,8 @@ mod test {

#[test]
fn test_hasher() {
let h1 = RandomDefaultHasher::seeded(&[0; 16]);
let h2 = SipHasher13::new_with_key(&[0; 16]);
let h1 = RandomDefaultHasher::seeded(0);
let h2 = RandomDefaultHasher::seeded(0);
assert_eq!(hash_all(h1), hash_all(h2),);
}
}
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ macro_rules! impl_hll {

/// Returns a new [`Self`] with `1 << precision` registers (1 byte each)
/// using the default hasher seeded with `seed`.
pub fn seeded(precision: u8, seed: u128) -> $name<DefaultHasher> {
$name::with_hasher(precision, DefaultHasher::seeded(&seed.to_be_bytes()))
pub fn seeded(precision: u8, seed: u64) -> $name<DefaultHasher> {
$name::with_hasher(precision, DefaultHasher::seeded(seed))
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/sparse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ impl HyperLogLogPlus {
/// [`Self`] is initialized to use the compact and dynamically sized sparse
/// representation, but later switches to the dense representation when
/// it uses equal memory (`1 << precision` registers, 1 byte each).
pub fn seeded(precision: u8, seed: u128) -> Self {
Self::with_hasher(precision, DefaultHasher::seeded(&seed.to_be_bytes()))
pub fn seeded(precision: u8, seed: u64) -> Self {
Self::with_hasher(precision, DefaultHasher::seeded(seed))
}
}

Expand Down
Loading