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.

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

Luca cappelletti94 main #16

Merged
merged 2 commits into from
Aug 19, 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
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ name = "accuracy"

[dependencies]
ahash = "0.8.11"
mem_dbg = {version="0.2.4", optional=true}
rand = { version = "0.8" }
siphasher = { version = "1", optional = true }

Expand Down
1 change: 1 addition & 0 deletions src/h2b.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use crate::AHasherDefaultBuilder;
///
/// Both the hasher and the sub stream size siaz can be customized, by default it uses `AHasherBuilder` and `M256`
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct HyperTwoBits<SKETCH: Sketch = M256, HASH: BuildHasher = AHasherDefaultBuilder> {
hash: HASH,
sketch: SKETCH,
Expand Down
4 changes: 4 additions & 0 deletions src/h2b/sketch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ pub trait Sketch: Default {

/// M = 64, using two 64 bit integers to store the sketch
#[derive(Debug, Eq, PartialEq, Hash, Clone, Default)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct M64 {
low: u64,
high: u64,
Expand Down Expand Up @@ -99,6 +100,7 @@ impl Sketch for M64 {
///
/// The implementation is similar to M64
#[derive(Debug, Eq, PartialEq, Hash, Clone, Default)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct M128 {
low: u128,
high: u128,
Expand Down Expand Up @@ -160,6 +162,7 @@ impl Sketch for M128 {
/// to optimize for cache locallity when compiting inside
/// a vectored sketch
#[derive(Default, Clone, Copy, Debug, Eq, PartialEq, Hash)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
struct HiLoRegister {
high: u128,
low: u128,
Expand All @@ -170,6 +173,7 @@ struct HiLoRegister {
/// This is not meant to be used directly instead it serves as
/// a base for the other vectored sketches
#[derive(Debug, Eq, PartialEq, Hash, Copy, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct M128Reg<const REGISTERS: usize> {
registers: [HiLoRegister; REGISTERS],
}
Expand Down
1 change: 1 addition & 0 deletions src/h3b.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use crate::AHasherDefaultBuilder;
///
/// Both the hasher and the sub stream size siaz can be customized, by default it uses `AHasherBuilder` and `M256`
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct HyperThreeBits<SKETCH: Sketch = M256, HASH: BuildHasher = AHasherDefaultBuilder> {
hash: HASH,
sketch: SKETCH,
Expand Down
4 changes: 4 additions & 0 deletions src/h3b/sketch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ pub trait Sketch: Default {

/// M = 64, using two 64 bit integers to store the sketch
#[derive(Debug, Eq, PartialEq, Hash, Copy, Clone, Default)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct M64 {
high: u64,
middle: u64,
Expand Down Expand Up @@ -122,6 +123,7 @@ impl Sketch for M64 {
///
/// The implementation is similar to M64
#[derive(Debug, Eq, PartialEq, Hash, Copy, Clone, Default)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct M128 {
low: u128,
middle: u128,
Expand Down Expand Up @@ -193,6 +195,7 @@ impl Sketch for M128 {
/// to optimize for cache locallity when compiting inside
/// a vectored sketch
#[derive(Default, Clone, Copy, Debug, Hash, Eq, PartialEq)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
struct BitRegister {
high: u128,
middle: u128,
Expand All @@ -204,6 +207,7 @@ struct BitRegister {
/// This is not meant to be used directly instead it serves as
/// a base for the other vectored sketches
#[derive(Debug, Eq, PartialEq, Hash, Copy, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct M128Reg<const REGISTERS: usize> {
registers: [BitRegister; REGISTERS],
}
Expand Down
1 change: 1 addition & 0 deletions src/hbb64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use std::hash::Hasher;

/// `HyperBitBit` cardinality counter with 64 substreams
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct HyperBitBit64<HASH: Hasher + Default = ahash::AHasher> {
_hash: std::marker::PhantomData<HASH>,
sketch1: u64,
Expand Down
3 changes: 3 additions & 0 deletions src/hyper_two_bits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::M256;

/// Random Seeded `AHasher` Builder that allows for seeded hashing per `HyperTwoBit` isnstance
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct AHasherBuilder {
state: u64,
}
Expand Down Expand Up @@ -38,6 +39,7 @@ pub type AHasherDefaultBuilder = BuildHasherDefault<ahash::AHasher>;
/// Random Seeded `SipHasher13` Builder
#[cfg(feature = "siphash")]
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct SipHasher13Builder {
state: u64,
}
Expand Down Expand Up @@ -68,6 +70,7 @@ pub type SipHasher13DefaultBuilder = BuildHasherDefault<siphasher::sip::SipHashe
///
/// Both the hasher and the sub stream size siaz can be customized, by default it uses `AHasherBuilder` and `M256`
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct HyperTwoBits<SKETCH: Sketch = M256, HASH: BuildHasher = AHasherDefaultBuilder> {
hash: HASH,
sketch: SKETCH,
Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pub use prelude::*;

/// Random Seeded `AHasher` Builder that allows for seeded hashing per `HyperTwoBit` isnstance
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct AHasherBuilder {
state: u64,
}
Expand Down Expand Up @@ -59,6 +60,7 @@ pub type AHasherDefaultBuilder = BuildHasherDefault<ahash::AHasher>;
/// Random Seeded `SipHasher13` Builder
#[cfg(feature = "siphash")]
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
#[cfg_attr(feature = "mem_dbg", derive(mem_dbg::MemDbg, mem_dbg::MemSize))]
pub struct SipHasher13Builder {
state: u64,
}
Expand Down
Loading