replace RoaringTreemap by TwoLevelRoaringBitmap

Benchmark results on insert_range (only bench available for 64-bit):

    group                       roaring64                               treemap
    -----                       ---------                               -------
    from_empty_1000             1.00     87.6±4.76ns 10.6 GElem/sec     1.65    144.2±1.28ns  6.5 GElem/sec
    from_empty_10000            1.00    166.8±9.32ns 55.8 GElem/sec     1.28    213.6±7.26ns 43.6 GElem/sec
    from_empty_8589934590       1.01    151.5±0.99ms 52.8 GElem/sec     1.00    149.7±1.00ms 53.5 GElem/sec
    pre_populated_1000          1.00   139.3±19.83ns  6.7 GElem/sec     1.30   180.8±20.70ns  5.2 GElem/sec
    pre_populated_10000         1.00   235.4±83.29ns 39.6 GElem/sec     1.26  295.9±106.25ns 31.5 GElem/sec
    pre_populated_8589934590    1.00     74.8±2.56ms 107.0 GElem/sec    1.01     75.3±1.82ms 106.3 GElem/sec

benchmarks/benches/lib.rs

@@ -1,16 +1,14 @@
-use itertools::Itertools;
-use std::cmp::Reverse;
-use std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Sub, SubAssign};
-
-use criterion::measurement::Measurement;
+use crate::datasets::Datasets;
 use criterion::{
-    black_box, criterion_group, criterion_main, BatchSize, BenchmarkGroup, BenchmarkId, Criterion,
-    Throughput,
+    black_box, criterion_group, criterion_main, measurement::Measurement, BatchSize,
+    BenchmarkGroup, BenchmarkId, Criterion, Throughput,
+};
+use itertools::Itertools;
+use roaring::{MultiOps, Roaring32, Roaring64};
+use std::{
+    cmp::Reverse,
+    ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Sub, SubAssign},
 };
-
-use roaring::{MultiOps, Roaring32};
-
-use crate::datasets::Datasets;
 
 mod datasets;
 
@@ -670,29 +668,29 @@ fn insert_range_bitmap(c: &mut Criterion) {
     }
 }
 
-// fn insert_range_treemap(c: &mut Criterion) {
-//     for &size in &[1_000_u64, 10_000u64, 2 * (u32::MAX as u64)] {
-//         let mut group = c.benchmark_group("insert_range_treemap");
-//         group.throughput(criterion::Throughput::Elements(size));
-//         group.bench_function(format!("from_empty_{}", size), |b| {
-//             let bm = RoaringTreemap::new();
-//             b.iter_batched(
-//                 || bm.clone(),
-//                 |mut bm| black_box(bm.insert_range(0..size)),
-//                 criterion::BatchSize::SmallInput,
-//             )
-//         });
-//         group.bench_function(format!("pre_populated_{}", size), |b| {
-//             let mut bm = RoaringTreemap::new();
-//             bm.insert_range(0..size);
-//             b.iter_batched(
-//                 || bm.clone(),
-//                 |mut bm| black_box(bm.insert_range(0..size)),
-//                 criterion::BatchSize::SmallInput,
-//             )
-//         });
-//     }
-// }
+fn insert_range_roaring64(c: &mut Criterion) {
+    for &size in &[1_000_u64, 10_000u64, 2 * (u32::MAX as u64)] {
+        let mut group = c.benchmark_group("insert_range_roaring64");
+        group.throughput(criterion::Throughput::Elements(size));
+        group.bench_function(format!("from_empty_{}", size), |b| {
+            let bm = Roaring64::new();
+            b.iter_batched(
+                || bm.clone(),
+                |mut bm| black_box(bm.insert_range(0..size)),
+                criterion::BatchSize::SmallInput,
+            )
+        });
+        group.bench_function(format!("pre_populated_{}", size), |b| {
+            let mut bm = Roaring64::new();
+            bm.insert_range(0..size);
+            b.iter_batched(
+                || bm.clone(),
+                |mut bm| black_box(bm.insert_range(0..size)),
+                criterion::BatchSize::SmallInput,
+            )
+        });
+    }
+}
 
 criterion_group!(
     benches,
@@ -711,7 +709,7 @@ criterion_group!(
     remove,
     remove_range_bitmap,
     insert_range_bitmap,
-    // insert_range_treemap,
+    insert_range_roaring64,
     iteration,
     is_empty,
     serialization,

src/lib.rs

@@ -20,15 +20,15 @@ use std::fmt;
 
 mod core;
 
-/// A compressed bitmap with u64 values.  Implemented as a `BTreeMap` of `RoaringBitmap`s.
-// pub mod treemap;
-// pub use treemap::RoaringTreemap;
 mod value;
 pub use value::{ContainerKey, Value, ValueRange};
 
 mod roaring32;
 pub use roaring32::Roaring32;
 
+mod roaring64;
+pub use roaring64::Roaring64;
+
 pub use self::core::RoaringBitmap;
 
 /// An error type that is returned when an iterator isn't sorted.
@@ -53,7 +53,7 @@ impl fmt::Display for NonSortedIntegers {
 impl Error for NonSortedIntegers {}
 
 /// A [`Iterator::collect`] blanket implementation that provides extra methods for [`Roaring32`]
-/// and [`RoaringTreemap`].
+/// and [`Roaring64`].
 ///
 /// When merging multiple bitmap with the same operation it's usually faster to call the
 /// method in this trait than to write your own for loop and merging the bitmaps yourself.