Skip to content

Commit

Permalink
Expand capability of off-path specialized hasher (#221)
Browse files Browse the repository at this point in the history
Signed-off-by: Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
  • Loading branch information
tkaitchuck committed Mar 9, 2024
1 parent b424dc4 commit 8dec509
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 19 deletions.
41 changes: 32 additions & 9 deletions src/aes_hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,26 @@ impl Hasher for AHasherU64 {
}

#[inline]
fn write_u128(&mut self, _i: u128) {
unreachable!("Specialized hasher was called with a different type of object")
fn write_u128(&mut self, i: u128) {
let i: [u64; 2] = i.convert();
self.buffer = folded_multiply(i[0] ^ self.buffer, MULTIPLE);
self.pad = folded_multiply(i[1] ^ self.pad, MULTIPLE);
}

#[inline]
fn write_usize(&mut self, _i: usize) {
unreachable!("Specialized hasher was called with a different type of object")
#[cfg(any(
target_pointer_width = "64",
target_pointer_width = "32",
target_pointer_width = "16"
))]
fn write_usize(&mut self, i: usize) {
self.write_u64(i as u64);
}

#[inline]
#[cfg(target_pointer_width = "128")]
fn write_usize(&mut self, i: usize) {
self.write_u128(i as u128);
}
}

Expand Down Expand Up @@ -357,19 +370,29 @@ impl Hasher for AHasherStr {
fn write_u8(&mut self, _i: u8) {}

#[inline]
fn write_u16(&mut self, _i: u16) {}
fn write_u16(&mut self, i: u16) {
self.0.write_u16(i)
}

#[inline]
fn write_u32(&mut self, _i: u32) {}
fn write_u32(&mut self, i: u32) {
self.0.write_u32(i)
}

#[inline]
fn write_u64(&mut self, _i: u64) {}
fn write_u64(&mut self, i: u64) {
self.0.write_u64(i)
}

#[inline]
fn write_u128(&mut self, _i: u128) {}
fn write_u128(&mut self, i: u128) {
self.0.write_u128(i)
}

#[inline]
fn write_usize(&mut self, _i: usize) {}
fn write_usize(&mut self, i: usize) {
self.0.write_usize(i)
}
}

#[cfg(test)]
Expand Down
42 changes: 32 additions & 10 deletions src/fallback_hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ impl Hasher for AHasherU64 {
#[inline]
fn finish(&self) -> u64 {
folded_multiply(self.buffer, self.pad)
//self.buffer
}

#[inline]
Expand Down Expand Up @@ -240,13 +239,26 @@ impl Hasher for AHasherU64 {
}

#[inline]
fn write_u128(&mut self, _i: u128) {
unreachable!("Specialized hasher was called with a different type of object")
fn write_u128(&mut self, i: u128) {
let i: [u64; 2] = i.convert();
self.buffer = folded_multiply(i[0] ^ self.buffer, MULTIPLE);
self.pad = folded_multiply(i[1] ^ self.pad, MULTIPLE);
}

#[inline]
fn write_usize(&mut self, _i: usize) {
unreachable!("Specialized hasher was called with a different type of object")
#[cfg(any(
target_pointer_width = "64",
target_pointer_width = "32",
target_pointer_width = "16"
))]
fn write_usize(&mut self, i: usize) {
self.write_u64(i as u64);
}

#[inline]
#[cfg(target_pointer_width = "128")]
fn write_usize(&mut self, i: usize) {
self.write_u128(i as u128);
}
}

Expand Down Expand Up @@ -324,19 +336,29 @@ impl Hasher for AHasherStr {
fn write_u8(&mut self, _i: u8) {}

#[inline]
fn write_u16(&mut self, _i: u16) {}
fn write_u16(&mut self, i: u16) {
self.0.write_u16(i)
}

#[inline]
fn write_u32(&mut self, _i: u32) {}
fn write_u32(&mut self, i: u32) {
self.0.write_u32(i)
}

#[inline]
fn write_u64(&mut self, _i: u64) {}
fn write_u64(&mut self, i: u64) {
self.0.write_u64(i)
}

#[inline]
fn write_u128(&mut self, _i: u128) {}
fn write_u128(&mut self, i: u128) {
self.0.write_u128(i)
}

#[inline]
fn write_usize(&mut self, _i: usize) {}
fn write_usize(&mut self, i: usize) {
self.0.write_usize(i)
}
}

#[cfg(test)]
Expand Down

0 comments on commit 8dec509

Please sign in to comment.