Skip to content
Closed
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
13 changes: 13 additions & 0 deletions roaring/src/bitmap/cmp.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use core::borrow::Borrow;
use core::cmp::Ordering;
use core::hash::{Hash, Hasher};
use core::iter::Peekable;

use super::container::Container;
Expand Down Expand Up @@ -150,3 +151,15 @@ where
}
}
}

impl Hash for RoaringBitmap {
fn hash<H: Hasher>(&self, state: &mut H) {
// Bitmaps holding the same values are equal even when their containers
// use different internal representations (array, bitmap or run), so the
// hash has to be built from the values rather than from the layout.
self.len().hash(state);
for value in self {
value.hash(state);
}
Comment on lines +157 to +163

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a very slow implementation and I don't have anything that comes out of my head to improve this given the fact that internal containers can be of different forms while holding the same content.

}
}
2 changes: 1 addition & 1 deletion roaring/src/treemap/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub use self::iter::{BitmapIter, IntoIter, Iter};
/// rb.insert(7);
/// println!("total bits set to true: {}", rb.len());
/// ```
#[derive(PartialEq, Eq)]
#[derive(PartialEq, Eq, Hash)]
pub struct RoaringTreemap {
map: BTreeMap<u32, RoaringBitmap>,
}
61 changes: 61 additions & 0 deletions roaring/tests/hash.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
extern crate roaring;

use std::collections::hash_map::DefaultHasher;
use std::collections::HashSet;
use std::hash::{Hash, Hasher};

use roaring::RoaringBitmap;

fn hash_of<T: Hash>(value: &T) -> u64 {
let mut hasher = DefaultHasher::new();
value.hash(&mut hasher);
hasher.finish()
}

#[test]
fn equal_bitmaps_have_equal_hashes() {
let a = (0..2000).collect::<RoaringBitmap>();
let b = (0..2000).collect::<RoaringBitmap>();

assert_eq!(a, b);
assert_eq!(hash_of(&a), hash_of(&b));
}

#[test]
fn empty_bitmaps_hash_equal() {
assert_eq!(hash_of(&RoaringBitmap::new()), hash_of(&RoaringBitmap::new()));
}

#[test]
fn array_and_run_hash_equal() {
// A short contiguous range is stored as an array, but `optimize` rewrites it
// into a run. The two share the same values so they must hash the same.
let array = (0..100).collect::<RoaringBitmap>();
let mut run = array.clone();
assert!(run.optimize());

assert_eq!(array, run);
assert_eq!(hash_of(&array), hash_of(&run));
}

#[test]
fn bitmap_and_run_hash_equal() {
let plain = (0..6000).chain(1_000_000..1_012_000).collect::<RoaringBitmap>();
let mut optimized = plain.clone();
assert!(optimized.optimize());

assert_eq!(plain, optimized);
assert_eq!(hash_of(&plain), hash_of(&optimized));
}

#[test]
fn usable_as_hashset_key() {
let mut set = HashSet::new();
set.insert((0..10).collect::<RoaringBitmap>());
set.insert((0..10).collect::<RoaringBitmap>());
set.insert((5..15).collect::<RoaringBitmap>());

assert_eq!(set.len(), 2);
assert!(set.contains(&(0..10).collect::<RoaringBitmap>()));
assert!(!set.contains(&(100..110).collect::<RoaringBitmap>()));
}
53 changes: 53 additions & 0 deletions roaring/tests/treemap_hash.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
extern crate roaring;

use std::collections::hash_map::DefaultHasher;
use std::collections::HashSet;
use std::hash::{Hash, Hasher};

use roaring::RoaringTreemap;

fn hash_of<T: Hash>(value: &T) -> u64 {
let mut hasher = DefaultHasher::new();
value.hash(&mut hasher);
hasher.finish()
}

#[test]
fn equal_treemaps_have_equal_hashes() {
let a = (0..2000u64).collect::<RoaringTreemap>();
let b = (0..2000u64).collect::<RoaringTreemap>();

assert_eq!(a, b);
assert_eq!(hash_of(&a), hash_of(&b));
}

#[test]
fn spanning_multiple_bitmaps_hash_equal() {
let values = [0u64, 1, u32::MAX as u64, u32::MAX as u64 + 1, u64::MAX];
let a = values.iter().copied().collect::<RoaringTreemap>();
let b = values.iter().rev().copied().collect::<RoaringTreemap>();

assert_eq!(a, b);
assert_eq!(hash_of(&a), hash_of(&b));
}

#[test]
fn same_values_different_representation_hash_equal() {
let plain = (0..6000u64).collect::<RoaringTreemap>();
let mut optimized = plain.clone();
assert!(optimized.optimize());

assert_eq!(plain, optimized);
assert_eq!(hash_of(&plain), hash_of(&optimized));
}

#[test]
fn usable_as_hashset_key() {
let mut set = HashSet::new();
set.insert((0..10u64).collect::<RoaringTreemap>());
set.insert((0..10u64).collect::<RoaringTreemap>());
set.insert((5..15u64).collect::<RoaringTreemap>());

assert_eq!(set.len(), 2);
assert!(set.contains(&(0..10u64).collect::<RoaringTreemap>()));
}